diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild
index c28896b504b2..0807c8994312 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild,v 1.3 2013/07/26 03:43:14 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.7.1-r2.ebuild,v 1.4 2013/09/05 14:39:40 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 AUTOTOOLS_AUTORECONF=true
 
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
index ad4c1c31b1f4..9be0b17d7375 100644
--- a/app-admin/clustershell/clustershell-1.6.ebuild
+++ b/app-admin/clustershell/clustershell-1.6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/clustershell/clustershell-1.6.ebuild,v 1.3 2013/06/25 12:57:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/clustershell/clustershell-1.6.ebuild,v 1.4 2013/09/05 18:15:50 mgorny Exp $
 
 # TODO: test phase
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 PYTHON_REQ_USE="xml"
 inherit distutils-r1
 
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index b6cb72e14bec..10ea87091c9a 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,3 +1 @@
-DIST eclean-kernel-0.3.2.tar.bz2 8573 SHA256 beed07442b8f226026363ff65f2adfea71f45a88ffac460f1f437e96bd260a07 SHA512 c4123e12b99bfd06b7c5c3c529797857163177046b83efc5c1c829a056ba65fdf48747b49955ffa7481163712fa183cb76f3573c729b5c3b5e00a344bbdebc67 WHIRLPOOL 032d5bb50555ad4bdeb4e23a31e37c9772c72662c4d5734682b5defbdc78bb6f8e4b9456cd4a125f618d07386a151f6fb534a8f34638d55f9e82c0b0381b5cda
-DIST eclean-kernel-0.3.3.tar.bz2 8651 SHA256 5610f6dec559d87370a6ace6bb5dd81e98d03e2197bc3fd36b260b8e5ccd1407 SHA512 2cf989f506a2a28ada111529772d78f45e30d888885fc5e57d2919393b2b011c4f6a37a211ea0556b9a9d485557796f8afe4cd7027c7996104db7dd49901f7af WHIRLPOOL 6d5e64b904852bd4c4dad3b47a4ed0134bb1f2e5700f22875bda8b5d12bab04f59087028668b4eb91cfbfa0d15bd5e1174bd9f0c2077def01665e3be1a75d2fd
 DIST eclean-kernel-0.4.tar.bz2 9408 SHA256 be9d85fcb0c0cd4c70b3e3e7793bcacf9673faf9069356ef0af9661c050cf928 SHA512 f7f4a1a910594bb28bf37792c87a7ee96daecea006376cf98d0eeeb4d4c3c2a59e46fd986a5c7d34d0a54520bef58b225a498f926d4858d5ba2a4d3941ed3f36 WHIRLPOOL 3f8a168562082a12de34d5cca1e8fda2a5730607678bea55ff5c68f96399e3500681efccfe16201017f510ef916376b9da2495b39913ae5183f81ed8fae97b57
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.3.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.3.2.ebuild
deleted file mode 100644
index 9141ec0eba6d..000000000000
--- a/app-admin/eclean-kernel/eclean-kernel-0.3.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.3.2.ebuild,v 1.3 2013/04/02 15:08:47 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy1_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://bitbucket.org/mgorny/eclean-kernel/"
-SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.3.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.3.3.ebuild
deleted file mode 100644
index abc95116177b..000000000000
--- a/app-admin/eclean-kernel/eclean-kernel-0.3.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.3.3.ebuild,v 1.1 2013/04/02 15:08:47 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy1_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="Remove outdated built kernels"
-HOMEPAGE="https://bitbucket.org/mgorny/eclean-kernel/"
-SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild
index b7affb1deec6..ea7c37b68929 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild,v 1.2 2013/08/07 09:52:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild,v 1.3 2013/09/05 18:15:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index 44266e3f7633..499db79dc560 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-9999.ebuild,v 1.5 2013/08/07 09:52:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eclean-kernel/eclean-kernel-9999.ebuild,v 1.6 2013/09/05 18:15:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild b/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild
index 84e5492145ff..fbfe98ce2ba1 100644
--- a/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild
+++ b/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild,v 1.6 2013/09/04 15:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.2.0.ebuild,v 1.8 2013/09/05 19:24:29 ago Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-admin/eselect/eselect-1.3.6.ebuild b/app-admin/eselect/eselect-1.3.6.ebuild
index e8c6525bb869..279a058de5ea 100644
--- a/app-admin/eselect/eselect-1.3.6.ebuild
+++ b/app-admin/eselect/eselect-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.6.ebuild,v 1.9 2013/09/04 08:59:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.6.ebuild,v 1.12 2013/09/05 19:57:28 ulm Exp $
 
 EAPI=4
 
@@ -12,8 +12,8 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm 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="doc" # emacs vim-syntax
+KEYWORDS="alpha amd64 arm 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="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
 	|| (
@@ -29,8 +29,8 @@ RDEPEND="!app-admin/eselect-news
 	sys-apps/file
 	sys-libs/ncurses"
 
-#PDEPEND="emacs? ( app-emacs/eselect-mode )
-#	vim-syntax? ( app-vim/eselect-syntax )"
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
 
 src_compile() {
 	emake
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
index 3743fd3887d3..8a2cc97a7fc1 100644
--- a/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild,v 1.9 2013/09/05 10:43:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild,v 1.10 2013/09/05 19:23:06 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 54e192b277fa..1d5b8bc9a20c 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,2 +1,3 @@
 DIST Rex-0.41.2.tar.gz 157094 SHA256 99c85458504d687b63a379bbd51141a64d69fe75a66556c2f78a8ac7871d92ed SHA512 b6904783f217b140768f8094c9c8754e6af6ed4b7136475393c1503b2b17fd64bfcbbcf5aa61e6a52fc79f118ac00c9ecf89f71bf3167333f91986606bfb8fb4 WHIRLPOOL 93e80f52b3d1cf5dca3ebffd0d4b78e1d3afa79cf31a5dc0b7a4d57dcda59f0f3572ab32b384c59e3cf078a9a125d2117ee3131dc0759a11502dd80ca364a1c7
 DIST Rex-0.41.3.tar.gz 157649 SHA256 de9ea5082fd0eab2e160e8cc7ded41c2aae1a2e40a228a78654f0aed3b8cb647 SHA512 5b37d0808ed89b630a6abd835e33578c6598959637d8f5de83e1312d4a3a3a421baec5aaa6697751ea63ab8d3560cdccccc16fa9a0fbbb160816558bc0d4e9a0 WHIRLPOOL 8a7dc1c46b08eb104549f640ae4fd722b3ee3677ead42e0973fb42a1b81fca38a8b1cc0c204e94697b68bb716db1c59ec291d53373c9af90de8c013b4f0771f1
+DIST Rex-0.42.4.tar.gz 165506 SHA256 e54fce5fb1d7df79e4179de2f288a4e3f01fbeebfd4f6709484f6e52d896b6d1 SHA512 aaa5b3471b59960eb7d3b2d86855afedcca3ca1384cfb6734d82ff4f872528cea4ce5d6a052a420faa9cd195820e519719e0bc089b227386789521bcce21095d WHIRLPOOL c6e8a1f23aadc9a39cca7935133556768292fd38d208e281838b717c7f5326c87ffb51d4833d5b06fd98e41e99dafc7defcf72c4cf004953adaf742e6bd54022
diff --git a/app-admin/rex/rex-0.42.4.ebuild b/app-admin/rex/rex-0.42.4.ebuild
new file mode 100644
index 000000000000..bc59fbe05374
--- /dev/null
+++ b/app-admin/rex/rex-0.42.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rex/rex-0.42.4.ebuild,v 1.1 2013/09/06 03:49:53 patrick Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=JFRIED
+MODULE_VERSION=${PV}
+MY_P="Rex-${MODULE_VERSION}"
+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"
+
+SRC_TEST="do"
diff --git a/app-admin/supervisor/supervisor-3.0.ebuild b/app-admin/supervisor/supervisor-3.0.ebuild
index 4968cbcb3c29..60e6e6ed64c4 100644
--- a/app-admin/supervisor/supervisor-3.0.ebuild
+++ b/app-admin/supervisor/supervisor-3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0.ebuild,v 1.1 2013/08/10 12:45:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0.ebuild,v 1.2 2013/09/05 18:15:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml"
 
diff --git a/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild b/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild
index 03a34deced5d..4ede66caa881 100644
--- a/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild
+++ b/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild,v 1.1 2013/06/11 07:48:47 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_beta2-r1.ebuild,v 1.2 2013/09/05 18:15:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml"
 
diff --git a/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild b/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild
index 94f3f4534b88..7d5095bdacde 100644
--- a/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild,v 1.2 2013/08/03 14:03:05 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.19-r1.ebuild,v 1.3 2013/09/05 18:15:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-admin/webapp-config/webapp-config-1.51-r1.ebuild b/app-admin/webapp-config/webapp-config-1.51-r1.ebuild
index b552285769ec..ea3166982c3c 100644
--- a/app-admin/webapp-config/webapp-config-1.51-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.51-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.51-r1.ebuild,v 1.1 2013/08/06 11:09:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.51-r1.ebuild,v 1.2 2013/09/05 18:15:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 09b8572c0cdb..cc7358251b5e 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-9999.ebuild,v 1.5 2013/08/04 00:28:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-9999.ebuild,v 1.6 2013/09/05 18:15:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-backup/amanda/amanda-3.3.3.ebuild b/app-backup/amanda/amanda-3.3.3.ebuild
index 2b078df40021..6a39eb01025c 100644
--- a/app-backup/amanda/amanda-3.3.3.ebuild
+++ b/app-backup/amanda/amanda-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 1.6 2013/09/05 10:45:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 1.7 2013/09/05 19:23:13 ago Exp $
 
 EAPI=3
 inherit autotools eutils perl-module user systemd
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.amanda.org/"
 SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
 LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 RDEPEND="sys-libs/readline
 	virtual/awk
 	app-arch/tar
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild
index ab60ee2f81ed..e5f6802fde89 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild,v 1.2 2013/05/29 15:22:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.5-r1.ebuild,v 1.3 2013/09/05 19:44:51 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit linux-info python-r1 systemd toolchain-funcs
 
diff --git a/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild
index dd4e0ffaad5e..d455a5e61d3a 100644
--- a/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild,v 1.1 2013/07/19 13:04:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild,v 1.2 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use eutils multilib python-any-r1 toolchain-funcs virtualx flag-o-matic
diff --git a/app-crypt/mit-krb5/mit-krb5-1.11.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.11.1.ebuild
index 8212cccad588..7ca2d6d74c22 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.11.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.11.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.1.ebuild,v 1.13 2013/04/03 07:18:05 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.1.ebuild,v 1.14 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils flag-o-matic python-any-r1 versionator
 
 MY_P="${P/mit-}"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.11.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.11.2-r1.ebuild
index a51a22c22198..b4d45e5cbb68 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.11.2-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.11.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.2-r1.ebuild,v 1.12 2013/08/06 12:34:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.2-r1.ebuild,v 1.13 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils flag-o-matic python-any-r1 versionator
 
 MY_P="${P/mit-}"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.11.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.11.2.ebuild
index dffb76343543..fbeee2480888 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.11.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.11.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.2.ebuild,v 1.1 2013/04/19 06:45:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.2.ebuild,v 1.2 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils flag-o-matic python-any-r1 versionator
 
 MY_P="${P/mit-}"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.11.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.11.3.ebuild
index c1f8445c6316..f802679f781b 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.11.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.11.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.3.ebuild,v 1.2 2013/08/16 17:08:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.3.ebuild,v 1.3 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils flag-o-matic python-any-r1 versionator
 
 MY_P="${P/mit-}"
diff --git a/app-doc/doxygen/doxygen-1.8.3.1.ebuild b/app-doc/doxygen/doxygen-1.8.3.1.ebuild
index 0f791d7b90e6..a327fb8549ff 100644
--- a/app-doc/doxygen/doxygen-1.8.3.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.3.1.ebuild,v 1.17 2013/08/10 20:12:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.3.1.ebuild,v 1.18 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/doxygen/doxygen-1.8.4-r2.ebuild b/app-doc/doxygen/doxygen-1.8.4-r2.ebuild
index c702bdfc8d77..5b355d002211 100644
--- a/app-doc/doxygen/doxygen-1.8.4-r2.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.4-r2.ebuild,v 1.2 2013/08/10 20:12:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.4-r2.ebuild,v 1.3 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-editors/gvim/gvim-7.3.1214.ebuild b/app-editors/gvim/gvim-7.3.1214.ebuild
index f643473fd615..df05054de2b7 100644
--- a/app-editors/gvim/gvim-7.3.1214.ebuild
+++ b/app-editors/gvim/gvim-7.3.1214.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.1214.ebuild,v 1.1 2013/06/17 00:58:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.3.1214.ebuild,v 1.2 2013/09/05 18:18:04 mgorny Exp $
 
 EAPI=5
 VIM_VERSION="7.3"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit vim
 
 VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
diff --git a/app-editors/hteditor/hteditor-2.0.22.ebuild b/app-editors/hteditor/hteditor-2.0.22.ebuild
index 24f84d3b521f..604ec2ab2568 100644
--- a/app-editors/hteditor/hteditor-2.0.22.ebuild
+++ b/app-editors/hteditor/hteditor-2.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0.22.ebuild,v 1.3 2013/09/04 08:58:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0.22.ebuild,v 1.5 2013/09/05 19:23:58 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses
diff --git a/app-editors/retext/retext-4.0.1-r2.ebuild b/app-editors/retext/retext-4.0.1-r2.ebuild
index dde6631abf6f..805a38b7271b 100644
--- a/app-editors/retext/retext-4.0.1-r2.ebuild
+++ b/app-editors/retext/retext-4.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1-r2.ebuild,v 1.1 2013/09/04 12:42:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1-r2.ebuild,v 1.2 2013/09/05 14:20:33 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index c67a17fa7dbe..3e83c31307c1 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -4,4 +4,5 @@ DIST vim-core-7.3-gentoo-patches-r2.tar.bz2 3063 SHA256 cba8a43aea20457b9177be97
 DIST vim-core-7.3-gentoo-patches-r3.tar.bz2 3379 SHA256 2e0b38221b69d13c43cafb8c71f5be322785b12168278541a6006378c722e650 SHA512 7bebe548d1f65309f022bd459eb10364300cef9363298bf492c960730865b30b789392b123803fd3c3a5a3fb8543b9a83535c593b587a3e1f00290e9d2295714 WHIRLPOOL e75285549df9f4a9fa49cac19f0592ff4e5c87a07075dedd59f4806a104147bd9259de3e714b81b6d91bbbec9613c5f8dc3308649c8a38914cf29db22d539ac1
 DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
+DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
 DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
diff --git a/app-editors/vim-core/vim-core-7.4.22.ebuild b/app-editors/vim-core/vim-core-7.4.22.ebuild
new file mode 100644
index 000000000000..adf8d1297351
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.22.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.22.ebuild,v 1.1 2013/09/06 06:20:32 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://vim.googlecode.com/hg/"
+	EHG_PROJECT="vim"
+else
+	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r3.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
+	KEYWORDS="~alpha ~amd64 ~arm ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+		fi
+
+		if [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
+			# Patches for vim-core only (runtime/*)
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/gentoo/patches-core/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Patch to build with ruby-1.8.0_pre5 and following
+	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-features=tiny \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	cd src || die "cd src failed"
+	emake \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		install-icons \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r4 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
diff --git a/app-editors/vim-qt/vim-qt-20130201.ebuild b/app-editors/vim-qt/vim-qt-20130201.ebuild
index de0ff7dc3bc1..4d26c04d5f0c 100644
--- a/app-editors/vim-qt/vim-qt-20130201.ebuild
+++ b/app-editors/vim-qt/vim-qt-20130201.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130201.ebuild,v 1.2 2013/03/02 19:22:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130201.ebuild,v 1.3 2013/09/05 18:18:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 inherit eutils fdo-mime flag-o-matic python-any-r1
 
diff --git a/app-editors/vim-qt/vim-qt-20130220.ebuild b/app-editors/vim-qt/vim-qt-20130220.ebuild
index 0bed8e20bbba..bd247cfe2659 100644
--- a/app-editors/vim-qt/vim-qt-20130220.ebuild
+++ b/app-editors/vim-qt/vim-qt-20130220.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130220.ebuild,v 1.2 2013/03/02 19:22:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130220.ebuild,v 1.3 2013/09/05 18:18:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 inherit eutils fdo-mime flag-o-matic python-any-r1
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index ade312913b2b..ed986177d226 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -2,4 +2,5 @@ DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b681
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
+DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
 DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
diff --git a/app-editors/vim/vim-7.3.1214.ebuild b/app-editors/vim/vim-7.3.1214.ebuild
index b9838121d70a..ce69a3b2251f 100644
--- a/app-editors/vim/vim-7.3.1214.ebuild
+++ b/app-editors/vim/vim-7.3.1214.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.1214.ebuild,v 1.1 2013/06/17 00:57:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.1214.ebuild,v 1.2 2013/09/05 18:18:04 mgorny Exp $
 
 EAPI=5
 VIM_VERSION="7.3"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit vim
 
 VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
diff --git a/app-editors/vim/vim-7.4.22.ebuild b/app-editors/vim/vim-7.4.22.ebuild
new file mode 100644
index 000000000000..a29126d22c5c
--- /dev/null
+++ b/app-editors/vim/vim-7.4.22.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.22.ebuild,v 1.1 2013/09/06 06:23:29 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://vim.googlecode.com/hg/"
+	EHG_PROJECT="vim"
+else
+	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
+	KEYWORDS="~alpha ~amd64 ~arm ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby vim-pager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-admin/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit )
+		!luajit? ( dev-lang/lua )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	X? ( x11-libs/libXt )"
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-vi-1.1
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Patch to build with ruby-1.8.0_pre5 and following
+	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf="--with-features=tiny \
+			--disable-nls \
+			--disable-multibyte \
+			--disable-acl \
+			--enable-gui=no \
+			--without-x \
+			--disable-darwin \
+			--disable-luainterp \
+			--disable-perlinterp \
+			--disable-pythoninterp \
+			--disable-rubyinterp \
+			--disable-gpm"
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf="--with-features=huge --enable-multibyte"
+		myconf+=" $(use_enable acl)"
+		myconf+=" $(use_enable cscope)"
+		myconf+=" $(use_enable gpm)"
+		myconf+=" $(use_enable nls)"
+		myconf+=" $(use_enable perl perlinterp)"
+
+		if use python ; then
+			if [[ ${EPYTHON} == python3* ]] ; then
+				myconf+=" --enable-python3interp"
+				export vi_cv_path_python3="${PYTHON}"
+			else
+				myconf+=" --enable-pythoninterp"
+				export vi_cv_path_python="${PYTHON}"
+			fi
+		else
+			myconf+=" --disable-pythoninterp --disable-python3interp"
+		fi
+
+		myconf+=" $(use_enable lua luainterp)"
+		myconf+=" $(use_with luajit)"
+		myconf+=" $(use_enable ruby rubyinterp)"
+
+		# tclinterp is broken; when you --enable-tclinterp flag, then
+		# the following command never returns:
+		#   VIMINIT='let OS=system("uname -s")' vim
+		# mzscheme support is currently broken. bug #91970
+		#myconf+=" $(use_enable mzscheme mzschemeinterp)"
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
+	fi
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--disable-selinux \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i -e 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../vim nongui \
+		|| die "At least one test failed"
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+vim_pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	if use X ; then
+		echo
+		elog "The 'X' USE flag enables vim <-> X communication, like"
+		elog "updating the xterm titlebar. It does not install a GUI."
+	fi
+	echo
+	elog "To install a GUI version of vim, use the app-editors/gvim"
+	elog "package."
+	echo
+	elog "Vim 7 includes an integrated spell checker. You need to install"
+	elog "word list files before you can use it. There are ebuilds for"
+	elog "some of these named app-vim/vim-spell-*. If your language of"
+	elog "choice is not included, please consult vim-spell.eclass for"
+	elog "instructions on how to make a package."
+	echo
+	ewarn "Note that the English word lists are no longer installed by"
+	ewarn "default."
+	echo
+
+	echo
+	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+vim_pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-emacs/eselect-mode/eselect-mode-1.3.8.ebuild b/app-emacs/eselect-mode/eselect-mode-1.3.8.ebuild
index 68d2a0c72cad..01037170fe29 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.3.8.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/eselect-mode/eselect-mode-1.3.8.ebuild,v 1.7 2013/09/04 09:02:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/eselect-mode/eselect-mode-1.3.8.ebuild,v 1.9 2013/09/05 19:24:23 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/pymacs/pymacs-0.25-r1.ebuild b/app-emacs/pymacs/pymacs-0.25-r1.ebuild
index 8ea15e0dc7ed..897988751e0a 100644
--- a/app-emacs/pymacs/pymacs-0.25-r1.ebuild
+++ b/app-emacs/pymacs/pymacs-0.25-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/pymacs-0.25-r1.ebuild,v 1.1 2013/03/30 13:45:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/pymacs-0.25-r1.ebuild,v 1.2 2013/09/05 19:44:55 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit elisp distutils-r1 vcs-snapshot
 
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
index 3d39079201a8..468a12e3b03a 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild,v 1.1 2013/08/05 10:24:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild,v 1.2 2013/09/05 18:04:54 slyfox Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic pax-utils
+inherit eutils flag-o-matic pax-utils toolchain-funcs
 
 P_FD="dosemu-freedos-1.0-bin"
 COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
@@ -67,6 +67,10 @@ src_configure() {
 		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
 }
 
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
 src_install() {
 	default
 
diff --git a/app-emulation/libvirt/libvirt-1.1.1-r1.ebuild b/app-emulation/libvirt/libvirt-1.1.1-r1.ebuild
index a4c0e04b5e17..45665a08bf7f 100644
--- a/app-emulation/libvirt/libvirt-1.1.1-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.1-r1.ebuild,v 1.4 2013/08/28 11:13:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.1-r1.ebuild,v 1.5 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 user autotools linux-info systemd
 
diff --git a/app-emulation/libvirt/libvirt-1.1.1-r5.ebuild b/app-emulation/libvirt/libvirt-1.1.1-r5.ebuild
index f26ed4534e62..9e8c5a79d51e 100644
--- a/app-emulation/libvirt/libvirt-1.1.1-r5.ebuild
+++ b/app-emulation/libvirt/libvirt-1.1.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.1-r5.ebuild,v 1.2 2013/08/31 10:14:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.1-r5.ebuild,v 1.3 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
 
diff --git a/app-emulation/libvirt/libvirt-1.1.2.ebuild b/app-emulation/libvirt/libvirt-1.1.2.ebuild
index de9f5d2e85c6..716b547ac8f3 100644
--- a/app-emulation/libvirt/libvirt-1.1.2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.2.ebuild,v 1.1 2013/09/02 03:43:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.2.ebuild,v 1.2 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
 
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 308423fca1c3..1e78714a43d8 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.51 2013/08/10 03:11:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.52 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 user autotools linux-info systemd
 
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild
index 17ab9507be0f..4621829f6681 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild,v 1.1 2013/08/11 21:36:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild,v 1.2 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils systemd udev python-r1
 
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.6.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.6.0.ebuild
index fc4d962d76ab..54fd3f6a4ab9 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.6.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.6.0.ebuild,v 1.1 2013/08/16 14:02:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.6.0.ebuild,v 1.2 2013/09/05 18:20:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils systemd udev python-r1
 
diff --git a/app-emulation/qemu/qemu-1.4.2.ebuild b/app-emulation/qemu/qemu-1.4.2.ebuild
index 9c0738543fb2..75a9bccb330d 100644
--- a/app-emulation/qemu/qemu-1.4.2.ebuild
+++ b/app-emulation/qemu/qemu-1.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.2.ebuild,v 1.6 2013/07/19 03:57:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.2.ebuild,v 1.7 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
diff --git a/app-emulation/qemu/qemu-1.5.2-r1.ebuild b/app-emulation/qemu/qemu-1.5.2-r1.ebuild
index 829dc9d44116..e7ead3dfb147 100644
--- a/app-emulation/qemu/qemu-1.5.2-r1.ebuild
+++ b/app-emulation/qemu/qemu-1.5.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r1.ebuild,v 1.3 2013/08/19 14:07:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r1.ebuild,v 1.4 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
diff --git a/app-emulation/qemu/qemu-1.5.2-r2.ebuild b/app-emulation/qemu/qemu-1.5.2-r2.ebuild
index 61eb565508c1..545ed6153469 100644
--- a/app-emulation/qemu/qemu-1.5.2-r2.ebuild
+++ b/app-emulation/qemu/qemu-1.5.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r2.ebuild,v 1.3 2013/08/19 14:07:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r2.ebuild,v 1.4 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
diff --git a/app-emulation/qemu/qemu-1.5.3.ebuild b/app-emulation/qemu/qemu-1.5.3.ebuild
index c79744335c5d..e17d7848af7d 100644
--- a/app-emulation/qemu/qemu-1.5.3.ebuild
+++ b/app-emulation/qemu/qemu-1.5.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.3.ebuild,v 1.1 2013/08/27 23:41:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.3.ebuild,v 1.2 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
diff --git a/app-emulation/qemu/qemu-1.6.0.ebuild b/app-emulation/qemu/qemu-1.6.0.ebuild
index 4340783a5a9b..495612f465cc 100644
--- a/app-emulation/qemu/qemu-1.6.0.ebuild
+++ b/app-emulation/qemu/qemu-1.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.6.0.ebuild,v 1.2 2013/08/19 14:07:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.6.0.ebuild,v 1.3 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 8370cccdcd25..29cd93f83ec4 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.59 2013/08/19 14:08:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.60 2013/09/05 18:20:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses,readline"
 
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
diff --git a/app-emulation/spice/spice-0.12.3-r1.ebuild b/app-emulation/spice/spice-0.12.3-r1.ebuild
index ab23d695aeac..d250b05c5c7c 100644
--- a/app-emulation/spice/spice-0.12.3-r1.ebuild
+++ b/app-emulation/spice/spice-0.12.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.3-r1.ebuild,v 1.3 2013/07/27 22:04:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.3-r1.ebuild,v 1.4 2013/09/05 18:20:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit eutils python-any-r1
 
diff --git a/app-emulation/spice/spice-0.12.4.ebuild b/app-emulation/spice/spice-0.12.4.ebuild
index 867328fd903d..c20efcdd8c98 100644
--- a/app-emulation/spice/spice-0.12.4.ebuild
+++ b/app-emulation/spice/spice-0.12.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.4.ebuild,v 1.1 2013/07/24 14:31:40 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.4.ebuild,v 1.2 2013/09/05 18:20:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit eutils python-any-r1
 
diff --git a/app-emulation/virt-manager/virt-manager-0.10.0.ebuild b/app-emulation/virt-manager/virt-manager-0.10.0.ebuild
index 8b5c2bd5ab52..5ba7bc3e527f 100644
--- a/app-emulation/virt-manager/virt-manager-0.10.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.10.0.ebuild,v 1.10 2013/08/27 13:16:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.10.0.ebuild,v 1.11 2013/09/05 15:10:18 ago Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
 	${BACKPORTS+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild
index 3ff3cc0e13dd..2b8ba2f1137f 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild,v 1.4 2013/07/28 10:49:28 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.5.0.ebuild,v 1.5 2013/09/05 18:22:03 mgorny Exp $
 
 EAPI=5
 PYTHON_DEPEND="2:2.5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils python-single-r1 autotools gnome2-utils
 
 DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
diff --git a/app-i18n/ibus/ibus-1.5.2.ebuild b/app-i18n/ibus/ibus-1.5.2.ebuild
index d7f9ff80789b..b67fe716b752 100644
--- a/app-i18n/ibus/ibus-1.5.2.ebuild
+++ b/app-i18n/ibus/ibus-1.5.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.2.ebuild,v 1.4 2013/07/28 09:20:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.2.ebuild,v 1.5 2013/09/05 18:22:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
diff --git a/app-i18n/ibus/ibus-1.5.3.ebuild b/app-i18n/ibus/ibus-1.5.3.ebuild
index 5727444cd06d..ac715138885a 100644
--- a/app-i18n/ibus/ibus-1.5.3.ebuild
+++ b/app-i18n/ibus/ibus-1.5.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.3.ebuild,v 1.1 2013/08/03 23:51:15 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.3.ebuild,v 1.2 2013/09/05 18:22:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
diff --git a/app-i18n/rskkserv/rskkserv-2.95.4.ebuild b/app-i18n/rskkserv/rskkserv-2.95.4.ebuild
deleted file mode 100644
index da541898d0ef..000000000000
--- a/app-i18n/rskkserv/rskkserv-2.95.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/rskkserv-2.95.4.ebuild,v 1.8 2011/04/13 15:19:12 ulm Exp $
-
-inherit ruby eutils
-
-DESCRIPTION="rskkserv is an alternative version of skkserv implemented by Ruby"
-HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=rskkserv"
-SRC_URI="http://www.unixuser.org/~ysjj/rskkserv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-ruby/ruby-tcpwrap"
-RDEPEND="${DEPEND}
-	app-i18n/skk-jisyo"
-USE_RUBY="ruby18"
-
-src_compile() {
-	ruby -i -pe "gsub(/with_RUBY/,'with_ruby')" configure || die
-	econf \
-		--with-dicfile=/usr/share/skk/SKK-JISYO.L \
-		--with-cachedir=/var/lib/rskkserv \
-		--with-piddir=/var/run \
-		--with-logdir=/var/log \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/lib/rskkserv
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/rskkserv-2.95.initd rskkserv || die
-
-	dodoc ChangeLog
-	cd doc
-	dodoc rskkserv.conf.sample
-	newdoc README.old README
-	insinto /usr/share/doc/${PF}
-	doins conf-o2n.rb
-	newman rskkserv.1.in rskkserv.1
-	insinto /usr/share/man/ja/man1
-	newins rskkserv.1.ja_JP.eucJP.in rskkserv.1
-}
-
-pkg_postinst() {
-	elog
-	elog "If you want to add auxiliary dictionaries (e.g. SKK-JISYO.JIS2,"
-	elog "SKK-JISYO.jinmei, SKK-JISYO.2ch and so on) you need to emerge"
-	elog "app-i18n/skk-jisyo-extra and uncomment dictionary entries in"
-	elog "/etc/rskkserv.conf manually."
-	elog
-	draw_line
-	elog
-	elog "If you are upgrading from 2.94.x, you may want to use"
-	elog "conf-o2n.rb in /usr/share/doc/${PF} to convert configuration"
-	elog "file into new format."
-	elog
-}
diff --git a/app-i18n/transifex-client/transifex-client-0.9.2.ebuild b/app-i18n/transifex-client/transifex-client-0.9.2.ebuild
index cb008d1fd85c..6f8f79603829 100644
--- a/app-i18n/transifex-client/transifex-client-0.9.2.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.9.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/transifex-client-0.9.2.ebuild,v 1.3 2013/06/30 17:13:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/transifex-client-0.9.2.ebuild,v 1.4 2013/09/05 18:22:02 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/freemind/freemind-0.9.0-r1.ebuild b/app-misc/freemind/freemind-0.9.0-r1.ebuild
index 75b84730cdb3..7c091192961e 100644
--- a/app-misc/freemind/freemind-0.9.0-r1.ebuild
+++ b/app-misc/freemind/freemind-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild,v 1.4 2013/09/04 09:02:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild,v 1.5 2013/09/05 19:22:45 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc x86 ~x64-macos"
 IUSE="groovy latex pdf svg"
 
 COMMON_DEP="
diff --git a/app-misc/gcalcli/gcalcli-2.4.2.ebuild b/app-misc/gcalcli/gcalcli-2.4.2.ebuild
index a1099e7fb0f6..82e2e95df4df 100644
--- a/app-misc/gcalcli/gcalcli-2.4.2.ebuild
+++ b/app-misc/gcalcli/gcalcli-2.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcalcli/gcalcli-2.4.2.ebuild,v 1.2 2013/06/27 03:15:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcalcli/gcalcli-2.4.2.ebuild,v 1.3 2013/09/05 18:23:06 mgorny Exp $
 
 EAPI=5
 # google-api-python-client only supports these
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit python-r1
 
diff --git a/app-misc/golly/golly-2.4-r1.ebuild b/app-misc/golly/golly-2.4-r1.ebuild
index 80b2cbe7fcb2..2e6ecfb5272f 100644
--- a/app-misc/golly/golly-2.4-r1.ebuild
+++ b/app-misc/golly/golly-2.4-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.4-r1.ebuild,v 1.4 2013/06/25 16:55:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.4-r1.ebuild,v 1.5 2013/09/05 18:23:05 mgorny Exp $
 
 EAPI=5
 WX_GTK_VER=2.8
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 toolchain-funcs wxwidgets
 
diff --git a/app-misc/golly/golly-2.5.ebuild b/app-misc/golly/golly-2.5.ebuild
index 3ce5bc734eab..79f963f500b1 100644
--- a/app-misc/golly/golly-2.5.ebuild
+++ b/app-misc/golly/golly-2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.5.ebuild,v 1.1 2013/06/21 16:04:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.5.ebuild,v 1.2 2013/09/05 18:23:05 mgorny Exp $
 
 EAPI=5
 WX_GTK_VER=2.8
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 gnome2-utils wxwidgets
 
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index a3a64b8d569d..5804a70b9135 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1 +1,2 @@
 DIST grc_1.4.tar.gz 24302 SHA256 bbfdc5ee074a857a8cff52f4b1941527c1dd192e1c2b45f69c624ce9fad4f4d0 SHA512 0f9f8eeebdec6da2bf6dadd558c06ce810204fb73cf74e81a525f19f64669a0f9053516dad3dd214142801a27e889b087cba8fc9ba6eab74e51ccefb01f6a9ed WHIRLPOOL f3fe1933ad7fec83eab3a7eda25687fa4a5af2fa8bc63d969559f380b4801882ebb1c802b57e8f8955e1726e2b5474c992a52cce183bb9be0c66874779e2385a
+DIST grc_1.5.tar.gz 26363 SHA256 a2581f065236868bd8b09536616a588792f60fcba4e54d69e2cad65aae73dddc SHA512 6b95a8db5df0d99b49052deb086ac02b180810ce754c744e145e3e0508562fb632e7fdb38ec4ad039f6e998c4122b065ba53925d73268c589475e36c16aa68d7 WHIRLPOOL 1a4ee3612024c95d296772c43c1ed21ebb9e1d50e1fa4af13a6d09a1d63f59ec7f53084b68dbe0b7a4eb1300269ca714d8b972507d671e973b11822e1b4e82a9
diff --git a/app-misc/grc/grc-1.4-r1.ebuild b/app-misc/grc/grc-1.4-r1.ebuild
index 64f93416d502..4c67016c0f45 100644
--- a/app-misc/grc/grc-1.4-r1.ebuild
+++ b/app-misc/grc/grc-1.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.4-r1.ebuild,v 1.6 2013/08/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.4-r1.ebuild,v 1.7 2013/09/05 18:23:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit eutils python-r1
 
diff --git a/app-misc/grc/grc-1.5.ebuild b/app-misc/grc/grc-1.5.ebuild
new file mode 100644
index 000000000000..cc42759ca45e
--- /dev/null
+++ b/app-misc/grc/grc-1.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.5.ebuild,v 1.2 2013/09/05 18:23:06 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.4-support-more-files.patch \
+		"${FILESDIR}"/${PN}-1.4-ipv6.patch
+}
+
+src_install() {
+	python_foreach_impl python_doscript grc grcat
+
+	insinto /usr/share/grc
+	doins conf.* "${FILESDIR}"/conf.*
+
+	insinto /etc
+	doins grc.conf
+
+	dodoc README INSTALL TODO CHANGES CREDITS
+	doman grc.1 grcat.1
+}
diff --git a/app-misc/ranger/ranger-1.5.5-r1.ebuild b/app-misc/ranger/ranger-1.5.5-r1.ebuild
index 7d81b8981b65..e88a1c4daba2 100644
--- a/app-misc/ranger/ranger-1.5.5-r1.ebuild
+++ b/app-misc/ranger/ranger-1.5.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.5.5-r1.ebuild,v 1.1 2013/01/11 22:22:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.5.5-r1.ebuild,v 1.2 2013/09/05 18:23:05 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/ranger/ranger-1.6.0.ebuild b/app-misc/ranger/ranger-1.6.0.ebuild
index e2c24d9da62b..df3a943e5bf3 100644
--- a/app-misc/ranger/ranger-1.6.0.ebuild
+++ b/app-misc/ranger/ranger-1.6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.6.0.ebuild,v 1.2 2013/03/02 06:41:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.6.0.ebuild,v 1.3 2013/09/05 18:23:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/ranger/ranger-1.6.1.ebuild b/app-misc/ranger/ranger-1.6.1.ebuild
index db22b7c3ade0..1b954f4e9c5a 100644
--- a/app-misc/ranger/ranger-1.6.1.ebuild
+++ b/app-misc/ranger/ranger-1.6.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.6.1.ebuild,v 1.1 2013/05/30 08:24:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.6.1.ebuild,v 1.2 2013/09/05 18:23:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index e95ea1e29d4d..8e9875863612 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.5 2013/05/30 08:24:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-9999.ebuild,v 1.6 2013/09/05 18:23:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/app-office/rabbit/Manifest b/app-office/rabbit/Manifest
index 7b7a7eef093f..2d66e05fd0b6 100644
--- a/app-office/rabbit/Manifest
+++ b/app-office/rabbit/Manifest
@@ -1,2 +1 @@
-DIST rabbit-0.9.2.tar.gz 6088701 SHA256 17f5a195ff85453733c8d67f5ad8af794f446081c1729efb2b5f76f033b3c9e7 SHA512 5dda23a223d0f124c08a69a803961934d7ac16e8059811bab005e2c6b485a0f5e68a552dbd6b276c8b09dbbb0b74ae7e93b0e2874e0ffa86c977642633fc3733 WHIRLPOOL 5d9c343ab2ff10b9911b7c9d2b45e40ad205ed01e8de7f81e295b75b8f9752e5efc38b7b3147d9892577aaf4456b695bcf3ce3fb361a6b45ae6afcadd5243b83
 DIST rabbit-1.0.9.tar.gz 4934193 SHA256 c2a20a1c6bb4829aeecae41f8227074d6a59d54411877956e136c2ef030c9200 SHA512 6b86971d2629e4b74f4b5b87850b1e07abfb4c478ce2e34165f0f956cbdb429bba239092b274ad6ca608a48bdcf84f503b55e3fa3d81ad16d3f72e34b967ceca WHIRLPOOL 280f2492b3ca12300f653e8ac6aa72610a3e58aaef927329eb6f4e9556565848df58a643e26b7d11a2b6ae64f2305b001875003cfe4ec6658b889dc606666d6a
diff --git a/app-office/rabbit/rabbit-0.9.2.ebuild b/app-office/rabbit/rabbit-0.9.2.ebuild
deleted file mode 100644
index 4544504f5354..000000000000
--- a/app-office/rabbit/rabbit-0.9.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/rabbit/rabbit-0.9.2.ebuild,v 1.2 2012/06/16 16:35:04 ssuominen Exp $
-
-EAPI=2
-USE_RUBY="ruby18"
-
-inherit ruby-ng elisp-common eutils
-
-DESCRIPTION="An application to do presentation with RD document"
-HOMEPAGE="http://www.cozmixng.org/~rwiki/?cmd=view;name=Rabbit"
-SRC_URI="http://www.cozmixng.org/~kou/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls postscript migemo tgif enscript emacs"
-
-CDEPEND="emacs? ( virtual/emacs )"
-DEPEND="${DEPEND} ${CDEPEND}"
-RDEPEND="${RDEPEND} ${CDEPEND}
-	nls? ( dev-ruby/ruby-gettext )
-	postscript? ( app-text/ghostscript-gpl )
-	migemo? ( app-text/migemo )
-	enscript? ( app-text/enscript )
-	tgif? ( media-gfx/tgif )"
-
-ruby_add_rdepend "
-	>=dev-ruby/ruby-gdkpixbuf2-0.15.0
-	dev-ruby/ruby-gtk2
-	dev-ruby/ruby-poppler
-	dev-ruby/ruby-rsvg
-	dev-ruby/rdtool"
-
-each_ruby_configure() {
-	${RUBY} setup.rb config --prefix=/usr || die
-	${RUBY} setup.rb setup || die
-}
-
-all_ruby_compile() {
-	if use emacs; then
-		cd "${S}/misc/emacs"
-		elisp-compile rabbit-mode.el
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "Tests failed."
-}
-
-each_ruby_install() {
-	${RUBY} setup.rb install --prefix="${D}"
-}
-
-all_ruby_install() {
-	dodoc NEWS.en NEWS.ja README.en README.ja TODO || die
-
-	if use emacs; then
-		cd "${S}/misc/emacs"
-		elisp-install rabbit-mode rabbit-mode.el{,c}
-		elisp-site-file-install "${FILESDIR}/50rabbit-mode-gentoo.el"
-	fi
-
-	insinto /usr/share/doc/${PF}
-	doins -r sample
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-portage/diffmask/diffmask-0.3.3-r2.ebuild b/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
index 21a5dd04b139..75efaafcf2a1 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/diffmask/diffmask-0.3.3-r2.ebuild,v 1.6 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/diffmask/diffmask-0.3.3-r2.ebuild,v 1.7 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index 0c3d57ff8131..997fb0a1d0ed 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/diffmask/diffmask-9999.ebuild,v 1.4 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/diffmask/diffmask-9999.ebuild,v 1.5 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-portage/eix/eix-0.29.3.ebuild b/app-portage/eix/eix-0.29.3.ebuild
index f41eb4b348a0..0c0fd0fbfae8 100644
--- a/app-portage/eix/eix-0.29.3.ebuild
+++ b/app-portage/eix/eix-0.29.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.29.3.ebuild,v 1.8 2013/09/04 09:01:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.29.3.ebuild,v 1.9 2013/09/05 13:27:27 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="clang debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools zsh-completion"
 
 BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
diff --git a/app-portage/flaggie/flaggie-0.2-r3.ebuild b/app-portage/flaggie/flaggie-0.2-r3.ebuild
index 0161e0656bb1..74a3e225d4ee 100644
--- a/app-portage/flaggie/flaggie-0.2-r3.ebuild
+++ b/app-portage/flaggie/flaggie-0.2-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2-r3.ebuild,v 1.5 2013/08/07 11:55:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2-r3.ebuild,v 1.6 2013/09/05 18:25:00 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/app-portage/flaggie/flaggie-0.2.1.ebuild b/app-portage/flaggie/flaggie-0.2.1.ebuild
index 93175d917f80..47f9ac43c655 100644
--- a/app-portage/flaggie/flaggie-0.2.1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2.1.ebuild,v 1.6 2013/08/20 22:12:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-0.2.1.ebuild,v 1.7 2013/09/05 18:25:00 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index 1e78bea2de96..2d14c591be3e 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-9999.ebuild,v 1.5 2013/08/07 11:55:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/flaggie/flaggie-9999.ebuild,v 1.6 2013/09/05 18:25:00 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
index e14572f5f255..bf998153d920 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.2 2013/07/13 17:59:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild,v 1.3 2013/09/05 18:25:00 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 PYTHON_REQ_USE="xml"
 
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index bb6f575eba95..ce81bdbc4df5 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,2 +1,3 @@
 DIST gentoolkit-0.3.0.6.tar.gz 191896 SHA256 5b1b7e9e0363764b3c8349540e3a16fcdd850ec2441bb56b24fdb729130e604a SHA512 6bc46fd364cba3326e9e4f1083485f1220a8dc6675b75ad058fbee59d3c103f2ca103be6035f5f726e92f496a854dca72ec08b0d2cfe012aa7efbdc3a95891a0 WHIRLPOOL e928b8d3c493ac00b622b859985e144cd7828d4c4e1be7c2a4b8abae9864f10aa22c4626b991d9ba81c6408dc7769be2346f2f9abf3c2ec864ce9eed2ae3d9e5
 DIST gentoolkit-0.3.0.7.tar.gz 3191108 SHA256 45ca2b48cfba7939a76428213f2fc4c3a1fc58716290f7a352ccd9299beb49d7 SHA512 798a058a58cf881a24b92ae32fabe7c6d49305e2611bab568004dd711392e5af97b7d66029e344f4e7c52d0b6cf47690b76cf7e3d77b5482c30b6883f872c1d1 WHIRLPOOL c21ce47365500cd93c6c617d79ee9c979f1f6a06966ed41a69eb73014354b6e066fef904c2d221b64f6116a76792f2060a8863ee633f781764c270ce954de1a7
+DIST gentoolkit-0.3.0.8.tar.gz 3192497 SHA256 0338dee7c295c32b60a84e529b764d2bc61536fa3aca021cd5a75c6e534864a6 SHA512 50efd701d0d056740bcf7c7cdce652ae7c9e2786f799f5d30946e752b8aa735489d3e0dc5c7664a5810a0f22cec05b9bc7ccc10292b07ac4dd0777658651f72d WHIRLPOOL 5a2455e50d4e0f4df8abab5b81deb6bb00e078dfed1687ae046ce97a0427eafea2d3de9b83ac6de8155d207653d001c6684ac92226fa2320515c6e14c8fea6e0
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild
new file mode 100644
index 000000000000..29accf663f83
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.8.ebuild,v 1.1 2013/09/05 16:56:38 fuzzyray Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} pypy2_0)
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+	!<=app-portage/gentoolkit-dev-0.2.7
+	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
+	sys-apps/gawk
+	sys-apps/grep
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Rename the python versions of revdep-rebuild, since we are not ready
+	# to switch to the python version yet. Link /usr/bin/revdep-rebuild to
+	# revdep-rebuild.sh. Leaving the python version available for potential
+	# testing by a wider audience.
+	mv "${ED}"/usr/bin/revdep-rebuild "${ED}"/usr/bin/revdep-rebuild.py
+	dosym revdep-rebuild.sh /usr/bin/revdep-rebuild
+
+	# Create cache directory for revdep-rebuild
+	keepdir /var/cache/revdep-rebuild
+	use prefix || fowners root:root /var/cache/revdep-rebuild
+	fperms 0700 /var/cache/revdep-rebuild
+
+	# remove on Gentoo Prefix platforms where it's broken anyway
+	if use prefix; then
+		elog "The revdep-rebuild command is removed, the preserve-libs"
+		elog "feature of portage will handle issues."
+		rm "${ED}"/usr/bin/revdep-rebuild*
+		rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+		rm -rf "${ED}"/etc/revdep-rebuild
+		rm -rf "${ED}"/var
+	fi
+}
+
+pkg_postinst() {
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "For further information on gentoolkit, please read the gentoolkit"
+		elog "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+		elog
+		elog "Another alternative to equery is app-portage/portage-utils"
+		elog
+		elog "Additional tools that may be of interest:"
+		elog
+		elog "    app-admin/eclean-kernel"
+		elog "    app-portage/diffmask"
+		elog "    app-portage/flaggie"
+		elog "    app-portage/install-mask"
+		elog "    app-portage/portpeek"
+		elog "    app-portage/smart-live-rebuild"
+	fi
+}
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index c8f08df754a8..daa52a89fd76 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.29 2013/09/04 22:24:11 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.30 2013/09/05 18:25:00 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0})
+PYTHON_COMPAT=(python{2_6,2_7,3_2,3_3} pypy2_0)
 PYTHON_REQ_USE="xml(+)"
 
 EGIT_MASTER="gentoolkit"
diff --git a/app-portage/gentoopm/gentoopm-0.2.6.ebuild b/app-portage/gentoopm/gentoopm-0.2.6.ebuild
index dc209bc157a5..cb5d1ce0c5ce 100644
--- a/app-portage/gentoopm/gentoopm-0.2.6.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.6.ebuild,v 1.9 2013/01/26 13:37:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.6.ebuild,v 1.10 2013/09/05 18:24:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=(python2_6 python2_7 python3_2)
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-0.2.8.ebuild b/app-portage/gentoopm/gentoopm-0.2.8.ebuild
index 824e1f944d50..a7f03c0b440c 100644
--- a/app-portage/gentoopm/gentoopm-0.2.8.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.2.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.8.ebuild,v 1.6 2013/08/18 13:29:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.8.ebuild,v 1.7 2013/09/05 18:24:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-0.2.9.ebuild b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
index e4fbc812d669..739c16d50168 100644
--- a/app-portage/gentoopm/gentoopm-0.2.9.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.9.ebuild,v 1.1 2013/08/08 23:02:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.9.ebuild,v 1.2 2013/09/05 18:24:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 7c18db4be22b..b19675ddd63d 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-9999.ebuild,v 1.5 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-9999.ebuild,v 1.6 2013/09/05 18:24:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-portage/gpyutils/gpyutils-0.1.ebuild b/app-portage/gpyutils/gpyutils-0.1.ebuild
index 028d97b615a8..53b71cd6cc0a 100644
--- a/app-portage/gpyutils/gpyutils-0.1.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gpyutils/gpyutils-0.1.ebuild,v 1.1 2013/08/08 23:02:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gpyutils/gpyutils-0.1.ebuild,v 1.2 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
index 9d546098072e..c62a3098e823 100644
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ b/app-portage/gpyutils/gpyutils-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gpyutils/gpyutils-9999.ebuild,v 1.3 2013/08/08 23:02:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gpyutils/gpyutils-9999.ebuild,v 1.4 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/app-portage/install-mask/install-mask-0.0.2-r3.ebuild b/app-portage/install-mask/install-mask-0.0.2-r3.ebuild
index a7b171663f35..86f640634644 100644
--- a/app-portage/install-mask/install-mask-0.0.2-r3.ebuild
+++ b/app-portage/install-mask/install-mask-0.0.2-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.0.2-r3.ebuild,v 1.1 2013/06/16 17:10:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.0.2-r3.ebuild,v 1.2 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/app-portage/install-mask/install-mask-0.1.1.ebuild b/app-portage/install-mask/install-mask-0.1.1.ebuild
index a8d389e3bad9..c1b840ed40ed 100644
--- a/app-portage/install-mask/install-mask-0.1.1.ebuild
+++ b/app-portage/install-mask/install-mask-0.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.1.1.ebuild,v 1.1 2013/07/24 08:54:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.1.1.ebuild,v 1.2 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/app-portage/install-mask/install-mask-9999.ebuild b/app-portage/install-mask/install-mask-9999.ebuild
index ec07af435318..d769c79eff3d 100644
--- a/app-portage/install-mask/install-mask-9999.ebuild
+++ b/app-portage/install-mask/install-mask-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-9999.ebuild,v 1.4 2013/07/24 08:54:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-9999.ebuild,v 1.5 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/app-portage/overlint/overlint-0.5.2.ebuild b/app-portage/overlint/overlint-0.5.2.ebuild
index 06d023efa4f0..86f959d2eb7c 100644
--- a/app-portage/overlint/overlint-0.5.2.ebuild
+++ b/app-portage/overlint/overlint-0.5.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/overlint/overlint-0.5.2.ebuild,v 1.3 2013/04/27 15:25:39 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/overlint/overlint-0.5.2.ebuild,v 1.4 2013/09/05 18:25:00 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild
index dc3aac0f0571..319bb6475592 100644
--- a/app-portage/pqlop/pqlop-0.02-r1.ebuild
+++ b/app-portage/pqlop/pqlop-0.02-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/pqlop/pqlop-0.02-r1.ebuild,v 1.1 2013/07/06 18:03:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/pqlop/pqlop-0.02-r1.ebuild,v 1.2 2013/09/05 18:24:58 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-r1
 
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild
index 409dfdfc0faf..9886744440a5 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild,v 1.7 2013/08/05 16:52:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.ebuild,v 1.8 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2 python3_3)
+PYTHON_COMPAT=(python2_6 python2_7 python3_2 python3_3)
 
 inherit distutils-r1
 
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index db4734aa81c4..617d246f7685 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild,v 1.4 2013/04/12 00:51:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild,v 1.5 2013/09/05 18:24:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/app-shells/autojump/autojump-21.3.0-r1.ebuild b/app-shells/autojump/autojump-21.3.0-r1.ebuild
index 6fd533cf4a4b..bb5ff6302eba 100644
--- a/app-shells/autojump/autojump-21.3.0-r1.ebuild
+++ b/app-shells/autojump/autojump-21.3.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.3.0-r1.ebuild,v 1.2 2013/05/04 11:14:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.3.0-r1.ebuild,v 1.3 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils python-r1 python-utils-r1 vcs-snapshot
 
diff --git a/app-shells/autojump/autojump-21.5.8-r1.ebuild b/app-shells/autojump/autojump-21.5.8-r1.ebuild
index 1549b7a028bb..99e3539af292 100644
--- a/app-shells/autojump/autojump-21.5.8-r1.ebuild
+++ b/app-shells/autojump/autojump-21.5.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.5.8-r1.ebuild,v 1.1 2013/08/06 22:02:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.5.8-r1.ebuild,v 1.2 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-r1 python-utils-r1 vcs-snapshot
 
diff --git a/app-shells/autojump/autojump-21.6.9.ebuild b/app-shells/autojump/autojump-21.6.9.ebuild
index 0b6560c55c01..b8f3b4bdde86 100644
--- a/app-shells/autojump/autojump-21.6.9.ebuild
+++ b/app-shells/autojump/autojump-21.6.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.6.9.ebuild,v 1.1 2013/08/06 22:02:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/autojump/autojump-21.6.9.ebuild,v 1.2 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-r1 python-utils-r1 vcs-snapshot
 
diff --git a/app-shells/fish/fish-2.0.0.ebuild b/app-shells/fish/fish-2.0.0.ebuild
index dc8622349146..d52e66580067 100644
--- a/app-shells/fish/fish-2.0.0.ebuild
+++ b/app-shells/fish/fish-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.0.0.ebuild,v 1.3 2013/09/04 07:57:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.0.0.ebuild,v 1.4 2013/09/05 19:24:42 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="X"
 
 DEPEND="sys-libs/ncurses
diff --git a/app-shells/zsh/zsh-5.0.2-r3.ebuild b/app-shells/zsh/zsh-5.0.2-r3.ebuild
index 523ed92b1480..1de926f4632d 100644
--- a/app-shells/zsh/zsh-5.0.2-r3.ebuild
+++ b/app-shells/zsh/zsh-5.0.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2-r3.ebuild,v 1.9 2013/09/05 05:32:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.2-r3.ebuild,v 1.10 2013/09/05 13:24:45 ago Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ SRC_URI="${ZSH_URI}
 
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-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 ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug doc examples gdbm maildir pcre static unicode"
 
 RDEPEND="
diff --git a/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
index ed3801a099dd..91cd2ed353fd 100644
--- a/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild,v 1.3 2013/06/30 15:34:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.6.8-r1.ebuild,v 1.4 2013/09/05 18:26:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 [ "$PV" == "9999" ] && inherit mercurial autotools
 inherit python-single-r1
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index c74ca2ea29f8..acd2a7004fe8 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.13 2013/06/30 15:34:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-9999.ebuild,v 1.14 2013/09/05 18:26:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 [ "$PV" == "9999" ] && inherit mercurial autotools
 inherit python-single-r1
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 1b37df53bc02..fbe2db8c5695 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -2,7 +2,7 @@ DIST ghostscript-9.04.tar.bz2 29869900 SHA256 f82c20b44ad3c204e2b78afbcd03a32dd5
 DIST ghostscript-9.05.tar.bz2 28279634 SHA256 0f41212af3a5a552ab2302cd90606dc8245be34490a699726dc95ed3cd89ceac SHA512 4a83c42a73fdb5139f02d1b9c8364d0b0f24e8d2952a622f94a8398d71ced8839ee868562d0bf3be048e34cae5ab0adc5eb43d2fb50f5154fe186e8329257913 WHIRLPOOL b5eb32c3551a82bd740674288471c0f050e612ecb709e38339e5eb6d7691f11af760dbc37f6002cf99e969b9ecc2fa296e7a35d97f3e647f86e4e194a91e29e8
 DIST ghostscript-9.06.tar.bz2 29246039 SHA256 05acd1b576899572ef8ecbc25637cf73cbd0be267e651732db3012db33088e04 SHA512 99f7a56316bf96d55c0cd7b07c0791ad4e6ee0d3a8f3bfa04ea28890ea9ed822ebcd7084cc8118cc38dc5def27c91c24eebc08a20a630463a9bf9d0193d0923b WHIRLPOOL a44e19c15440b3fa43233f05b3236ea6834a9f6ac2e7be5174685e6a377ad4a4e7a7cc58fa3df7072ed893d0d76e4bb83b0e890a2d8c45f496c753cb958c7b32
 DIST ghostscript-9.07.tar.bz2 27776111 SHA256 1e3ee857743bad34280a1186bd92bb486cd847ccd1a838919f82bc96f6687410 SHA512 7e075b82afd8057adb5b788d64e7bf6e1c769dd64acd74b8be13621504521ba088b3115984b0610967c1da6a54f6d824f7fef36b79264a949408912fc9a558d4 WHIRLPOOL e3331956a4a7d913031d88bb2d110e69c2ac1a77dfebff741bc18e51728e6786d79007c96ddce65e23e101aafeb1534e68922de6019c74d978294d62f70d4f62
-DIST ghostscript-9.09.tar.bz2 30948923 SHA256 a6ffd670c082499230506fb67cb68aad61c7b1206d03d5f2065fa6e5e82796f7 SHA512 7349fa8253f8f2e035490a144709f1b0a7c516078ea2bfd5450a3de5a76032b905932959e612ec6d1a948aced65b76c32fa56cd10c3e256aca768ecf1fb7f012 WHIRLPOOL e8abfcd52c3bddb4a8201837b6e530fc13edbfba2b74e3b3ffc010fe85f43a5594099a6adb20129713301479e0f0842767511f06b047ba0f3f142d51ccc0b459
+DIST ghostscript-9.10.tar.bz2 30983380 SHA256 6c8d9d1b23bd8ffd238274e342a40ab21762b0aab6355083ca0db673267dd580 SHA512 59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04 WHIRLPOOL e4471563d57882bc111f6a0d48a003ee56692f7ae94c53776be4a5f14fe0d43e2671bc04f8af04d65f3e73bd2e7d68961f9d77cbf644cdd327186ee3ed9ed4c2
 DIST ghostscript-gpl-9.04-patchset-3.tar.bz2 7760 SHA256 b3c20adc111b8ddf3bc7d60a01fa1b31eadb9d6d9eb8ac474d9aa1604bd51b6f SHA512 d8565b04cfd90a064d32aaa241d4ab4e477a04458aec1a27f273ae61ed7dd064758d7c77f3926b9baf759855953e4e178ca4d83a25e652a9263b62f5ffb137ae WHIRLPOOL 659ccace6e08bc12b0006281b08b5b63bedbee6ded9efd6055c8c6d56d01ee39f10d1974de1dcc31b4bedbedab4e79cf4a088b05a56de7bed467caf3b0ee1ad7
 DIST ghostscript-gpl-9.05-patchset-1.tar.bz2 4480 SHA256 30e31b11e72a115ee2cd3d01f6a638bc808427bc9579e8c9e1f84b073a19fa9f SHA512 f9613c07c7a67f8dab5b3e67530c9b2686cf5903ed541e659ecb1e0245b2bc85a18eb4a0a6c21e51c0575eaceabd68983c5a605924a53d9e3236c05534d88daf WHIRLPOOL 5fe85b045d0318308d217ed461362a029475bd0c529490aca5b21160bcd8c4cd7eba2807c42114dd42c25e2a01e58b708563547eb8d314e3c4f70b086689ad85
 DIST ghostscript-gpl-9.05-patchset-2.tar.bz2 5525 SHA256 1deadf8ed034353ffc14230b66cd438774bd6def03e6f93943f5200bbd01695b SHA512 c14ee057c7c1769e4bc4b3c52d910172dd45524318d6278f8f62f3f4535160412010ad8d426f96ee6fdf24a662859e3079205b9250496d6d69943f3972065d0c WHIRLPOOL 2de3c1bb38aff30c572a2f8ffffb31029215fcd30e075256cae7fb71044a1a635c20df77ef043f20f5ddf91668b820ddbb8052ea43dc326f2af3ecacffbb9568
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.09.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.10.ebuild
similarity index 98%
rename from app-text/ghostscript-gpl/ghostscript-gpl-9.09.ebuild
rename to app-text/ghostscript-gpl/ghostscript-gpl-9.10.ebuild
index d688fef767ad..4150f153e187 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.09.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.09.ebuild,v 1.2 2013/08/27 14:58:36 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10.ebuild,v 1.1 2013/09/06 00:53:53 tgurr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ GSDJVU_PV=1.6
 PVM=$(get_version_component_range 1-2)
 SRC_URI="
 	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-1.tar.bz2
+	mirror://gentoo/${PN}-9.09-patchset-1.tar.bz2
 	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
 
 LICENSE="AGPL-3 CPL-1.0"
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 5715d1a659d5..38eae59ef856 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild,v 1.2 2013/05/10 11:06:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild,v 1.3 2013/09/05 18:26:42 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 multibuild python-r1
 
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
index 04b7c7779d34..ed48dce47e1b 100644
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.2 2013/06/08 16:54:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/pylize-1.3b-r1.ebuild,v 1.3 2013/09/05 18:26:42 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
diff --git a/app-vim/gundo/gundo-2.5.0.ebuild b/app-vim/gundo/gundo-2.5.0.ebuild
index 9df62f5b7768..bfabfafde819 100644
--- a/app-vim/gundo/gundo-2.5.0.ebuild
+++ b/app-vim/gundo/gundo-2.5.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gundo/gundo-2.5.0.ebuild,v 1.1 2013/07/11 17:52:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gundo/gundo-2.5.0.ebuild,v 1.2 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit vim-plugin python-single-r1
 
diff --git a/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild b/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild
index 90ee5715df02..500969194677 100644
--- a/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild,v 1.8 2013/05/25 08:05:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-latex/vim-latex-1.8.23.20130116.ebuild,v 1.9 2013/09/05 19:44:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit vim-plugin versionator python-single-r1
 
diff --git a/dev-db/ctdb/ctdb-1.13.ebuild b/dev-db/ctdb/ctdb-1.13.ebuild
index b9b7fd60eed5..cc70668b96c8 100644
--- a/dev-db/ctdb/ctdb-1.13.ebuild
+++ b/dev-db/ctdb/ctdb-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.8 2013/09/04 07:58:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.9 2013/09/05 12:22:15 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-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="dev-libs/popt"
diff --git a/dev-db/postgresql-server/postgresql-server-8.4.17.ebuild b/dev-db/postgresql-server/postgresql-server-8.4.17.ebuild
index d73ad4b240c6..646b2a907dd7 100644
--- a/dev-db/postgresql-server/postgresql-server-8.4.17.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.4.17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.17.ebuild,v 1.12 2013/04/05 18:45:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.17.ebuild,v 1.13 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 WANT_AUTOMAKE="none"
 
 inherit autotools eutils multilib pam prefix python-single-r1 user versionator
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.13.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.13.ebuild
index c0c597dffd62..6960e1da0701 100644
--- a/dev-db/postgresql-server/postgresql-server-9.0.13.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.0.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.13.ebuild,v 1.12 2013/04/05 18:45:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.13.ebuild,v 1.13 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
 WANT_AUTOMAKE="none"
 
 inherit autotools eutils multilib pam prefix python-single-r1 user versionator
diff --git a/dev-db/postgresql-server/postgresql-server-9.1.9.ebuild b/dev-db/postgresql-server/postgresql-server-9.1.9.ebuild
index 06a392673b10..eeda2eba5661 100644
--- a/dev-db/postgresql-server/postgresql-server-9.1.9.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.1.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.9.ebuild,v 1.12 2013/04/05 18:45:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.9.ebuild,v 1.13 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
 WANT_AUTOMAKE="none"
 
 inherit autotools eutils flag-o-matic multilib pam prefix python-single-r1 user versionator
diff --git a/dev-db/postgresql-server/postgresql-server-9.2.4.ebuild b/dev-db/postgresql-server/postgresql-server-9.2.4.ebuild
index 0d562d38016e..5442e163cc99 100644
--- a/dev-db/postgresql-server/postgresql-server-9.2.4.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.4.ebuild,v 1.12 2013/04/05 18:45:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.4.ebuild,v 1.13 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
 WANT_AUTOMAKE="none"
 
 inherit autotools eutils flag-o-matic multilib pam prefix python-single-r1 user versionator
diff --git a/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild b/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild
index ebae5e11d13b..28b50fad25c8 100644
--- a/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild,v 1.1 2013/06/12 12:33:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.3_beta1-r1.ebuild,v 1.2 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
 WANT_AUTOMAKE="none"
 
 inherit autotools eutils flag-o-matic multilib pam prefix python-single-r1 systemd user versionator
diff --git a/dev-db/postgresql-server/postgresql-server-9.3_beta2.ebuild b/dev-db/postgresql-server/postgresql-server-9.3_beta2.ebuild
index a2cb8efd3e43..68f112645b22 100644
--- a/dev-db/postgresql-server/postgresql-server-9.3_beta2.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.3_beta2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.3_beta2.ebuild,v 1.1 2013/07/02 13:02:23 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.3_beta2.ebuild,v 1.2 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
 WANT_AUTOMAKE="none"
 
 inherit autotools eutils flag-o-matic multilib pam prefix python-single-r1 systemd user versionator
diff --git a/dev-db/postgresql-server/postgresql-server-9999.ebuild b/dev-db/postgresql-server/postgresql-server-9999.ebuild
index bdd94172d7e2..afbff50ae681 100644
--- a/dev-db/postgresql-server/postgresql-server-9999.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9999.ebuild,v 1.10 2013/07/25 04:08:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9999.ebuild,v 1.11 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
 WANT_AUTOMAKE="none"
 
 inherit autotools eutils flag-o-matic multilib pam prefix python-single-r1 user versionator base git-2
diff --git a/dev-embedded/bitbake/bitbake-1.17.0.ebuild b/dev-embedded/bitbake/bitbake-1.17.0.ebuild
index 99f4c663e43d..4301ab5a678d 100644
--- a/dev-embedded/bitbake/bitbake-1.17.0.ebuild
+++ b/dev-embedded/bitbake/bitbake-1.17.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.17.0.ebuild,v 1.4 2013/03/24 20:40:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.17.0.ebuild,v 1.5 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 vcs-snapshot
diff --git a/dev-embedded/bitbake/bitbake-9999.ebuild b/dev-embedded/bitbake/bitbake-9999.ebuild
index fe6ab358a2b7..f27f885a444d 100644
--- a/dev-embedded/bitbake/bitbake-9999.ebuild
+++ b/dev-embedded/bitbake/bitbake-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.13 2013/01/14 04:07:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.14 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 vcs-snapshot
diff --git a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
index 77fe9d87e948..b7460f2bdf68 100644
--- a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
+++ b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/cgi-3001.1.8.3.ebuild,v 1.4 2013/09/04 09:01:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/cgi-3001.1.8.3.ebuild,v 1.5 2013/09/05 19:22:23 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.0.5.ebuild b/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.0.5.ebuild
index 6b7324e2a458..a3de4170da13 100644
--- a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.0.5.ebuild
+++ b/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.0.5.ebuild,v 1.5 2013/09/04 09:01:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.0.5.ebuild,v 1.6 2013/09/05 19:22:26 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/dev-haskell/network/network-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
index 38237ec58134..c388a358bdb4 100644
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ b/dev-haskell/network/network-2.4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.4.1.2.ebuild,v 1.6 2013/09/03 11:54:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.4.1.2.ebuild,v 1.7 2013/09/05 12:20:05 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
diff --git a/dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch b/dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch
new file mode 100644
index 000000000000..e5fc06a98eb1
--- /dev/null
+++ b/dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch
@@ -0,0 +1,51 @@
+diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
+index 8e43091..3cc96ef 100644
+--- a/Codec/Archive/Tar/Pack.hs
++++ b/Codec/Archive/Tar/Pack.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  Codec.Archive.Tar
+@@ -28,8 +29,16 @@ import qualified System.FilePath as FilePath.Native
+ import System.Directory
+          ( getDirectoryContents, doesDirectoryExist, getModificationTime
+          , Permissions(..), getPermissions )
++#if MIN_VERSION_directory(1,2,0)
++-- The directory package switched to the new time package
++import Data.Time.Clock
++         ( UTCTime )
++import Data.Time.Clock.POSIX
++         ( utcTimeToPOSIXSeconds )
++#else
+ import System.Time
+          ( ClockTime(..) )
++#endif
+ import System.IO
+          ( IOMode(ReadMode), openBinaryFile, hFileSize )
+ import System.IO.Unsafe (unsafeInterleaveIO)
+@@ -170,5 +179,11 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do
+ 
+ getModTime :: FilePath -> IO EpochTime
+ getModTime path = do
++#if MIN_VERSION_directory(1,2,0)
++  -- The directory package switched to the new time package
++  t <- getModificationTime path
++  return . floor . utcTimeToPOSIXSeconds $ t
++#else
+   (TOD s _) <- getModificationTime path
+   return $! fromIntegral s
++#endif
+diff --git a/tar.cabal b/tar.cabal
+index 6467e4b..52e0611 100644
+--- a/tar.cabal
++++ b/tar.cabal
+@@ -25,7 +25,7 @@ source-repository head
+ 
+ library
+   build-depends: base >= 3 && < 5, filepath,
+-                 directory, old-time, bytestring
++                 directory, old-time, time, bytestring
+ 
+   exposed-modules:
+     Codec.Archive.Tar
diff --git a/dev-haskell/tar/tar-0.3.2.0.ebuild b/dev-haskell/tar/tar-0.3.2.0.ebuild
index 6f65c0a298ab..e04ce24667ff 100644
--- a/dev-haskell/tar/tar-0.3.2.0.ebuild
+++ b/dev-haskell/tar/tar-0.3.2.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/tar-0.3.2.0.ebuild,v 1.8 2012/12/10 21:53:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/tar-0.3.2.0.ebuild,v 1.9 2013/09/05 18:43:46 slyfox Exp $
 
 # ebuild generated by hackport 0.2.14
 
 EAPI="3"
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Reading, writing and manipulating .tar archive files."
 HOMEPAGE="http://hackage.haskell.org/package/tar"
@@ -21,3 +21,5 @@ IUSE=""
 RDEPEND=">=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}"/${P}-dir-1.2.patch)
diff --git a/dev-haskell/text/text-0.11.3.1.ebuild b/dev-haskell/text/text-0.11.3.1.ebuild
index 059d13639355..ae3e5bef89c7 100644
--- a/dev-haskell/text/text-0.11.3.1.ebuild
+++ b/dev-haskell/text/text-0.11.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.3.1.ebuild,v 1.7 2013/09/03 11:56:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.3.1.ebuild,v 1.8 2013/09/05 12:20:18 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="developer"
 
 RDEPEND=">=dev-haskell/deepseq-1.1.0.0:=[profile?]
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1.ebuild
index 9bd09508cb56..9117a08ae110 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1.ebuild,v 1.6 2013/09/04 09:03:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xhtml/xhtml-3000.2.1.ebuild,v 1.7 2013/09/05 19:23:51 ago Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.1"
diff --git a/dev-java/antlr/antlr-2.7.7-r1.ebuild b/dev-java/antlr/antlr-2.7.7-r1.ebuild
index b16e86a73c55..db24126ecbed 100644
--- a/dev-java/antlr/antlr-2.7.7-r1.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r1.ebuild,v 1.5 2013/06/30 15:22:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r1.ebuild,v 1.6 2013/09/05 18:27:44 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 DISTUTILS_OPTIONAL="y"
 DISTUTILS_SINGLE_IMPL="y"
diff --git a/dev-java/antlr/antlr-2.7.7-r3.ebuild b/dev-java/antlr/antlr-2.7.7-r3.ebuild
index 52dc1db4e9d7..be6285d0b6cf 100644
--- a/dev-java/antlr/antlr-2.7.7-r3.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r3.ebuild,v 1.5 2013/06/30 15:22:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r3.ebuild,v 1.6 2013/09/05 18:27:44 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 DISTUTILS_OPTIONAL="y"
 DISTUTILS_SINGLE_IMPL="y"
diff --git a/dev-java/antlr/antlr-2.7.7-r4.ebuild b/dev-java/antlr/antlr-2.7.7-r4.ebuild
index e54106f7aa7a..d40cc4cf6543 100644
--- a/dev-java/antlr/antlr-2.7.7-r4.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r4.ebuild,v 1.4 2013/06/30 15:22:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r4.ebuild,v 1.5 2013/09/05 18:27:44 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 DISTUTILS_OPTIONAL="y"
 DISTUTILS_SINGLE_IMPL="y"
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
index c758d063617d..06ca5e0668f1 100644
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.6 2013/06/30 15:22:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.7 2013/09/05 18:27:44 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 DISTUTILS_OPTIONAL="y"
 DISTUTILS_SINGLE_IMPL="y"
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
index 95eab97c15d8..bebc9a43cb41 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild,v 1.4 2013/08/28 11:15:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild,v 1.5 2013/09/05 13:46:01 ago Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="1.2"
 IUSE=""
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 
 COMMON_DEP="
 	dev-java/avalon-framework:4.1
diff --git a/dev-java/bcmail/bcmail-1.38-r2.ebuild b/dev-java/bcmail/bcmail-1.38-r3.ebuild
similarity index 87%
rename from dev-java/bcmail/bcmail-1.38-r2.ebuild
rename to dev-java/bcmail/bcmail-1.38-r3.ebuild
index 060e4c806179..2cd9c392b327 100644
--- a/dev-java/bcmail/bcmail-1.38-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.38-r2.ebuild,v 1.2 2013/09/01 11:38:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.38-r3.ebuild,v 1.1 2013/09/05 22:34:27 tomwij Exp $
 
 EAPI=1
 
@@ -17,7 +17,7 @@ LICENSE="BSD"
 SLOT="1.38"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
-COMMON_DEPEND="~dev-java/bcprov-${PV}:0
+COMMON_DEPEND="dev-java/bcprov:${SLOT}
 		=dev-java/junit-3.8*
 		dev-java/sun-jaf
 		java-virtuals/javamail"
@@ -41,7 +41,7 @@ src_compile() {
 
 	find org -name "*.java" > "${T}/src.list"
 	ejavac -d "${S}/classes" \
-		-classpath $(java-pkg_getjars bcprov,junit,sun-jaf,javamail) \
+		-classpath $(java-pkg_getjars bcprov-${SLOT},junit,sun-jaf,javamail) \
 		"@${T}/src.list"
 
 	cd "${S}/classes"
diff --git a/dev-java/hoteqn/hoteqn-4.0.0.ebuild b/dev-java/hoteqn/hoteqn-4.0.0.ebuild
index 6116ada51b6c..4bf1c8f248ef 100644
--- a/dev-java/hoteqn/hoteqn-4.0.0.ebuild
+++ b/dev-java/hoteqn/hoteqn-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hoteqn/hoteqn-4.0.0.ebuild,v 1.6 2013/09/04 09:03:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hoteqn/hoteqn-4.0.0.ebuild,v 1.7 2013/09/05 19:22:49 ago Exp $
 
 inherit java-pkg-2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT=0
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/java-config/java-config-2.1.12-r1.ebuild b/dev-java/java-config/java-config-2.1.12-r1.ebuild
index 7153d06a05eb..a1dfb3c4836f 100644
--- a/dev-java/java-config/java-config-2.1.12-r1.ebuild
+++ b/dev-java/java-config/java-config-2.1.12-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.12-r1.ebuild,v 1.8 2013/04/11 15:49:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.12-r1.ebuild,v 1.9 2013/09/05 18:27:44 mgorny Exp $
 
 EAPI="5"
 
 # jython depends on java-config, so don't add it or things will breake.
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 eutils fdo-mime gnome2-utils
 
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild b/dev-java/java-config/java-config-2.2.0.ebuild
index 395158522feb..f4d8d8fdaa77 100644
--- a/dev-java/java-config/java-config-2.2.0.ebuild
+++ b/dev-java/java-config/java-config-2.2.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.2.0.ebuild,v 1.5 2013/07/12 15:25:50 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.2.0.ebuild,v 1.6 2013/09/05 18:27:44 mgorny Exp $
 
 EAPI="5"
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index d8d66c6e16bc..5b39cb3f53dc 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.2 2013/04/16 18:38:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.3 2013/09/05 18:27:44 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=(python2_{5,6,7})
+PYTHON_COMPAT=(python2_{6,7})
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 eutils multilib
diff --git a/dev-lang/python/files/CVE-2013-4238_py32.patch b/dev-lang/python/files/CVE-2013-4238_py32.patch
deleted file mode 100644
index 33a1dbbadd55..000000000000
--- a/dev-lang/python/files/CVE-2013-4238_py32.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -r b9b521efeba3 Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py	Sat May 18 17:56:42 2013 +0200
-+++ b/Lib/test/test_ssl.py	Sat Aug 17 01:24:44 2013 +0200
-@@ -52,6 +52,7 @@
- WRONGCERT = data_file("XXXnonexisting.pem")
- BADKEY = data_file("badkey.pem")
- NOKIACERT = data_file("nokia.pem")
-+NULLBYTECERT = data_file("nullbytecert.pem")
- 
- 
- def handle_error(prefix):
-@@ -140,6 +141,27 @@
-                           ('DNS', 'projects.forum.nokia.com'))
-                         )
- 
-+    def test_parse_cert_CVE_2013_4073(self):
-+        p = ssl._ssl._test_decode_cert(NULLBYTECERT)
-+        if support.verbose:
-+            sys.stdout.write("\n" + pprint.pformat(p) + "\n")
-+        subject = ((('countryName', 'US'),),
-+                   (('stateOrProvinceName', 'Oregon'),),
-+                   (('localityName', 'Beaverton'),),
-+                   (('organizationName', 'Python Software Foundation'),),
-+                   (('organizationalUnitName', 'Python Core Development'),),
-+                   (('commonName', 'null.python.org\x00example.org'),),
-+                   (('emailAddress', 'python-dev@python.org'),))
-+        self.assertEqual(p['subject'], subject)
-+        self.assertEqual(p['issuer'], subject)
-+        self.assertEqual(p['subjectAltName'],
-+                         (('DNS', 'altnull.python.org\x00example.com'),
-+                         ('email', 'null@python.org\x00user@example.org'),
-+                         ('URI', 'http://null.python.org\x00http://example.org'),
-+                         ('IP Address', '192.0.2.1'),
-+                         ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
-+                        )
-+
-     def test_DER_to_PEM(self):
-         with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
-             pem = f.read()
-@@ -271,6 +293,13 @@
-         fail(cert, 'foo.a.com')
-         fail(cert, 'bar.foo.com')
- 
-+        # NULL bytes are bad, CVE-2013-4073
-+        cert = {'subject': ((('commonName',
-+                              'null.python.org\x00example.org'),),)}
-+        ok(cert, 'null.python.org\x00example.org') # or raise an error?
-+        fail(cert, 'example.org')
-+        fail(cert, 'null.python.org')
-+
-         # Slightly fake real-world example
-         cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT',
-                 'subject': ((('commonName', 'linuxfrz.org'),),),
-diff -r b9b521efeba3 Misc/NEWS
---- a/Misc/NEWS	Sat May 18 17:56:42 2013 +0200
-+++ b/Misc/NEWS	Sat Aug 17 01:24:44 2013 +0200
-@@ -10,6 +10,12 @@
- Library
- -------
- 
-+- Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
-+  inside subjectAltName correctly. Formerly the module has used OpenSSL's
-+  GENERAL_NAME_print() function to get the string represention of ASN.1
-+  strings for ``rfc822Name`` (email), ``dNSName`` (DNS) and
-+  ``uniformResourceIdentifier`` (URI).
-+
- - Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of
-   service using certificates with many wildcards (CVE-2013-2099).
- 
-diff -r b9b521efeba3 Modules/_ssl.c
---- a/Modules/_ssl.c	Sat May 18 17:56:42 2013 +0200
-+++ b/Modules/_ssl.c	Sat Aug 17 01:24:44 2013 +0200
-@@ -616,12 +616,14 @@
-                            ext->value->length));
- 
-         for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
--
-             /* get a rendering of each name in the set of names */
-+            int gntype;
-+            ASN1_STRING *as = NULL;
- 
-             name = sk_GENERAL_NAME_value(names, j);
--            if (name->type == GEN_DIRNAME) {
--
-+            gntype = name-> type;
-+            switch (gntype) {
-+            case GEN_DIRNAME:
-                 /* we special-case DirName as a tuple of
-                    tuples of attributes */
- 
-@@ -643,11 +645,62 @@
-                     goto fail;
-                 }
-                 PyTuple_SET_ITEM(t, 1, v);
-+                break;
- 
--            } else {
-+            case GEN_EMAIL:
-+            case GEN_DNS:
-+            case GEN_URI:
-+                /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string
-+                   correctly. */
-+                t = PyTuple_New(2);
-+                if (t == NULL)
-+                    goto fail;
-+                switch (gntype) {
-+                case GEN_EMAIL:
-+                    v = PyUnicode_FromString("email");
-+                    as = name->d.rfc822Name;
-+                    break;
-+                case GEN_DNS:
-+                    v = PyUnicode_FromString("DNS");
-+                    as = name->d.dNSName;
-+                    break;
-+                case GEN_URI:
-+                    v = PyUnicode_FromString("URI");
-+                    as = name->d.uniformResourceIdentifier;
-+                    break;
-+                }
-+                if (v == NULL) {
-+                    Py_DECREF(t);
-+                    goto fail;
-+                }
-+                PyTuple_SET_ITEM(t, 0, v);
-+                v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as),
-+                                                ASN1_STRING_length(as));
-+                if (v == NULL) {
-+                    Py_DECREF(t);
-+                    goto fail;
-+                }
-+                PyTuple_SET_ITEM(t, 1, v);
-+                break;
- 
-+            default:
-                 /* for everything else, we use the OpenSSL print form */
--
-+                switch (gntype) {
-+                    /* check for new general name type */
-+                    case GEN_OTHERNAME:
-+                    case GEN_X400:
-+                    case GEN_EDIPARTY:
-+                    case GEN_IPADD:
-+                    case GEN_RID:
-+                        break;
-+                    default:
-+                        if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1,
-+                                             "Unknown general name type %d",
-+                                             gntype) == -1) {
-+                            goto fail;
-+                        }
-+                        break;
-+                }
-                 (void) BIO_reset(biobuf);
-                 GENERAL_NAME_print(biobuf, name);
-                 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
-@@ -674,6 +727,7 @@
-                     goto fail;
-                 }
-                 PyTuple_SET_ITEM(t, 1, v);
-+                break;
-             }
- 
-             /* and add that rendering to the list */
diff --git a/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild b/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild
index cda7b6739657..1ea975e95a36 100644
--- a/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild,v 1.3 2013/09/01 14:45:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild,v 1.4 2013/09/05 15:50:11 jer Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ SRC_URI="mirror://ruby/2.0/${MY_P}.tar.bz2
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml"
 
 RDEPEND="
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
index 8f3d71509ee4..cfe673c0183a 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild,v 1.5 2013/09/04 08:27:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.2.15-r2.ebuild,v 1.6 2013/09/05 13:45:23 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -16,7 +16,7 @@ SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2"
 
 LICENSE="NPL-1.1"
 SLOT="0/mozjs"
-KEYWORDS="alpha amd64 ~arm ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
 IUSE="threadsafe"
 
 S="${WORKDIR}/mozilla-1.9.2"
diff --git a/dev-libs/Ice/Ice-3.5.0-r1.ebuild b/dev-libs/Ice/Ice-3.5.0-r1.ebuild
index 4237ff80d505..1ea058813ffd 100644
--- a/dev-libs/Ice/Ice-3.5.0-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.5.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.0-r1.ebuild,v 1.2 2013/07/30 21:15:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.0-r1.ebuild,v 1.3 2013/09/05 18:29:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby18"
 
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index ac3bad1d0d92..24e39d97bcba 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -1,3 +1,2 @@
 DIST STLport-5.2.1.tar.bz2 717202 SHA256 755b007b982c4545086c43affc8ed32c0acd577ee206eb1f6967e250c3546fc9 SHA512 c619f1965e42a444714f6a2bcbade3428e09823ad056930b32bf8224b7b3e4b4ae82e25e4ba7b4584f73645a7838a677f314b7bc583d1d9bbcef6fcafc439141 WHIRLPOOL 0d8539b98dd57c8b548bcfaeed3866c348f7f750b676404f40b2beda3c5095a2d94496d670e9f13b7287033fecd8c9f997aad44dfb07b310a8236956bdf2d52e
-DIST STLport-patches-5.2.1-1.tbz2 4911 SHA256 3b9741849a303afc1f4ae30f4748e7de729786c3630885d1ac70734846b55e61 SHA512 68adb3bb4751270636feef1e35659b490069306127dcbb52d58ff5ab1d6deb005fb7315b5b53b9cc11bf1386645330a1e644104f06f2bf68cfa288b87f6ddd36 WHIRLPOOL c4a1cf7dcecfd68b2056529a826bc5132b49147c3901d06d79b8a5c949635fd854391954c56cf15af0f081bab7370e11020747e27e749d74916242ee69a339a4
 DIST STLport-patches-5.2.1-2.tbz2 5245 SHA256 ccf0803a0b5e3c887e52d6132eb48932d566a933d299ebb22858ebd39dddc0c4 SHA512 ddc1b282d1b8008f1f6d5aa3eee0f821063c00fdf851cb569f69955dd3e1ad46b3e57a5c458a1f54aa75737cafe848cf20685b729951a58e80f14234804b92bb WHIRLPOOL cbb1ba74aca4cd454855aad6371ac7140fef42aa70b30c29e70a3b6d24044e5acd221a5a12c90414fb20bfb26ea879e7e3839ff8857b717d793538ca67380e33
diff --git a/dev-libs/STLport/STLport-5.2.1.ebuild b/dev-libs/STLport/STLport-5.2.1-r2.ebuild
similarity index 74%
rename from dev-libs/STLport/STLport-5.2.1.ebuild
rename to dev-libs/STLport/STLport-5.2.1-r2.ebuild
index c8dfb3280659..cce651042497 100644
--- a/dev-libs/STLport/STLport-5.2.1.ebuild
+++ b/dev-libs/STLport/STLport-5.2.1-r2.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.2.1.ebuild,v 1.6 2013/01/04 15:15:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.2.1-r2.ebuild,v 1.1 2013/09/05 12:22:55 pinkbyte Exp $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils versionator toolchain-funcs multilib
 
-PATCH_V="1"
+PATCH_V="2"
 
 DESCRIPTION="C++ STL library"
 HOMEPAGE="http://stlport.sourceforge.net/"
 SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2
-	mirror://gentoo/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
+	http://dev.gentoo.org/~xarthisius/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
 
 LICENSE="boehm-gc HPND"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="boost debug static static-libs threads"
 
 DEPEND="boost? ( >=dev-libs/boost-1.35.0-r5 )"
 RDEPEND="${DEPEND}"
 
+DOCS=( README etc/ChangeLog doc/FAQ doc/README.utf8 )
+
 pkg_setup() {
 	# make sure OSNAME is not in the environment (bug #305399)
 	unset OSNAME
@@ -42,6 +44,8 @@ src_prepare() {
 	#define _LARGEFILE_SOURCE
 	#define _LARGEFILE64_SOURCE
 	EOF
+
+	epatch_user
 }
 
 src_configure() {
@@ -51,25 +55,24 @@ src_configure() {
 		BOOST_PKG="$(best_version ">=dev-libs/boost-1.35.0-r5")"
 		BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
 		BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-		BOOST_INC="/usr/include/boost-${BOOST_VER}"
+		BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}"
 
 		myconf+="--with-boost=${BOOST_INC} --with-system-boost "
 		# make sure user apps (e.g. other packges using STLport) use boost as well
 		sed -i \
 			-e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \
-			stlport/stl/config/user_config.h
+			stlport/stl/config/user_config.h || die
 	fi
 
-	use debug || myconf+="--without-debug "
-	use static-libs && myconf+="--enable-static "
-	use threads || myconf+="--without-thread "
-	use static && myconf+="--use-static-gcc "
-
 	# It's not an autoconf script
 	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--use-compiler-family=gcc \
+		$(use debug || echo "--without-debug") \
+		$(use static && echo "--use-static-gcc") \
+		$(use static-libs && echo "--enable-static") \
+		$(use threads && echo "--without-thread") \
 		${myconf} \
 		--with-cc="$(tc-getCC)" \
 		--with-cxx="$(tc-getCXX)" \
@@ -82,15 +85,14 @@ src_install() {
 	# precreate some directories
 	dodir /usr/$(get_libdir)
 
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README etc/ChangeLog etc/*.txt doc/*.txt doc/{FAQ,README.utf8}
+	default
+	dodoc etc/*.txt doc/*.txt
 }
 
 src_test() {
 	if use static ; then
 		ewarn "Tests don't work when building with USE=static. Skipping..."
-		return
+	else
+		default
 	fi
-	default
 }
diff --git a/dev-libs/boost/boost-1.52.0-r6.ebuild b/dev-libs/boost/boost-1.52.0-r6.ebuild
index 5442a7b33e7d..c89d97d8a53b 100644
--- a/dev-libs/boost/boost-1.52.0-r6.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild,v 1.4 2013/08/25 12:19:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r6.ebuild,v 1.5 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
diff --git a/dev-libs/boost/boost-1.53.0.ebuild b/dev-libs/boost/boost-1.53.0.ebuild
index 1046ce5e4ab6..b56a3ae73352 100644
--- a/dev-libs/boost/boost-1.53.0.ebuild
+++ b/dev-libs/boost/boost-1.53.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0.ebuild,v 1.6 2013/08/27 11:41:29 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0.ebuild,v 1.7 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
diff --git a/dev-libs/boost/boost-1.54.0.ebuild b/dev-libs/boost/boost-1.54.0.ebuild
index 77826460b5e3..8a695313ce7e 100644
--- a/dev-libs/boost/boost-1.54.0.ebuild
+++ b/dev-libs/boost/boost-1.54.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0.ebuild,v 1.2 2013/08/27 11:41:29 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0.ebuild,v 1.3 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
diff --git a/dev-libs/botan/botan-1.10.3-r1.ebuild b/dev-libs/botan/botan-1.10.3-r1.ebuild
index 928d7843176b..419c9e435e85 100644
--- a/dev-libs/botan/botan-1.10.3-r1.ebuild
+++ b/dev-libs/botan/botan-1.10.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.3-r1.ebuild,v 1.2 2013/02/21 13:36:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.10.3-r1.ebuild,v 1.3 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild
index 8cd01c3377fe..51fcf1635d29 100644
--- a/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild,v 1.3 2013/03/10 16:29:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild,v 1.4 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 6a6bdf2b5219..427054a4424a 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,4 +1,3 @@
 DIST cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz 7462 SHA256 9514a7436b11184cfd7e8a9ccd3590ce9f89cf2dc272ffbbdeeab16f9ae4fe6f SHA512 a0a00d78019a5bce1456aebb7a8f9c740f9c0f8340916e977249f1b766f503e8e33ab81cbc6e0cdafe4a8c806e5631395431107ff578f75cb89fc9cca1a57fca WHIRLPOOL aac154414f6ae4aa7db9e4eed8dc698c16a0aefdb2b7fe3aa34be5d24aa1b07d04f8f6aa0300f8365911d10e5552b6b978757f951a75af958745b8a5f547ea9f
 DIST cyrus-sasl-2.1.23.tar.gz 1613642 SHA256 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136 SHA512 bf72db55fefe9eccfe4a12caf1160efc80aba98f8acc2743af360fda96659a3ee1fc3a5af6104b3dfc8fc4571f4e98526b9719a6cdf0948980cf76a9cb1a2b0e WHIRLPOOL 36e0b85228105186160ac8f8751137a067bca0cf6e219dda527808cb04ae597273c97b9d8cd3c1e3b900787a70ad67e5395127ab5107ef0e8ac0100b04612673
-DIST cyrus-sasl-2.1.25.tar.gz 5209240 SHA256 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe SHA512 cab89deb025cb29b316990f29e7456be4fd1303553032df35c50331e5608c27ade16fd9b48578a294153493a12cd82af1db2f8a2ce7e385b03a9ebfc82085289 WHIRLPOOL eef119539e5c71af9c3505956ca20a8ae12e58f1d91e2c0fcc5af7679cda9e4f0d44beb3d45f03e24d604ff1b9f4b9850ed494c41a4c7a237b22f4b91e3fa79c
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 SHA256 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 WHIRLPOOL bcba17705d5d7ef9a03802d6a0c3a887bba0473605a3a48d2672aeac187193f2488f28ab01bdf659d7a68b94b4c74e36428ca4b5be840fbed2968f1592534b33
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
deleted file mode 100644
index 392c19269e04..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild,v 1.10 2012/12/21 13:27:37 eras Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-ntlm_patch="${P}-ntlm_impl-spnego.patch.gz"
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://asg.web.cmu.edu/sasl/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
-	ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb crypt gdbm kerberos openldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom"
-
-DEPEND="authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use gdbm && use berkdb ; then
-		echo
-		elog "You have both 'gdbm' and 'berkdb' USE flags enabled."
-		elog "gdbm will be selected."
-		echo
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	# Fix default port name for rimap auth mechanism.
-	sed -e '/define DEFAULT_REMOTE_SERVICE/s:imap:imap2:' \
-		-i saslauthd/auth_rimap.c || die "sed failed"
-
-	# UNSUPPORTED ntlm patch #81342
-	use ntlm_unsupported_patch && epatch "${DISTDIR}/${ntlm_patch}"
-	epatch "${FILESDIR}"/${PN}-2.1.17-pgsql-include.patch
-	use crypt && epatch "${FILESDIR}"/${PN}-2.1.19-checkpw.c.patch #45181
-	epatch "${FILESDIR}"/${PN}-2.1.22-as-needed.patch
-	epatch "${FILESDIR}/${PN}-2.1.21-keytab.patch"
-	epatch "${FILESDIR}"/${PN}-2.1.22-crypt.patch #152544
-	epatch "${FILESDIR}"/${PN}-2.1.22-qa.patch
-	epatch "${FILESDIR}/${PN}-2.1.22-gcc44.patch" #248738
-	epatch "${FILESDIR}"/${P}-authd-fix.patch
-	epatch "${FILESDIR}"/${P}+db-5.0.patch
-	epatch "${FILESDIR}/${PN}-0001_versioned_symbols.patch"
-	epatch "${FILESDIR}/${PN}-0002_testsuite.patch"
-	epatch "${FILESDIR}/${PN}-0006_library_mutexes.patch"
-	epatch "${FILESDIR}/${PN}-0008_one_time_sasl_set_alloc.patch"
-	epatch "${FILESDIR}/${PN}-0010_maintainer_mode.patch"
-	epatch "${FILESDIR}/${PN}-0011_saslauthd_ac_prog_libtool.patch"
-	epatch "${FILESDIR}/${PN}-0012_xopen_crypt_prototype.patch"
-	epatch "${FILESDIR}/${PN}-0014_avoid_pic_overwrite.patch"
-	epatch "${FILESDIR}/${PN}-0016_pid_file_lock_creation_mask.patch"
-	epatch "${FILESDIR}/${PN}-0026_drop_krb5support_dependency.patch"
-	epatch "${FILESDIR}"/${P}-rimap-loop.patch #381427
-	epatch "${FILESDIR}"/${P}-gss_c_nt_hostbased_service.patch #389349
-
-	sed -i -e '/for dbname in/s:db-4.* db:'$(db_libname)':' \
-		"${S}"/cmulocal/berkdb.m4
-
-	# Upstream doesn't even honor their own configure options... grumble
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# make sure to use common plugin ldflags
-	sed -i '/_la_LDFLAGS = /s:=:= $(AM_LDFLAGS) :' plugins/Makefile.am || die
-
-	# Recreate configure.
-	rm -f "${S}/config/libtool.m4" || die "rm libtool.m4 failed"
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_configure() {
-	# Fix QA issues.
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	use urandom && myconf="${myconf} --with-devrandom=/dev/urandom"
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-krb4 \
-		--disable-otp \
-		--without-sqlite \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable openldap ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_enable srp) \
-		${myconf}
-}
-
-src_compile() {
-	# We force -j1 for bug #110066.
-	emake -j1 || die "emake failed"
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Add testsaslauthd (bug #58768).
-	cd "${S}/saslauthd"
-	emake testsaslauthd || die "emake testsaslauthd failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	# Install everything necessary so users can build sample
-	# client/server (bug #64733).
-	if use sample ; then
-		insinto /usr/share/${PN}-2/examples
-		doins aclocal.m4 config.h config.status configure.in
-		dosym /usr/include/sasl /usr/share/${PN}-2/examples/include
-		exeinto /usr/share/${PN}-2/examples
-		doexe libtool
-		insinto /usr/share/${PN}-2/examples/sample
-		doins sample/*.{c,h} sample/*Makefile*
-		insinto /usr/share/${PN}-2/examples/sample/.deps
-		doins sample/.deps/*
-		dodir /usr/share/${PN}-2/examples/lib
-		dosym /usr/$(get_libdir)/libsasl2.la /usr/share/${PN}-2/examples/lib/libsasl2.la
-		dodir /usr/share/${PN}-2/examples/lib/.libs
-		dosym /usr/$(get_libdir)/libsasl2.so /usr/share/${PN}-2/examples/lib/.libs/libsasl2.so
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java || die "Failed to copy java files to /usr/share/doc/${PF}/java/Test"
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd || die "Failed to install saslauthd to /etc/pam.d"
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck || die "Failed to install pwcheck to /etc/init.d"
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd || die "Failed to install saslauthd to /etc/init.d"
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd || die "Failed to install saslauthd to /etc/conf.d"
-
-	exeinto /usr/sbin
-	newexe "${S}/saslauthd/testsaslauthd" testsaslauthd || die "Failed to install testsaslauthd"
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use sample ; then
-		elog "You have chosen to install sources for the example client and server."
-		elog "To build these, please type:"
-		elog "\tcd /usr/share/${PN}-2/examples/sample && make"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild
deleted file mode 100644
index d3d479904b8e..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild,v 1.15 2013/04/24 08:48:34 eras Exp $
-
-EAPI=4
-
-# should be fixed in automake-1.13.2(?).  Please test and remove if appropriate.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sasldb_al.patch
-	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
-	epatch "${FILESDIR}"/${P}-as_needed.patch
-	epatch "${FILESDIR}"/${P}-missing_header.patch
-	epatch "${FILESDIR}"/${P}-gssapi.patch
-	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
-	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
-	epatch "${FILESDIR}"/${P}-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
-	epatch "${FILESDIR}"/${P}-get_fqhostname.patch
-	epatch "${FILESDIR}"/${P}-service_keytabs.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' configure.in
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		configure.in || die
-
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Add testsaslauthd (bug #58768).
-	cd "${S}/saslauthd"
-	emake testsaslauthd
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r1.ebuild
deleted file mode 100644
index b0905815cde1..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r1.ebuild,v 1.3 2013/04/24 08:48:34 eras Exp $
-
-EAPI=5
-
-# should be fixed in automake-1.13.2(?).  Please test when released.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild
deleted file mode 100644
index dbb99525c574..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r2.ebuild,v 1.1 2013/07/13 12:01:10 pacho Exp $
-
-EAPI=5
-
-# should be fixed in automake-1.13.2(?).  Please test when released.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/run/saslauthd \
-		--with-pwcheck=/run/saslauthd \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
-}
diff --git a/dev-libs/dee/dee-1.0.14-r2.ebuild b/dev-libs/dee/dee-1.0.14-r2.ebuild
index c136de52754b..8e3535a5db90 100644
--- a/dev-libs/dee/dee-1.0.14-r2.ebuild
+++ b/dev-libs/dee/dee-1.0.14-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dee/dee-1.0.14-r2.ebuild,v 1.5 2013/05/29 15:30:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dee/dee-1.0.14-r2.ebuild,v 1.6 2013/09/05 18:29:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 AUTOTOOLS_AUTORECONF=y
 
diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13.ebuild
index 73deb05a5e99..8b31a4856d93 100644
--- a/dev-libs/ferrisloki/ferrisloki-3.0.13.ebuild
+++ b/dev-libs/ferrisloki/ferrisloki-3.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ferrisloki/ferrisloki-3.0.13.ebuild,v 1.4 2013/09/05 11:28:19 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ferrisloki/ferrisloki-3.0.13.ebuild,v 1.5 2013/09/05 13:07:26 pinkbyte Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs stlport"
 
 RDEPEND="stlport? ( >=dev-libs/STLport-5 )
diff --git a/dev-libs/glib/glib-2.34.3-r1.ebuild b/dev-libs/glib/glib-2.34.3-r1.ebuild
index 7968f36fed99..105e53b38cc9 100644
--- a/dev-libs/glib/glib-2.34.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.34.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3-r1.ebuild,v 1.2 2013/08/16 08:30:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3-r1.ebuild,v 1.3 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 # Avoid runtime dependency on python when USE=test
 
 inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info
diff --git a/dev-libs/glib/glib-2.36.4-r1.ebuild b/dev-libs/glib/glib-2.36.4-r1.ebuild
index cd4f518d8609..3cd6e0bd20e8 100644
--- a/dev-libs/glib/glib-2.36.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.36.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild,v 1.1 2013/09/02 18:29:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild,v 1.2 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 # Avoid runtime dependency on python when USE=test
 
 inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
diff --git a/dev-libs/glib/glib-2.36.4.ebuild b/dev-libs/glib/glib-2.36.4.ebuild
index 363e67f37536..1b54110751e9 100644
--- a/dev-libs/glib/glib-2.36.4.ebuild
+++ b/dev-libs/glib/glib-2.36.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4.ebuild,v 1.2 2013/09/01 19:47:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4.ebuild,v 1.3 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 # Avoid runtime dependency on python when USE=test
 
 inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch b/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch
new file mode 100644
index 000000000000..8289ec07bdc7
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/gobject-introspection-1.36.0-detect-clang.patch
@@ -0,0 +1,27 @@
+From 863ceb7f5a5b5f6accfea23dcd47b5c74a53f68b Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu, 02 May 2013 01:49:01 +0000
+Subject: Do not misdetect clang as the Microsoft C compiler
+
+Just because they both start with 'cl'.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698090
+---
+diff --git a/giscanner/dumper.py b/giscanner/dumper.py
+index f5346a4..1ef1f4b 100644
+--- a/giscanner/dumper.py
++++ b/giscanner/dumper.py
+@@ -89,8 +89,9 @@ class DumpCompiler(object):
+         # Enable the --msvc-syntax pkg-config flag when
+         # the Microsoft compiler is used
+         # (This is the other way to check whether Visual C++ is used subsequently)
+-        if 'cl' in self._compiler_cmd:
+-            self._pkgconfig_msvc_flags = '--msvc-syntax'
++        if 'clang' not in self._compiler_cmd:
++            if 'cl' in self._compiler_cmd:
++                self._pkgconfig_msvc_flags = '--msvc-syntax'
+         self._uninst_srcdir = os.environ.get(
+             'UNINSTALLED_INTROSPECTION_SRCDIR')
+         self._packages = ['gio-2.0 gmodule-2.0']
+--
+cgit v0.9.2
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild
new file mode 100644
index 000000000000..2a733a056725
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild,v 1.1 2013/09/05 20:01:42 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="cairo doctool test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2
+	doctool? ( dev-python/mako )
+	virtual/libffi:=
+	!<dev-lang/vala-0.20.0
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Do not misdetect clang as the Microsoft C compiler (from 'master)
+	epatch "${FILESDIR}/${PN}-1.36.0-detect-clang.patch"
+
+	# To prevent crosscompiling problems, bug #414105
+	CC=$(tc-getCC)
+
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_prepare
+
+	# avoid GNU-isms
+	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
+
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+}
+
+src_configure(){
+	gnome2_src_configure \
+		--disable-static \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/libRocket/libRocket-1.2.1.ebuild b/dev-libs/libRocket/libRocket-1.2.1.ebuild
index bc468d627118..b8700ef081d1 100644
--- a/dev-libs/libRocket/libRocket-1.2.1.ebuild
+++ b/dev-libs/libRocket/libRocket-1.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1.ebuild,v 1.4 2013/05/29 13:24:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1.ebuild,v 1.5 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit cmake-utils eutils python-r1
 
 DESCRIPTION="A HTML/CSS User Interface library"
diff --git a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild b/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
index 1b26d960c4ca..3c7abeb1fb22 100644
--- a/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
+++ b/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v 1.2 2013/05/29 13:24:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild,v 1.3 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit cmake-utils eutils python-r1 multilib-minimal
 
 DESCRIPTION="A HTML/CSS User Interface library"
diff --git a/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild b/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild
index 34700d72cb93..bc9e54bf7288 100644
--- a/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild
+++ b/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild,v 1.6 2013/06/30 17:14:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild,v 1.7 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit cmake-utils eutils python-r1
 
 DESCRIPTION="A HTML/CSS User Interface library"
diff --git a/dev-libs/libRocket/libRocket-9999.ebuild b/dev-libs/libRocket/libRocket-9999.ebuild
index b4a3ae8f0645..d732102f97e3 100644
--- a/dev-libs/libRocket/libRocket-9999.ebuild
+++ b/dev-libs/libRocket/libRocket-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v 1.4 2013/05/29 13:24:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-9999.ebuild,v 1.5 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit cmake-utils git-2 python-r1 multilib-minimal
 
 DESCRIPTION="A HTML/CSS User Interface library"
diff --git a/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild b/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild
index 0534a966eef1..3e423376284a 100644
--- a/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild
+++ b/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild,v 1.2 2013/07/29 15:10:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild,v 1.3 2013/09/05 18:29:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 EGIT_REPO_URI="http://llvm.org/git/${PN}.git"
 
diff --git a/dev-libs/libclc/libclc-0.0.1_pre20130819.ebuild b/dev-libs/libclc/libclc-0.0.1_pre20130819.ebuild
index faa46e9aa4a6..f00389530491 100644
--- a/dev-libs/libclc/libclc-0.0.1_pre20130819.ebuild
+++ b/dev-libs/libclc/libclc-0.0.1_pre20130819.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20130819.ebuild,v 1.3 2013/08/27 19:31:20 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20130819.ebuild,v 1.4 2013/09/05 18:29:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 EGIT_REPO_URI="http://llvm.org/git/${PN}.git"
 
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
index 6cb1e955bb8f..f66dd82a4d06 100644
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.16 2013/07/12 00:20:30 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdnet/libdnet-1.12.ebuild,v 1.17 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI=5
 
 AT_M4DIR="config"
 PYTHON_DEPEND="python? 2"
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit autotools distutils-r1 eutils
 
diff --git a/dev-libs/libev/libev-4.15.ebuild b/dev-libs/libev/libev-4.15.ebuild
index 7411c8216a5f..3d86a326ee06 100644
--- a/dev-libs/libev/libev-4.15.ebuild
+++ b/dev-libs/libev/libev-4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.15.ebuild,v 1.2 2013/08/16 13:44:40 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.15.ebuild,v 1.5 2013/09/05 15:01:38 jer Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-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 ~x86-macos"
+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 ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
diff --git a/dev-libs/libnl/libnl-3.2.22-r2.ebuild b/dev-libs/libnl/libnl-3.2.22-r2.ebuild
index c348b176a156..aff2500edd16 100644
--- a/dev-libs/libnl/libnl-3.2.22-r2.ebuild
+++ b/dev-libs/libnl/libnl-3.2.22-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.22-r2.ebuild,v 1.2 2013/07/21 12:41:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.22-r2.ebuild,v 1.3 2013/09/05 18:29:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} python3_{1,2,3} )
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 eutils libtool multilib
 
diff --git a/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild b/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
index b938cb6a23ab..df53e6fed653 100644
--- a/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
+++ b/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild,v 1.4 2013/06/30 12:45:15 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild,v 1.5 2013/09/05 18:29:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 KDE_REQUIRED="never"
 inherit python-single-r1 kde4-base
 
diff --git a/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild
index 636e56598863..4ace086cc61f 100644
--- a/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild,v 1.13 2013/03/01 12:40:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.0-r2.ebuild,v 1.14 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic eutils python-r1 autotools prefix
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild
index 46902952a36b..3e28af012114 100644
--- a/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild,v 1.12 2013/08/06 12:32:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild,v 1.13 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic eutils python-r1 autotools prefix
diff --git a/dev-libs/libxml2/libxml2-2.9.1.ebuild b/dev-libs/libxml2/libxml2-2.9.1.ebuild
index 6854d83cdba1..783c11032d52 100644
--- a/dev-libs/libxml2/libxml2-2.9.1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1.ebuild,v 1.3 2013/07/11 11:55:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1.ebuild,v 1.4 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic eutils python-r1 autotools prefix
diff --git a/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild
index dce1698bd9fb..bf440056fd61 100644
--- a/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild,v 1.15 2013/06/30 15:07:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild,v 1.16 2013/09/05 18:29:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
 
 inherit autotools eutils python-r1 toolchain-funcs
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 52b5db787526..5185596ff68a 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,2 +1 @@
 DIST libzip-0.11.1.tar.gz 564950 SHA256 de1f9c27bbcfd9df97d54cdaec0e4a15cbfc842793ab42def56052f12cd3dc95 SHA512 6018ac938cc4335389474cb414f32d397ffa35c51c8ea42a8e182cd68f438dae2aa412f35ed0b177a719a2fc6fe420784d16ce4672d71cbf6e43f1466169d2a5 WHIRLPOOL b6c054d0156305b22924b28ff1880c0e835598f4e3df37f1a50cebc60d7a7f537796ab2e296fbf9268ba4ff5fe1ba0aaddd9c260303bc7281ab7212d699b0f83
-DIST libzip-0.11.tar.gz 542896 SHA256 52c6d0fb4a4566cf0931a6e648e297d0b6caeb499f5c3401cf1ad2a1c63eeab1 SHA512 ed4f12daccb3ddb826f942c316bfad2232e5bece55de63033754d425d6c2096c1828d374c6c544725c120d7710591d36ad2f3d659787c13f8ee442e2f160cecf WHIRLPOOL cb57cc3126e1e9ee39b4d6925faee7b0dcfd806fd5af77b89db40bc3393a789e3b75674861360278893e0bbe9cb877cabe267004d5371d6a904c28b075e3d703
diff --git a/dev-libs/libzip/libzip-0.11.1.ebuild b/dev-libs/libzip/libzip-0.11.1.ebuild
index 607c42030898..d73335492cae 100644
--- a/dev-libs/libzip/libzip-0.11.1.ebuild
+++ b/dev-libs/libzip/libzip-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.11.1.ebuild,v 1.5 2013/09/04 08:59:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.11.1.ebuild,v 1.6 2013/09/05 13:24:31 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/libzip/libzip-0.11.ebuild b/dev-libs/libzip/libzip-0.11.ebuild
deleted file mode 100644
index b2bdceb0874c..000000000000
--- a/dev-libs/libzip/libzip-0.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.11.ebuild,v 1.7 2013/06/25 13:01:07 ago Exp $
-
-EAPI=5
-
-MY_P=${P/_}
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils eutils
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="http://www.nih.at/libzip/"
-SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS README THANKS AUTHORS )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10_rc1-fix_headers.patch"
-	"${FILESDIR}/${PN}-0.11-fix_pkgconfig.patch"
-)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-RESTRICT="test"
-
-src_prepare() {
-	autotools-utils_src_prepare
-	# run due to fix_headers patch
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	#elibtoolize # FreeBSD .so version
-
-	# fix test return state
-	sed -i \
-		-e 's:19/2:19/0:' \
-		regress/open_nonarchive.test || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --all
-}
-
-src_test() {
-	#Having VERBOSE as an env variable causes the fread test to fail (bug 421651)
-	unset VERBOSE
-	autotools-utils_src_test
-}
diff --git a/dev-libs/protobuf/protobuf-2.5.0.ebuild b/dev-libs/protobuf/protobuf-2.5.0.ebuild
index e7e78101ef37..dcdffb826bc7 100644
--- a/dev-libs/protobuf/protobuf-2.5.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.5.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.3 2013/06/29 20:36:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.4 2013/09/05 18:29:53 mgorny Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="source"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=1
 
 inherit autotools eutils distutils-r1 java-pkg-opt-2 elisp-common
diff --git a/dev-libs/suikyo/suikyo-2.1.0-r2.ebuild b/dev-libs/suikyo/suikyo-2.1.0-r2.ebuild
deleted file mode 100644
index 856f4d24b057..000000000000
--- a/dev-libs/suikyo/suikyo-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/suikyo/suikyo-2.1.0-r2.ebuild,v 1.1 2010/03/20 16:52:52 matsuu Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-inherit elisp-common eutils multilib ruby-ng
-
-DESCRIPTION="Romaji Hiragana conversion library"
-HOMEPAGE="http://taiyaki.org/suikyo/"
-SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="emacs"
-
-DEPEND="$(ruby_implementation_depend ruby18)
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-pkgconfig.patch"
-}
-
-src_configure() {
-	econf \
-		--with-suikyo-docdir="/usr/share/doc/${PF}/html" \
-		--with-rubydir="/usr/$(get_libdir)/ruby/site_ruby" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	if use emacs ; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	else
-		rm -rf "${D}"/usr/share/emacs/ || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-ml/findlib/findlib-1.4.ebuild b/dev-ml/findlib/findlib-1.4.ebuild
index e19d4ae64e5f..69c927708c5f 100644
--- a/dev-ml/findlib/findlib-1.4.ebuild
+++ b/dev-ml/findlib/findlib-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.4.ebuild,v 1.8 2013/09/02 11:13:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.4.ebuild,v 1.9 2013/09/05 12:22:43 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"
diff --git a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild
new file mode 100644
index 000000000000..622263429ba3
--- /dev/null
+++ b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.30.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 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.1 2013/09/05 13:17:51 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=TOKUHIROM
+MODULE_VERSION=0.03
+inherit perl-module
+
+DESCRIPTION="Automated accessor generation"
+
+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"
+
+SRC_TEST="do"
+PREFER_BUILDPL="no"
diff --git a/dev-perl/Class-ErrorHandler/Manifest b/dev-perl/Class-ErrorHandler/Manifest
index 22ce7719ca6d..5347bfa8a15c 100644
--- a/dev-perl/Class-ErrorHandler/Manifest
+++ b/dev-perl/Class-ErrorHandler/Manifest
@@ -1 +1,2 @@
 DIST Class-ErrorHandler-0.01.tar.gz 15254 SHA256 488dd0d539641c213451b72513557438e3586ceccb5836c07e209840b3643f20 SHA512 cc89db061ad297491ff65eaa9030b4a1de79ee61dc97986cab5539a5f5ac2b53e039469df2bf5cb5a515b8cea2832c0135a9fc76bf9bc616f24050ce9198453a WHIRLPOOL 0fcbff1e67ca92029d7335931da1d1572b05a96af7523a86b885b8b415184442f3946563c87e63b63e89e87c10fbc948b6c3d53ff6387e21fa717fd05922cffd
+DIST Class-ErrorHandler-0.03.tar.gz 10061 SHA256 f95bff52f60ee325a67c87bd1ce6b21eb2fefad7ddbdff7e1724d834f626e130 SHA512 aefc6497b8ebdd3efe1643a84051b2739879f5472753a484b8eb14a29ba1826806bdc17ddb46efb50e969ceedae309fe7cfa965d9c45054b40fe2fbaed7b60a7 WHIRLPOOL fdced731249eaf4cac7347fcbc4ddb0cffc7b4ecfc25c4a5b01a773d4e1a2bb12ec68d0f68e0ac4d7fcedb3c25c7560ab0c9d84e8c6ef104c3a1ab17f2dcada7
diff --git a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.170.0.ebuild b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.170.0.ebuild
new file mode 100644
index 000000000000..e065572a32cf
--- /dev/null
+++ b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.170.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Compress-Bzip2/Compress-Bzip2-2.170.0.ebuild,v 1.1 2013/09/05 18:54:21 zlogene Exp $
+
+EAPI=5
+
+MODULE_VERSION=2.17
+MODULE_AUTHOR=RURBAN
+inherit perl-module
+
+DESCRIPTION="A Bzip2 perl module"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~mips ~sparc ~x86 ~ppc-aix"
+IUSE=""
+
+RDEPEND="app-arch/bzip2"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
diff --git a/dev-perl/Compress-Bzip2/Manifest b/dev-perl/Compress-Bzip2/Manifest
index a8e166e9735f..858df6433754 100644
--- a/dev-perl/Compress-Bzip2/Manifest
+++ b/dev-perl/Compress-Bzip2/Manifest
@@ -1 +1,2 @@
 DIST Compress-Bzip2-2.09.tar.gz 429584 SHA256 b43b7fbd90a406454b4b9b3765b140699a72653dd6bba298f2974ca1a9d5c4f8 SHA512 bf1a9b2564f11c914a6d52045565f63f817895ec2d24d59f62529a62fb79b5328af7c39a93dece9ed16f074b39a8766ce7fdff4e6e8e0a1178fe61698be04707 WHIRLPOOL 5fb8fb4f97cfd9f7ff78261404a3bf6607a1de42d74dd4de9c90b1461f75038d8e26c623d434a0c75ed4faf881f1a70e133a09b6671e809e2b6e4f07407f5ccf
+DIST Compress-Bzip2-2.17.tar.gz 892182 SHA256 72207f5f588e055ab69718ccc4a51b402575793a96ea4f3897980f503b54323b SHA512 bd1ea069755a85d62de78f15c27bf625202f9db6dc8f85d80a5ae1ece4b711587d15f19e354fc5a188938a05e6a25b2d8f2540bd9de92ec02f2afbccad979f30 WHIRLPOOL 04a7db544da56f4d4cb97667f9877e0216349c7893ddc70af5e07406550d91b6d0a12e2fc5399289204d63d9fa57b9901620ce924f6ef1dd821b9cbcf878fec4
diff --git a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0.ebuild b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0.ebuild
index 57c0eaa32bcd..0c91f2458bf3 100644
--- a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0.ebuild
+++ b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0.ebuild,v 1.1 2013/08/25 07:55:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0.ebuild,v 1.2 2013/09/06 04:16:46 patrick Exp $
 
 EAPI=4
 
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-perl/Test-Pod
 		dev-perl/Test-Pod-Coverage
+		dev-perl/Capture-Tiny
 	)"
 
 SRC_TEST="do"
diff --git a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild
new file mode 100644
index 000000000000..eab0f87764f3
--- /dev/null
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.300-r1.ebuild,v 1.1 2013/09/05 13:13:16 idella4 Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DCOPPIT
+MODULE_VERSION=0.1623
+inherit perl-module versionator
+
+DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+SRC_TEST=do
diff --git a/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r1.ebuild b/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r1.ebuild
new file mode 100644
index 000000000000..d70c7beefcca
--- /dev/null
+++ b/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r1.ebuild,v 1.1 2013/09/05 13:34:38 idella4 Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=ILYAZ
+MODULE_SECTION=modules
+MODULE_VERSION=0.5001
+inherit perl-module
+
+DESCRIPTION="converting Perl structures to strings and back"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+SRC_TEST=do
diff --git a/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild b/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild
deleted file mode 100644
index b41d783cf271..000000000000
--- a/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Client-Async/Gearman-Client-Async-0.94.ebuild,v 1.3 2010/09/19 15:28:12 tove Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=BRADFITZ
-inherit perl-module
-
-DESCRIPTION="Asynchronous client module for Gearman for Danga::Socket applications"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/Gearman-1.07
-	>=dev-perl/Danga-Socket-1.57"
-
-# testsuite requires gearman server
-SRC_TEST="never"
diff --git a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0.ebuild b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
similarity index 59%
rename from dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0.ebuild
rename to dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
index 5b48c6fc854b..d1e9dc7250a6 100644
--- a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0.ebuild
+++ b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0.ebuild,v 1.2 2012/11/30 06:17:12 bicatali Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild,v 1.1 2013/09/05 13:59:22 idella4 Exp $
+
+EAPI=5
 MODULE_AUTHOR=AIZVORSKI
 inherit perl-module
 
@@ -9,7 +10,9 @@ DESCRIPTION="convert between color spaces"
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Pacakge warrants IUSE examples"
 IUSE=""
+
 COMMON_DEPEND="
 	>=dev-perl/Graphics-ColorNames-0.32
 "
@@ -20,3 +23,10 @@ RDEPEND="
 	${COMMON_DEPEND}
 "
 SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	docompress -x usr/share/doc/${PF}/examples/
+	insinto usr/share/doc/${PF}/
+	doins -r examples
+}
diff --git a/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..ae871658a01d
--- /dev/null
+++ b/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lingua-Preferred/Lingua-Preferred-0.2.4-r1.ebuild,v 1.1 2013/09/05 15:01:40 idella4 Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=EDAVIS
+inherit perl-module
+
+DESCRIPTION="Pick a language based on user's preferences"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 GPL-3 )" # GPL-2+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Log-TraceMessages"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/MLDBM/MLDBM-2.01.ebuild b/dev-perl/MLDBM/MLDBM-2.01.ebuild
deleted file mode 100644
index bf57502c8f76..000000000000
--- a/dev-perl/MLDBM/MLDBM-2.01.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MLDBM/MLDBM-2.01.ebuild,v 1.20 2010/12/03 02:12:49 xmw Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=CHAMAS
-inherit perl-module
-
-DESCRIPTION="A multidimensional/tied hash Perl Module"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 s390 sparc x86"
-IUSE=""
diff --git a/dev-perl/MLDBM/Manifest b/dev-perl/MLDBM/Manifest
index e1707c877bf0..956ba28ba6e9 100644
--- a/dev-perl/MLDBM/Manifest
+++ b/dev-perl/MLDBM/Manifest
@@ -1,2 +1 @@
-DIST MLDBM-2.01.tar.gz 9568 SHA256 e83550629724c9b2e4ddd3fe777c8240d44f62e37338361a59ebec5f8e8e3893 SHA512 053618e81fa0e3405df1b271cb4643cf990015dc971c5db84eb36caec681904181e78af84f794e551cba4226474505c99d9646c5f641bb2f79b1457a9561efee WHIRLPOOL ff2e167417b93868402a6f725a7fb5bdb762f495ff45cb9765edaf7314a813bdd371918679d8730b6b6dc90f45c69f77c57b29f6e20a2d42e454bd7bb83041fb
 DIST MLDBM-2.04.tar.gz 12603 SHA256 4a376355122e99dae0e5bbe19282ad0bef24d4bdc3938d7a8f75d7f7d60d8942 SHA512 7b71da3683836cb664a086f494ca2ce2d56307cbaf6cb1738cf3300dddecc1874fcd68f6ae3c5cfbaa06703a5e847b624516959c4e35ee0620e78e5a3525bc68 WHIRLPOOL 13c88c8092895625dfec11686803b8e7dc38155bd87e2729ec7c941369f3412bd59a30bdd1ab7d0da7a58fdfc019ab3530d546a4ca9d06da487709fbd5aaeb8e
diff --git a/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.500.200-r1.ebuild b/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.500.200-r1.ebuild
new file mode 100644
index 000000000000..05e294098628
--- /dev/null
+++ b/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.500.200-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-Mbox-MessageParser/Mail-Mbox-MessageParser-1.500.200-r1.ebuild,v 1.1 2013/09/05 15:22:27 idella4 Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DCOPPIT
+MODULE_VERSION=1.5002
+inherit perl-module
+
+DESCRIPTION="Manipulation of electronic mail addresses"
+HOMEPAGE="http://sourceforge.net/projects/m-m-msgparser/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-perl/Text-Diff
+	dev-perl/FileHandle-Unget"
+RDEPEND="${DEPEND}"
+
+SRC_TEST=do
+
+PATCHES=( "${FILESDIR}"/${PV}-warning.patch )
diff --git a/dev-perl/Math-Base36/Math-Base36-0.120.0.ebuild b/dev-perl/Math-Base36/Math-Base36-0.120.0.ebuild
index d671f1a4960e..fc9fc4b17574 100644
--- a/dev-perl/Math-Base36/Math-Base36-0.120.0.ebuild
+++ b/dev-perl/Math-Base36/Math-Base36-0.120.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-Base36/Math-Base36-0.120.0.ebuild,v 1.1 2013/08/16 07:46:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-Base36/Math-Base36-0.120.0.ebuild,v 1.2 2013/09/06 04:52:26 patrick Exp $
 
 EAPI=4
 
@@ -18,6 +18,7 @@ DEPEND="
 	test? (
 		dev-perl/Test-Pod
 		dev-perl/Test-Pod-Coverage
+		dev-perl/Test-Exception
 	)
 "
 
diff --git a/dev-perl/String-Escape/Manifest b/dev-perl/String-Escape/Manifest
new file mode 100644
index 000000000000..7393d500261e
--- /dev/null
+++ b/dev-perl/String-Escape/Manifest
@@ -0,0 +1 @@
+DIST String-Escape-2010.002.tar.gz 11629 SHA256 fd645f8b336224d20a85ae7fb1a384576eac329f7adc3923c3241e828e3b9a8a SHA512 668e196bbd95b4e9e5fc9ae3aebe0e7f1990362973bd027f2f3728f212786bc2104141ced3e024006b3ed22fa6345b968440029c98b87cbc299ac192221724c7 WHIRLPOOL 4243d6898494d16bcabcf6936e48e690d4d229f61201c56613ab217ad0928b7f9665bd840fe9f91f5c88105c253f7581fa87791acaad480fddc9fe26d97f9a39
diff --git a/dev-perl/String-Escape/String-Escape-2010.002.ebuild b/dev-perl/String-Escape/String-Escape-2010.002.ebuild
new file mode 100644
index 000000000000..76f652300ac8
--- /dev/null
+++ b/dev-perl/String-Escape/String-Escape-2010.002.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/String-Escape/String-Escape-2010.002.ebuild,v 1.1 2013/09/06 03:51:01 patrick Exp $
+
+MODULE_AUTHOR=EVO
+inherit perl-module
+
+DESCRIPTION="Backslash escapes, quoted phrase, word elision, etc."
+LICENSE="|| ( Artistic GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+DEPEND=""
diff --git a/dev-perl/String-Escape/metadata.xml b/dev-perl/String-Escape/metadata.xml
new file mode 100644
index 000000000000..7acd0f0c5491
--- /dev/null
+++ b/dev-perl/String-Escape/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>perl</herd>
+    <maintainer>
+        <email>mb@cattlegrid.info</email>
+        <name>Michele Beltrame</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="cpan">String-Escape</remote-id>
+        <remote-id type="cpan-module">String::Escape</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-perl/crypt-idea/Manifest b/dev-perl/crypt-idea/Manifest
index 41638dca2e79..f76aa98e6655 100644
--- a/dev-perl/crypt-idea/Manifest
+++ b/dev-perl/crypt-idea/Manifest
@@ -1 +1,2 @@
 DIST Crypt-IDEA-1.08.tar.gz 7045 SHA256 b96c16599b2064c2239d3f1922e18b17bfc2e3e6a836e91d93dbb9c469f78d4f SHA512 34e3e2908f45a59fff4052a3c7c699106d9f75eca49bf271e8e45a7a99e1bdab534873e30f1613f6e9d4a69f3f088c0d779176f46c8e6acbf981020dfd537ef9 WHIRLPOOL 2ff3f91683dbae98c5f9bd5a35ccbcb778d77100306ec3cbcd01ea1abcb048d63289964a2b04f0ac6562ba40cc43439f96dbb63e419af965f1c5cb5a6b285af3
+DIST Crypt-IDEA-1.10.tar.gz 7225 SHA256 33bd78c11924a0fc1ff3eedde94078cbbf6b6ca9ede046d2b2f561e9e9a72019 SHA512 2459f8f8ca088564b037101129796d6d3652062e80f9342173508df95b60ceb9ccb836b946d50127f86b38b239e25c58e1f4efde4eb73a5b24fc823a100fd018 WHIRLPOOL 5a2a783609d52afb3ea987dfe6084cbcded1543d7e00a5d4b32330cb9fc6584e391755c6acdd68b63a94a5b54a3f9dea78252f2289b40d4eb058b8713b3cb62a
diff --git a/dev-perl/crypt-idea/crypt-idea-1.100.0.ebuild b/dev-perl/crypt-idea/crypt-idea-1.100.0.ebuild
new file mode 100644
index 000000000000..da0dbf6b2a08
--- /dev/null
+++ b/dev-perl/crypt-idea/crypt-idea-1.100.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/crypt-idea/crypt-idea-1.100.0.ebuild,v 1.1 2013/09/05 22:57:51 zlogene Exp $
+
+EAPI=5
+
+MY_PN=Crypt-IDEA
+MODULE_AUTHOR=DPARIS
+MODULE_VERSION=1.10
+inherit perl-module
+
+DESCRIPTION="Parse and save PGP packet streams"
+
+LICENSE="DES"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+SRC_TEST="do"
diff --git a/dev-python/Babel/Babel-0.9.6-r1.ebuild b/dev-python/Babel/Babel-0.9.6-r1.ebuild
index 9639f34bb45c..a276b298b54e 100644
--- a/dev-python/Babel/Babel-0.9.6-r1.ebuild
+++ b/dev-python/Babel/Babel-0.9.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-0.9.6-r1.ebuild,v 1.3 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-0.9.6-r1.ebuild,v 1.4 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of tools for internationalizing Python applications"
diff --git a/dev-python/Babel/Babel-1.2.ebuild b/dev-python/Babel/Babel-1.2.ebuild
index 729f09b4be62..2e0ac5b4a2a2 100644
--- a/dev-python/Babel/Babel-1.2.ebuild
+++ b/dev-python/Babel/Babel-1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-1.2.ebuild,v 1.3 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-1.2.ebuild,v 1.4 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of tools for internationalizing Python applications"
diff --git a/dev-python/Babel/Babel-1.3.ebuild b/dev-python/Babel/Babel-1.3.ebuild
index fb687375864e..88b53d0e7367 100644
--- a/dev-python/Babel/Babel-1.3.ebuild
+++ b/dev-python/Babel/Babel-1.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-1.3.ebuild,v 1.1 2013/08/23 08:06:57 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-1.3.ebuild,v 1.2 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of tools for internationalizing Python applications"
diff --git a/dev-python/PyGithub/PyGithub-1.13.1.ebuild b/dev-python/PyGithub/PyGithub-1.13.1.ebuild
index ee19b877a80c..de1364f581c1 100644
--- a/dev-python/PyGithub/PyGithub-1.13.1.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.13.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.13.1.ebuild,v 1.1 2013/04/01 07:57:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.13.1.ebuild,v 1.2 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyGithub/PyGithub-1.15.0.ebuild b/dev-python/PyGithub/PyGithub-1.15.0.ebuild
index 7a76c65dab83..348202091251 100644
--- a/dev-python/PyGithub/PyGithub-1.15.0.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.15.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.15.0.ebuild,v 1.1 2013/05/19 06:15:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.15.0.ebuild,v 1.2 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyGithub/PyGithub-1.16.0.ebuild b/dev-python/PyGithub/PyGithub-1.16.0.ebuild
index 957d5db605f8..a7af876d09b3 100644
--- a/dev-python/PyGithub/PyGithub-1.16.0.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.16.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.16.0.ebuild,v 1.1 2013/06/01 02:05:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.16.0.ebuild,v 1.2 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyGithub/PyGithub-1.17.0.ebuild b/dev-python/PyGithub/PyGithub-1.17.0.ebuild
index b662f0463d90..c7ebb593ef9f 100644
--- a/dev-python/PyGithub/PyGithub-1.17.0.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.17.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.17.0.ebuild,v 1.1 2013/07/07 20:40:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyGithub/PyGithub-1.17.0.ebuild,v 1.2 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyQt4/PyQt4-4.10.1.ebuild b/dev-python/PyQt4/PyQt4-4.10.1.ebuild
index 3920c80202a8..e8ceac6985de 100644
--- a/dev-python/PyQt4/PyQt4-4.10.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.1.ebuild,v 1.5 2013/07/22 11:06:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.1.ebuild,v 1.6 2013/09/05 18:46:48 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils qt4-r2 python-r1 toolchain-funcs
 
diff --git a/dev-python/PyQt4/PyQt4-4.10.2.ebuild b/dev-python/PyQt4/PyQt4-4.10.2.ebuild
index 089aafe28cff..890a90b2c805 100644
--- a/dev-python/PyQt4/PyQt4-4.10.2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.2.ebuild,v 1.8 2013/09/04 09:20:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.2.ebuild,v 1.11 2013/09/05 19:24:55 ago Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils qt4-r2 python-r1 toolchain-funcs
 
@@ -20,7 +20,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
 REQUIRED_USE="
diff --git a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
index 62b10136db12..c40d19f5ac11 100644
--- a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.16 2013/07/22 11:06:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.17 2013/09/05 18:46:48 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils qt4-r2 python-r1 toolchain-funcs
 
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
index 6ae1c16d0083..4c8145303ac2 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild,v 1.1 2013/02/10 02:16:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild,v 1.2 2013/09/05 18:46:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_{6,7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/RecSQL/RecSQL-0.7.8.ebuild b/dev-python/RecSQL/RecSQL-0.7.8.ebuild
index e73a2734db78..8b4fb96fb04b 100644
--- a/dev-python/RecSQL/RecSQL-0.7.8.ebuild
+++ b/dev-python/RecSQL/RecSQL-0.7.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/RecSQL/RecSQL-0.7.8.ebuild,v 1.3 2013/03/26 15:22:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/RecSQL/RecSQL-0.7.8.ebuild,v 1.4 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite"
 
 if [[ $PV = *9999* ]]; then
diff --git a/dev-python/addons/addons-0.7.ebuild b/dev-python/addons/addons-0.7.ebuild
index 1a32a1792b25..4cbbc1be28b6 100644
--- a/dev-python/addons/addons-0.7.ebuild
+++ b/dev-python/addons/addons-0.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/10 05:00:25 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/addons/addons-0.7.ebuild,v 1.2 2013/09/05 18:46:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
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 2178eedb2817..6b4812c2b2f8 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,9 +1,9 @@
 # Copyright 1999-2013 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.2 2013/01/19 11:09:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adns-python/adns-python-1.2.1-r1.ebuild,v 1.3 2013/09/05 18:46:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
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 d881b3781063..6416f7b638f2 100644
--- a/dev-python/adodb-py/adodb-py-2.20-r1.ebuild
+++ b/dev-python/adodb-py/adodb-py-2.20-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/01/19 11:52:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-2.20-r1.ebuild,v 1.2 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_USE_WITH='sqlite?'
 
 inherit distutils-r1
diff --git a/dev-python/alembic/alembic-0.4.2.ebuild b/dev-python/alembic/alembic-0.4.2.ebuild
index 8bcb5660a4bd..06e568402ab3 100644
--- a/dev-python/alembic/alembic-0.4.2.ebuild
+++ b/dev-python/alembic/alembic-0.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/alembic-0.4.2.ebuild,v 1.2 2013/02/03 18:18:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/alembic-0.4.2.ebuild,v 1.3 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/alembic/alembic-0.5.0.ebuild b/dev-python/alembic/alembic-0.5.0.ebuild
index b56c6dc0cc73..dc78acc8ddb8 100644
--- a/dev-python/alembic/alembic-0.5.0.ebuild
+++ b/dev-python/alembic/alembic-0.5.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/alembic-0.5.0.ebuild,v 1.1 2013/06/13 03:33:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/alembic/alembic-0.5.0.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/amqplib/amqplib-0.6.1-r1.ebuild b/dev-python/amqplib/amqplib-0.6.1-r1.ebuild
index 5a64e877153d..7a50c99a1039 100644
--- a/dev-python/amqplib/amqplib-0.6.1-r1.ebuild
+++ b/dev-python/amqplib/amqplib-0.6.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild,v 1.1 2013/05/16 01:03:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-0.6.1-r1.ebuild,v 1.2 2013/09/05 18:46:11 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
index 200d7a104829..48fd46bc4a0b 100644
--- a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
+++ b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/01/19 20:13:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/amqplib/amqplib-1.0.2-r1.ebuild,v 1.2 2013/09/05 18:46:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild b/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild
index 67c89fdf1eb3..2554f64f19e1 100644
--- a/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild
+++ b/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild,v 1.1 2013/01/19 20:25:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
 
 EAPI=5
 
 # ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansi2html/ansi2html-0.9.4.ebuild b/dev-python/ansi2html/ansi2html-0.9.4.ebuild
index b9892b0cfb2c..b428b8920a20 100644
--- a/dev-python/ansi2html/ansi2html-0.9.4.ebuild
+++ b/dev-python/ansi2html/ansi2html-0.9.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.4.ebuild,v 1.1 2013/03/11 06:26:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.4.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
 
 EAPI=5
 
 # ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/anyjson/anyjson-0.2.4.ebuild b/dev-python/anyjson/anyjson-0.2.4.ebuild
index b158f9945a26..274e63476a36 100644
--- a/dev-python/anyjson/anyjson-0.2.4.ebuild
+++ b/dev-python/anyjson/anyjson-0.2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/anyjson/anyjson-0.2.4.ebuild,v 1.2 2013/03/30 12:58:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/anyjson/anyjson-0.2.4.ebuild,v 1.3 2013/09/05 14:16:50 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
@@ -17,12 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-# python2.6+ has builtin json module
-# python2.5 needs any of the supported impls
-RDEPEND="
-	python_targets_python2_5? (
-		dev-python/simplejson[python_targets_python2_5] )"
-
 # please keep all supported implementations in 'test?'
 # to make sure the package is used in the widest way
 DEPEND="${RDEPEND}
diff --git a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
index cf1b030f1394..253ea9fec1a0 100644
--- a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
+++ b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.3 2013/03/30 12:58:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/anyjson/anyjson-0.3.3-r1.ebuild,v 1.4 2013/09/05 14:16:50 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
@@ -17,12 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-# python2.6+ has builtin json module
-# python2.5 needs any of the supported impls
-RDEPEND="
-	python_targets_python2_5? (
-		dev-python/simplejson[python_targets_python2_5] )"
-
 # please keep all supported implementations in 'test?'
 # to make sure the package is used in the widest way
 DEPEND="${RDEPEND}
diff --git a/dev-python/apipkg/apipkg-1.2-r1.ebuild b/dev-python/apipkg/apipkg-1.2-r1.ebuild
index f68191096b13..292ea5cd9e4c 100644
--- a/dev-python/apipkg/apipkg-1.2-r1.ebuild
+++ b/dev-python/apipkg/apipkg-1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/01/19 20:46:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.2-r1.ebuild,v 1.2 2013/09/05 18:47:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/appdirs/appdirs-1.2.0-r1.ebuild b/dev-python/appdirs/appdirs-1.2.0-r1.ebuild
index 3b5766f9e4ec..2375d5203127 100644
--- a/dev-python/appdirs/appdirs-1.2.0-r1.ebuild
+++ b/dev-python/appdirs/appdirs-1.2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/appdirs/appdirs-1.2.0-r1.ebuild,v 1.1 2013/01/20 00:16:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/appdirs/appdirs-1.2.0-r1.ebuild,v 1.2 2013/09/05 18:47:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/apse/apse-0.2-r2.ebuild b/dev-python/apse/apse-0.2-r2.ebuild
index 36a0e7be3d69..526cd5d691b6 100644
--- a/dev-python/apse/apse-0.2-r2.ebuild
+++ b/dev-python/apse/apse-0.2-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/apse-0.2-r2.ebuild,v 1.1 2013/01/20 00:45:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/apse-0.2-r2.ebuild,v 1.2 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/apse/apse-0.2-r3.ebuild b/dev-python/apse/apse-0.2-r3.ebuild
index d16570749ac8..2ad1974a9895 100644
--- a/dev-python/apse/apse-0.2-r3.ebuild
+++ b/dev-python/apse/apse-0.2-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/22 18:35:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/apse-0.2-r3.ebuild,v 1.2 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/apsw/apsw-3.7.15.1_p1.ebuild b/dev-python/apsw/apsw-3.7.15.1_p1.ebuild
index f76052479948..a624b62c5989 100644
--- a/dev-python/apsw/apsw-3.7.15.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.7.15.1_p1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.15.1_p1.ebuild,v 1.2 2013/08/28 16:01:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.15.1_p1.ebuild,v 1.3 2013/09/05 18:46:50 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/apsw/apsw-3.7.15.2_p1.ebuild b/dev-python/apsw/apsw-3.7.15.2_p1.ebuild
index ca0d8e59f563..f4093d020f3e 100644
--- a/dev-python/apsw/apsw-3.7.15.2_p1.ebuild
+++ b/dev-python/apsw/apsw-3.7.15.2_p1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.15.2_p1.ebuild,v 1.2 2013/08/28 16:01:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.15.2_p1.ebuild,v 1.3 2013/09/05 18:46:50 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/apsw/apsw-3.7.16.2_p1.ebuild b/dev-python/apsw/apsw-3.7.16.2_p1.ebuild
index 49bf1931e6b3..29b721421c56 100644
--- a/dev-python/apsw/apsw-3.7.16.2_p1.ebuild
+++ b/dev-python/apsw/apsw-3.7.16.2_p1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.16.2_p1.ebuild,v 1.2 2013/08/28 16:01:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.16.2_p1.ebuild,v 1.3 2013/09/05 18:46:50 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/apsw/apsw-3.7.17_p1.ebuild b/dev-python/apsw/apsw-3.7.17_p1.ebuild
index 86ce2bda7dac..9c9f1e41bc15 100644
--- a/dev-python/apsw/apsw-3.7.17_p1.ebuild
+++ b/dev-python/apsw/apsw-3.7.17_p1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.17_p1.ebuild,v 1.2 2013/08/28 16:01:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.7.17_p1.ebuild,v 1.3 2013/09/05 18:46:50 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/argh/argh-0.23.0-r1.ebuild b/dev-python/argh/argh-0.23.0-r1.ebuild
index d6cd0a675505..8308c53de496 100644
--- a/dev-python/argh/argh-0.23.0-r1.ebuild
+++ b/dev-python/argh/argh-0.23.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.0-r1.ebuild,v 1.2 2013/02/12 00:55:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.0-r1.ebuild,v 1.3 2013/09/05 18:46:08 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/argh/argh-0.23.1.ebuild b/dev-python/argh/argh-0.23.1.ebuild
index 3e272a2c5cff..1eaab702de84 100644
--- a/dev-python/argh/argh-0.23.1.ebuild
+++ b/dev-python/argh/argh-0.23.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.1.ebuild,v 1.1 2013/03/18 09:15:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.1.ebuild,v 1.2 2013/09/05 18:46:08 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/argh/argh-0.23.2.ebuild b/dev-python/argh/argh-0.23.2.ebuild
index e81a719ae6c0..90ac7b4cca76 100644
--- a/dev-python/argh/argh-0.23.2.ebuild
+++ b/dev-python/argh/argh-0.23.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.2.ebuild,v 1.1 2013/06/13 04:12:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.2.ebuild,v 1.2 2013/09/05 18:46:08 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/argh/argh-0.23.3.ebuild b/dev-python/argh/argh-0.23.3.ebuild
index 798d7d685648..ce086533e263 100644
--- a/dev-python/argh/argh-0.23.3.ebuild
+++ b/dev-python/argh/argh-0.23.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.3.ebuild,v 1.1 2013/09/02 03:53:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.3.ebuild,v 1.2 2013/09/05 18:46:08 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/argparse/argparse-1.2.1-r2.ebuild b/dev-python/argparse/argparse-1.2.1-r2.ebuild
index 67fd018dad32..4ba0a0f4bb34 100644
--- a/dev-python/argparse/argparse-1.2.1-r2.ebuild
+++ b/dev-python/argparse/argparse-1.2.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/argparse-1.2.1-r2.ebuild,v 1.13 2013/04/12 17:20:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/argparse-1.2.1-r2.ebuild,v 1.14 2013/09/05 18:47:15 mgorny Exp $
 
 EAPI=5
 # Other implementations ship argparse.
-PYTHON_COMPAT=( python{2_5,2_6,3_1} )
+PYTHON_COMPAT=( python2_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
index 75e5b898f925..056a8b0a3c59 100644
--- a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
+++ b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild,v 1.1 2013/02/12 01:12:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild,v 1.2 2013/09/05 18:47:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
index 4fdf51d0ae60..f1aa0f79c568 100644
--- a/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
+++ b/dev-python/asciitable/asciitable-0.8.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/asciitable/asciitable-0.8.0-r1.ebuild,v 1.2 2013/04/24 21:05:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/asciitable/asciitable-0.8.0-r1.ebuild,v 1.3 2013/09/05 18:47:03 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astng/astng-0.24.3.ebuild b/dev-python/astng/astng-0.24.3.ebuild
index 0122e7c1c7e2..61bcd89fe25d 100644
--- a/dev-python/astng/astng-0.24.3.ebuild
+++ b/dev-python/astng/astng-0.24.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.24.3.ebuild,v 1.4 2013/06/26 01:36:50 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.24.3.ebuild,v 1.5 2013/09/05 18:46:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/authres/authres-0.501.ebuild b/dev-python/authres/authres-0.501.ebuild
index 88e775af80a9..410a9fe63c18 100644
--- a/dev-python/authres/authres-0.501.ebuild
+++ b/dev-python/authres/authres-0.501.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.501.ebuild,v 1.1 2013/03/05 16:08:08 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.501.ebuild,v 1.2 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/authres/authres-0.600.ebuild b/dev-python/authres/authres-0.600.ebuild
index 57eecf7af32d..79536488aa55 100644
--- a/dev-python/authres/authres-0.600.ebuild
+++ b/dev-python/authres/authres-0.600.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.600.ebuild,v 1.1 2013/04/16 07:37:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.600.ebuild,v 1.2 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/authres/authres-0.601.ebuild b/dev-python/authres/authres-0.601.ebuild
index 32edade54870..5a85ca1cca4f 100644
--- a/dev-python/authres/authres-0.601.ebuild
+++ b/dev-python/authres/authres-0.601.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.601.ebuild,v 1.1 2013/05/02 05:45:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.601.ebuild,v 1.2 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/authres/authres-0.602.ebuild b/dev-python/authres/authres-0.602.ebuild
index e5368071ffac..228aec587de0 100644
--- a/dev-python/authres/authres-0.602.ebuild
+++ b/dev-python/authres/authres-0.602.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.602.ebuild,v 1.1 2013/08/10 09:59:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.602.ebuild,v 1.2 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/autopep8/autopep8-0.9.2.ebuild b/dev-python/autopep8/autopep8-0.9.2.ebuild
index 97551a470a88..6d773cdad46e 100644
--- a/dev-python/autopep8/autopep8-0.9.2.ebuild
+++ b/dev-python/autopep8/autopep8-0.9.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.9.2.ebuild,v 1.1 2013/07/18 17:43:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.9.2.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/autopep8/autopep8-0.9.3.ebuild b/dev-python/autopep8/autopep8-0.9.3.ebuild
index 515b26ec77d3..4e67848cdf07 100644
--- a/dev-python/autopep8/autopep8-0.9.3.ebuild
+++ b/dev-python/autopep8/autopep8-0.9.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.9.3.ebuild,v 1.1 2013/08/25 08:16:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.9.3.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index c3e8696cc2c1..4c4f5242a611 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-9999.ebuild,v 1.7 2013/07/18 17:44:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-9999.ebuild,v 1.8 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 git-2
 
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.1.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.1.ebuild
index d5b0edb17a10..c107f2dc317d 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.1.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1.ebuild,v 1.2 2013/04/11 08:52:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-lzma/backports-lzma-0.0.1.ebuild,v 1.3 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.2.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.2.ebuild
index 7d496a3f2c08..f8c3d14138b6 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.2.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.2.ebuild,v 1.3 2013/04/11 17:28:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-lzma/backports-lzma-0.0.2.ebuild,v 1.4 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
index 91efee12669f..2c9d4d082e01 100644
--- a/dev-python/beaker/beaker-1.6.4-r1.ebuild
+++ b/dev-python/beaker/beaker-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.6.4-r1.ebuild,v 1.8 2013/09/02 12:10:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.6.4-r1.ebuild,v 1.9 2013/09/05 18:46:46 mgorny Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ EAPI=5
 # pypy random exceptions, someone should take a closer look, it may
 # be just the usual test suite overload
 # py3.3 unfit with some types
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/beanstalkc/beanstalkc-0.3.0-r1.ebuild b/dev-python/beanstalkc/beanstalkc-0.3.0-r1.ebuild
index 53a147604279..4e977a7ec99f 100644
--- a/dev-python/beanstalkc/beanstalkc-0.3.0-r1.ebuild
+++ b/dev-python/beanstalkc/beanstalkc-0.3.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beanstalkc/beanstalkc-0.3.0-r1.ebuild,v 1.1 2013/02/16 22:29:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beanstalkc/beanstalkc-0.3.0-r1.ebuild,v 1.2 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
index 8f267cc7204d..d47446fdd7b2 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild,v 1.9 2013/09/02 12:11:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild,v 1.10 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI="5"
 # A few tests fail with python3.3 :(
-PYTHON_COMPAT=( python{3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index 887a276cdc20..bae1431c1e9c 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.9 2013/09/02 12:11:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.10 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_{6,7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
index 537781041e5d..d11b4adbc72e 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild,v 1.8 2013/05/22 18:52:53 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild,v 1.9 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
index 3be2ae4a6416..d2e21aedac64 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild,v 1.3 2013/05/22 18:52:53 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild,v 1.4 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild
index 20a3e046fab3..73fc950168b1 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild,v 1.1 2013/07/06 20:32:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.2.1.ebuild,v 1.2 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/billiard/billiard-2.7.3.20-r1.ebuild b/dev-python/billiard/billiard-2.7.3.20-r1.ebuild
index a0946fd7cda9..e81192110602 100644
--- a/dev-python/billiard/billiard-2.7.3.20-r1.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.20-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.20-r1.ebuild,v 1.1 2013/03/06 16:13:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.20-r1.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/billiard/billiard-2.7.3.21.ebuild b/dev-python/billiard/billiard-2.7.3.21.ebuild
index 4af27da877b5..89cf3006e069 100644
--- a/dev-python/billiard/billiard-2.7.3.21.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.21.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.21.ebuild,v 1.1 2013/03/11 08:50:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.21.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/billiard/billiard-2.7.3.22.ebuild b/dev-python/billiard/billiard-2.7.3.22.ebuild
index afe7ae4eccdb..1e00f59a7dc4 100644
--- a/dev-python/billiard/billiard-2.7.3.22.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.22.ebuild,v 1.1 2013/03/19 06:28:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.22.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/billiard/billiard-2.7.3.23.ebuild b/dev-python/billiard/billiard-2.7.3.23.ebuild
index e025bb585007..349990f5df27 100644
--- a/dev-python/billiard/billiard-2.7.3.23.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.23.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.23.ebuild,v 1.1 2013/04/04 07:25:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.23.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/billiard/billiard-2.7.3.27.ebuild b/dev-python/billiard/billiard-2.7.3.27.ebuild
index 3ca693712c7c..0742d61a9270 100644
--- a/dev-python/billiard/billiard-2.7.3.27.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.27.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.27.ebuild,v 1.1 2013/04/15 07:45:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.27.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/billiard/billiard-2.7.3.28.ebuild b/dev-python/billiard/billiard-2.7.3.28.ebuild
index 693b3f51297e..8c71cdaa38b8 100644
--- a/dev-python/billiard/billiard-2.7.3.28.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.28.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.28.ebuild,v 1.3 2013/05/02 02:27:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.28.ebuild,v 1.4 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/billiard/billiard-2.7.3.31.ebuild b/dev-python/billiard/billiard-2.7.3.31.ebuild
index 7d962c015794..17011d6da3db 100644
--- a/dev-python/billiard/billiard-2.7.3.31.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.31.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.31.ebuild,v 1.1 2013/07/08 08:30:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.31.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/billiard/billiard-2.7.3.32.ebuild b/dev-python/billiard/billiard-2.7.3.32.ebuild
index 69b4ea17f5f8..431990714a34 100644
--- a/dev-python/billiard/billiard-2.7.3.32.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.32.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.32.ebuild,v 1.1 2013/09/02 08:04:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.32.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/blinker/blinker-1.2-r1.ebuild b/dev-python/blinker/blinker-1.2-r1.ebuild
index 9fc469dc4ddd..9d7ff9667e3a 100644
--- a/dev-python/blinker/blinker-1.2-r1.ebuild
+++ b/dev-python/blinker/blinker-1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/blinker/blinker-1.2-r1.ebuild,v 1.2 2013/05/22 05:08:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blinker/blinker-1.2-r1.ebuild,v 1.3 2013/09/05 18:47:07 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blinker/blinker-1.3.ebuild b/dev-python/blinker/blinker-1.3.ebuild
index 3905b1ef71ed..c661dee9d775 100644
--- a/dev-python/blinker/blinker-1.3.ebuild
+++ b/dev-python/blinker/blinker-1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/blinker/blinker-1.3.ebuild,v 1.1 2013/07/08 06:11:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blinker/blinker-1.3.ebuild,v 1.2 2013/09/05 18:47:07 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
index de1fbb075fc2..0aeb0d277775 100644
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bluelet/bluelet-0.2.0.ebuild,v 1.1 2013/06/08 16:38:36 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bluelet/bluelet-0.2.0.ebuild,v 1.2 2013/09/05 18:47:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto/boto-2.1.1.ebuild b/dev-python/boto/boto-2.1.1.ebuild
index 88e8ea1d96a5..e2fec01d4bcb 100644
--- a/dev-python/boto/boto-2.1.1.ebuild
+++ b/dev-python/boto/boto-2.1.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.1.1.ebuild,v 1.5 2013/02/20 06:18:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.1.1.ebuild,v 1.6 2013/09/05 18:46:27 mgorny Exp $
 
 #please do not remove without checking if it is still required by
 #sys-cluster/nova
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto/boto-2.10.0.ebuild b/dev-python/boto/boto-2.10.0.ebuild
index ef1d0a4d0ad6..9e95cca6c97d 100644
--- a/dev-python/boto/boto-2.10.0.ebuild
+++ b/dev-python/boto/boto-2.10.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.10.0.ebuild,v 1.1 2013/08/27 07:49:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.10.0.ebuild,v 1.2 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto/boto-2.11.0.ebuild b/dev-python/boto/boto-2.11.0.ebuild
index 25259084973a..a1f69462c76a 100644
--- a/dev-python/boto/boto-2.11.0.ebuild
+++ b/dev-python/boto/boto-2.11.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.11.0.ebuild,v 1.1 2013/08/29 20:18:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.11.0.ebuild,v 1.2 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto/boto-2.9.9.ebuild b/dev-python/boto/boto-2.9.9.ebuild
index b0ad8b528fd3..68a405300861 100644
--- a/dev-python/boto/boto-2.9.9.ebuild
+++ b/dev-python/boto/boto-2.9.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.9.9.ebuild,v 1.1 2013/07/24 23:30:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/boto/boto-2.9.9.ebuild,v 1.2 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bottle/bottle-0.11.6-r1.ebuild b/dev-python/bottle/bottle-0.11.6-r1.ebuild
index 46abb9714be8..feff5590ea47 100644
--- a/dev-python/bottle/bottle-0.11.6-r1.ebuild
+++ b/dev-python/bottle/bottle-0.11.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.6-r1.ebuild,v 1.6 2013/09/04 09:04:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.6-r1.ebuild,v 1.8 2013/09/05 18:46:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0})
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0)
 inherit distutils-r1
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ia64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ia64 ppc ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/bottle/bottle-0.11.6.ebuild b/dev-python/bottle/bottle-0.11.6.ebuild
index 4d0b5a166bf1..ecef12bfb822 100644
--- a/dev-python/bottle/bottle-0.11.6.ebuild
+++ b/dev-python/bottle/bottle-0.11.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.6.ebuild,v 1.4 2013/08/07 11:21:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.6.ebuild,v 1.5 2013/09/05 18:46:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0})
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0)
 inherit distutils-r1 python-r1
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
diff --git a/dev-python/bsddb3/bsddb3-5.3.0-r1.ebuild b/dev-python/bsddb3/bsddb3-5.3.0-r1.ebuild
index cee7397106f7..972b9581dd8b 100644
--- a/dev-python/bsddb3/bsddb3-5.3.0-r1.ebuild
+++ b/dev-python/bsddb3/bsddb3-5.3.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-5.3.0-r1.ebuild,v 1.2 2013/07/04 02:05:28 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-5.3.0-r1.ebuild,v 1.3 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit db-use distutils-r1 multilib
 
diff --git a/dev-python/bsddb3/bsddb3-6.0.0.ebuild b/dev-python/bsddb3/bsddb3-6.0.0.ebuild
index 424a31549c27..5c61117fffe1 100644
--- a/dev-python/bsddb3/bsddb3-6.0.0.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.0.ebuild,v 1.2 2013/07/13 15:21:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.0.ebuild,v 1.3 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit db-use distutils-r1 multilib
 
diff --git a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
index 5374256703fb..7df72a20f1b2 100644
--- a/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
+++ b/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/10 04:11:59 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bytecodeassembler/bytecodeassembler-0.6.ebuild,v 1.2 2013/09/05 18:47:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
index ef63d10d4f87..24bbfe237b4c 100644
--- a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
+++ b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/celementtree-1.0.5-r2.ebuild,v 1.1 2013/03/26 19:01:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/celementtree-1.0.5-r2.ebuild,v 1.2 2013/09/05 18:47:08 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cement/cement-2.0.2.ebuild b/dev-python/cement/cement-2.0.2.ebuild
index 63b0b68735bb..0c2eb2b9858b 100644
--- a/dev-python/cement/cement-2.0.2.ebuild
+++ b/dev-python/cement/cement-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cement/cement-2.0.2.ebuild,v 1.3 2013/09/02 18:46:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cement/cement-2.0.2.ebuild,v 1.4 2013/09/05 18:47:04 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/cffi/cffi-0.6.ebuild b/dev-python/cffi/cffi-0.6.ebuild
index 8817564306fd..9de5652432e6 100644
--- a/dev-python/cffi/cffi-0.6.ebuild
+++ b/dev-python/cffi/cffi-0.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.6.ebuild,v 1.3 2013/05/09 12:22:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.6.ebuild,v 1.4 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cffi/cffi-0.7.2.ebuild b/dev-python/cffi/cffi-0.7.2.ebuild
index f47e4540ebe1..b129430d679c 100644
--- a/dev-python/cffi/cffi-0.7.2.ebuild
+++ b/dev-python/cffi/cffi-0.7.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.7.2.ebuild,v 1.1 2013/08/10 10:04:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.7.2.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cffi/cffi-0.7.ebuild b/dev-python/cffi/cffi-0.7.ebuild
index b300099c9b20..c2bb6840cd09 100644
--- a/dev-python/cffi/cffi-0.7.ebuild
+++ b/dev-python/cffi/cffi-0.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.7.ebuild,v 1.2 2013/08/07 09:52:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.7.ebuild,v 1.3 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/charade/charade-1.0.3.ebuild b/dev-python/charade/charade-1.0.3.ebuild
index 6c99bfbf0bb8..3fb940fdf9ae 100644
--- a/dev-python/charade/charade-1.0.3.ebuild
+++ b/dev-python/charade/charade-1.0.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/charade/charade-1.0.3.ebuild,v 1.4 2013/08/11 13:19:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/charade/charade-1.0.3.ebuild,v 1.5 2013/09/05 18:46:40 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/chardet/chardet-2.0.1-r1.ebuild b/dev-python/chardet/chardet-2.0.1-r1.ebuild
index 88c42667dbdc..3fea646c57aa 100644
--- a/dev-python/chardet/chardet-2.0.1-r1.ebuild
+++ b/dev-python/chardet/chardet-2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chardet/chardet-2.0.1-r1.ebuild,v 1.5 2013/02/26 16:07:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chardet/chardet-2.0.1-r1.ebuild,v 1.6 2013/09/05 18:47:09 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild b/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
index 4521e41e2d3f..30679c70b927 100644
--- a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.6 2013/05/20 08:30:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.7 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorama/colorama-0.2.4-r1.ebuild b/dev-python/colorama/colorama-0.2.4-r1.ebuild
index e77078ecfa7a..5f929662b923 100644
--- a/dev-python/colorama/colorama-0.2.4-r1.ebuild
+++ b/dev-python/colorama/colorama-0.2.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colorama/colorama-0.2.4-r1.ebuild,v 1.1 2013/07/28 17:38:53 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colorama/colorama-0.2.4-r1.ebuild,v 1.2 2013/09/05 18:46:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 python3_1 python3_2 pypy2_0 )
+PYTHON_COMPAT=( python2_6 python2_7 python3_2 pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colout/colout-0.1.ebuild b/dev-python/colout/colout-0.1.ebuild
index 0da6f471cedc..cb1743acb74c 100644
--- a/dev-python/colout/colout-0.1.ebuild
+++ b/dev-python/colout/colout-0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.2 2013/06/10 17:53:22 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colout/colout-0.1.ebuild,v 1.3 2013/09/05 18:46:19 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1
 
 DESCRIPTION="Adds color to arbitrary command output."
diff --git a/dev-python/configobj/configobj-4.7.2-r1.ebuild b/dev-python/configobj/configobj-4.7.2-r1.ebuild
index 41ea18507455..2ea6faab8b70 100644
--- a/dev-python/configobj/configobj-4.7.2-r1.ebuild
+++ b/dev-python/configobj/configobj-4.7.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-4.7.2-r1.ebuild,v 1.7 2013/05/25 08:01:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-4.7.2-r1.ebuild,v 1.8 2013/09/05 18:46:26 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/configobj/configobj-4.7.2-r2.ebuild b/dev-python/configobj/configobj-4.7.2-r2.ebuild
index 25f85c02558a..7184e3326198 100644
--- a/dev-python/configobj/configobj-4.7.2-r2.ebuild
+++ b/dev-python/configobj/configobj-4.7.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-4.7.2-r2.ebuild,v 1.1 2013/08/11 16:59:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-4.7.2-r2.ebuild,v 1.2 2013/09/05 18:46:26 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/contextlib2/contextlib2-0.4.0.ebuild b/dev-python/contextlib2/contextlib2-0.4.0.ebuild
index 4911fbc326cf..9ff857a247a6 100644
--- a/dev-python/contextlib2/contextlib2-0.4.0.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/07/15 19:46:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/contextlib2/contextlib2-0.4.0.ebuild,v 1.2 2013/09/05 18:47:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/couchdb-python/couchdb-python-0.8-r1.ebuild b/dev-python/couchdb-python/couchdb-python-0.8-r1.ebuild
index 832743752825..3fb0ed8ff75d 100644
--- a/dev-python/couchdb-python/couchdb-python-0.8-r1.ebuild
+++ b/dev-python/couchdb-python/couchdb-python-0.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/couchdb-python/couchdb-python-0.8-r1.ebuild,v 1.4 2013/05/14 09:38:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/couchdb-python/couchdb-python-0.8-r1.ebuild,v 1.5 2013/09/05 18:47:12 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/coverage/coverage-3.5.3-r1.ebuild b/dev-python/coverage/coverage-3.5.3-r1.ebuild
index ad3eac6ec804..f430fcba4919 100644
--- a/dev-python/coverage/coverage-3.5.3-r1.ebuild
+++ b/dev-python/coverage/coverage-3.5.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.3-r1.ebuild,v 1.15 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.3-r1.ebuild,v 1.16 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/coverage/coverage-3.6.ebuild b/dev-python/coverage/coverage-3.6.ebuild
index 178335946909..373f8bb0f5c0 100644
--- a/dev-python/coverage/coverage-3.6.ebuild
+++ b/dev-python/coverage/coverage-3.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.6.ebuild,v 1.13 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.6.ebuild,v 1.14 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/cssselect/cssselect-0.7.1-r1.ebuild b/dev-python/cssselect/cssselect-0.7.1-r1.ebuild
index 7a467b8200ff..a56b9925bc7f 100644
--- a/dev-python/cssselect/cssselect-0.7.1-r1.ebuild
+++ b/dev-python/cssselect/cssselect-0.7.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.7.1-r1.ebuild,v 1.8 2013/09/02 12:11:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.7.1-r1.ebuild,v 1.9 2013/09/05 18:47:17 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-0.9.10-r1.ebuild b/dev-python/cssutils/cssutils-0.9.10-r1.ebuild
index b3e5bc83c87a..3e33682a3274 100644
--- a/dev-python/cssutils/cssutils-0.9.10-r1.ebuild
+++ b/dev-python/cssutils/cssutils-0.9.10-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/07/05 18:24:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.10-r1.ebuild,v 1.2 2013/09/05 18:45:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/cssutils/cssutils-0.9.10_beta1-r1.ebuild b/dev-python/cssutils/cssutils-0.9.10_beta1-r1.ebuild
index 229822053f34..56485c02172f 100644
--- a/dev-python/cssutils/cssutils-0.9.10_beta1-r1.ebuild
+++ b/dev-python/cssutils/cssutils-0.9.10_beta1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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_beta1-r1.ebuild,v 1.2 2013/07/04 14:48:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.10_beta1-r1.ebuild,v 1.3 2013/09/05 18:45:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 003fa2441301..cd39c045fd7b 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild,v 1.1 2013/02/18 14:22:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r1.ebuild b/dev-python/cx_Freeze/cx_Freeze-4.3.1-r1.ebuild
index 98fc1eb6ddfb..703cede06cba 100644
--- a/dev-python/cx_Freeze/cx_Freeze-4.3.1-r1.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-4.3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.1-r1.ebuild,v 1.1 2013/05/09 07:00:15 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cx_Freeze/cx_Freeze-4.3.1-r1.ebuild,v 1.2 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cython/cython-0.18-r1.ebuild b/dev-python/cython/cython-0.18-r1.ebuild
index b41e5c7ac1d3..a188897a2d86 100644
--- a/dev-python/cython/cython-0.18-r1.ebuild
+++ b/dev-python/cython/cython-0.18-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.18-r1.ebuild,v 1.5 2013/02/16 22:07:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.18-r1.ebuild,v 1.6 2013/09/05 18:46:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/cython/cython-0.19.1.ebuild b/dev-python/cython/cython-0.19.1.ebuild
index 39fda2a73423..f56b484af9b9 100644
--- a/dev-python/cython/cython-0.19.1.ebuild
+++ b/dev-python/cython/cython-0.19.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.19.1.ebuild,v 1.1 2013/05/24 20:25:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.19.1.ebuild,v 1.2 2013/09/05 18:46:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/d2to1/d2to1-0.2.10.ebuild b/dev-python/d2to1/d2to1-0.2.10.ebuild
index ba7b70397b7d..d6b7effe9235 100644
--- a/dev-python/d2to1/d2to1-0.2.10.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.10.ebuild,v 1.1 2013/04/15 07:50:13 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.10.ebuild,v 1.2 2013/09/05 18:46:20 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/d2to1/d2to1-0.2.11.ebuild b/dev-python/d2to1/d2to1-0.2.11.ebuild
index 50c0970db533..08abef86af62 100644
--- a/dev-python/d2to1/d2to1-0.2.11.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/09/02 11:20:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.11.ebuild,v 1.2 2013/09/05 18:46:20 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/decorator/decorator-3.4.0-r1.ebuild b/dev-python/decorator/decorator-3.4.0-r1.ebuild
index 4bd349099d26..84741c79705b 100644
--- a/dev-python/decorator/decorator-3.4.0-r1.ebuild
+++ b/dev-python/decorator/decorator-3.4.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/decorator-3.4.0-r1.ebuild,v 1.3 2013/06/14 05:16:16 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/decorator-3.4.0-r1.ebuild,v 1.4 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
index 355e36ba7cc8..ed38a3b961c4 100644
--- a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
+++ b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/09 15:25:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decoratortools/decoratortools-1.8-r1.ebuild,v 1.2 2013/09/05 18:47:07 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/defusedxml/defusedxml-0.4.1.ebuild b/dev-python/defusedxml/defusedxml-0.4.1.ebuild
index 0cbdf3e16fda..020f6661c86b 100644
--- a/dev-python/defusedxml/defusedxml-0.4.1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.ebuild,v 1.1 2013/06/02 10:44:08 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/defusedxml/defusedxml-0.4.1.ebuild,v 1.2 2013/09/05 18:47:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dingus/dingus-0.3.4-r1.ebuild b/dev-python/dingus/dingus-0.3.4-r1.ebuild
index 647a6e6ddfc2..35beef7c4daa 100644
--- a/dev-python/dingus/dingus-0.3.4-r1.ebuild
+++ b/dev-python/dingus/dingus-0.3.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/05/19 15:40:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dingus/dingus-0.3.4-r1.ebuild,v 1.2 2013/09/05 18:46:51 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/discogs-client/discogs-client-1.1.1.ebuild b/dev-python/discogs-client/discogs-client-1.1.1.ebuild
index 33e7703f9b6b..1b006728e977 100644
--- a/dev-python/discogs-client/discogs-client-1.1.1.ebuild
+++ b/dev-python/discogs-client/discogs-client-1.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/discogs-client/discogs-client-1.1.1.ebuild,v 1.2 2013/06/12 07:34:10 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/discogs-client/discogs-client-1.1.1.ebuild,v 1.3 2013/09/05 18:46:53 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-annoying/django-annoying-0.7.6-r1.ebuild b/dev-python/django-annoying/django-annoying-0.7.6-r1.ebuild
index 12023c89c9bb..1ac119394fc4 100644
--- a/dev-python/django-annoying/django-annoying-0.7.6-r1.ebuild
+++ b/dev-python/django-annoying/django-annoying-0.7.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.6-r1.ebuild,v 1.1 2013/05/18 13:10:25 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-annoying/django-annoying-0.7.6-r1.ebuild,v 1.2 2013/09/05 18:46:15 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
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 2c5e6db2cdd2..3452b0336cb6 100644
--- a/dev-python/django-annoying/django-annoying-0.7.7.ebuild
+++ b/dev-python/django-annoying/django-annoying-0.7.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/05/18 13:14:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-annoying/django-annoying-0.7.7.ebuild,v 1.2 2013/09/05 18:46:15 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-international/django-international-0.0.3.ebuild b/dev-python/django-international/django-international-0.0.3.ebuild
index 5d29587117fa..43af7c44e5cc 100644
--- a/dev-python/django-international/django-international-0.0.3.ebuild
+++ b/dev-python/django-international/django-international-0.0.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.3.ebuild,v 1.2 2013/01/05 15:02:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-international/django-international-0.0.3.ebuild,v 1.3 2013/09/05 18:47:07 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 pypy1_9 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Country and currency data for Django projects"
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 0ae6d0a52a1b..8cd73e146f2a 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,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/05/27 13:39:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-piston/django-piston-0.2.3-r1.ebuild,v 1.2 2013/09/05 18:46:25 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-setuptest/django-setuptest-0.1.2-r1.ebuild b/dev-python/django-setuptest/django-setuptest-0.1.2-r1.ebuild
index 1f92a4ad0d6b..509569623e6d 100644
--- a/dev-python/django-setuptest/django-setuptest-0.1.2-r1.ebuild
+++ b/dev-python/django-setuptest/django-setuptest-0.1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.2-r1.ebuild,v 1.1 2013/05/28 06:40:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-setuptest/django-setuptest-0.1.2-r1.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-setuptest/django-setuptest-0.1.4.ebuild b/dev-python/django-setuptest/django-setuptest-0.1.4.ebuild
index cbda419a631a..77cfd4906800 100644
--- a/dev-python/django-setuptest/django-setuptest-0.1.4.ebuild
+++ b/dev-python/django-setuptest/django-setuptest-0.1.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.4.ebuild,v 1.1 2013/06/25 17:43:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-setuptest/django-setuptest-0.1.4.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django/django-1.2.7.ebuild b/dev-python/django/django-1.2.7.ebuild
index 9c6900331dee..8e08e5892cda 100644
--- a/dev-python/django/django-1.2.7.ebuild
+++ b/dev-python/django/django-1.2.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.7.ebuild,v 1.2 2013/06/09 17:14:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.7.ebuild,v 1.3 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='sqlite?'
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
diff --git a/dev-python/django/django-1.3.7.ebuild b/dev-python/django/django-1.3.7.ebuild
index a14b9e51b461..cfcf82c9cba1 100644
--- a/dev-python/django/django-1.3.7.ebuild
+++ b/dev-python/django/django-1.3.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.7.ebuild,v 1.4 2013/06/09 17:14:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.7.ebuild,v 1.5 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='sqlite?'
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
diff --git a/dev-python/django/django-1.4.2-r2.ebuild b/dev-python/django/django-1.4.2-r2.ebuild
index c9c24d2be6bb..30e4f2585eb4 100644
--- a/dev-python/django/django-1.4.2-r2.ebuild
+++ b/dev-python/django/django-1.4.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.2-r2.ebuild,v 1.2 2013/06/09 17:14:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.2-r2.ebuild,v 1.3 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='sqlite?'
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
diff --git a/dev-python/django/django-1.4.5.ebuild b/dev-python/django/django-1.4.5.ebuild
index 908c24d070d9..ef0d17ac2d03 100644
--- a/dev-python/django/django-1.4.5.ebuild
+++ b/dev-python/django/django-1.4.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.5.ebuild,v 1.4 2013/06/09 17:14:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.5.ebuild,v 1.5 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='sqlite?'
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
diff --git a/dev-python/dnspython/dnspython-1.10.0-r1.ebuild b/dev-python/dnspython/dnspython-1.10.0-r1.ebuild
index ff1897ac5e3b..56c76652b607 100644
--- a/dev-python/dnspython/dnspython-1.10.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.10.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.10.0-r1.ebuild,v 1.1 2013/05/29 17:09:00 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.10.0-r1.ebuild,v 1.2 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
index d0cc9990a556..22541bd5d25d 100644
--- a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild,v 1.14 2013/05/25 07:49:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild,v 1.15 2013/09/05 18:47:13 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit eutils python-r1
 
diff --git a/dev-python/docutils/docutils-0.10.ebuild b/dev-python/docutils/docutils-0.10.ebuild
index d520963c58b7..0a62ac64ae8a 100644
--- a/dev-python/docutils/docutils-0.10.ebuild
+++ b/dev-python/docutils/docutils-0.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.10.ebuild,v 1.16 2013/06/02 08:38:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.10.ebuild,v 1.17 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils/docutils-0.9.1-r1.ebuild b/dev-python/docutils/docutils-0.9.1-r1.ebuild
index 7f3ba1d4a919..7b1758a48d43 100644
--- a/dev-python/docutils/docutils-0.9.1-r1.ebuild
+++ b/dev-python/docutils/docutils-0.9.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1-r1.ebuild,v 1.16 2013/03/05 09:13:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1-r1.ebuild,v 1.17 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/editobj/editobj-0.5.7-r2.ebuild b/dev-python/editobj/editobj-0.5.7-r2.ebuild
index 511b4627511d..0ec005de2528 100644
--- a/dev-python/editobj/editobj-0.5.7-r2.ebuild
+++ b/dev-python/editobj/editobj-0.5.7-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/editobj/editobj-0.5.7-r2.ebuild,v 1.1 2013/06/03 17:15:23 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/editobj/editobj-0.5.7-r2.ebuild,v 1.2 2013/09/05 18:46:40 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
index ac9aeba9c350..34356ac90e3e 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild,v 1.1 2013/01/06 14:10:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild,v 1.2 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild
index c52d814b9665..cfd9dbedb6aa 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild,v 1.2 2013/09/02 16:36:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild,v 1.3 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
index 7ab0f60857ae..bbaec7097a45 100644
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/elementtree-1.2.6-r3.ebuild,v 1.12 2013/06/02 08:39:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/elementtree-1.2.6-r3.ebuild,v 1.13 2013/09/05 18:47:10 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/empy/empy-3.3-r1.ebuild b/dev-python/empy/empy-3.3-r1.ebuild
index b0c65e58582a..d8f84179b8e7 100644
--- a/dev-python/empy/empy-3.3-r1.ebuild
+++ b/dev-python/empy/empy-3.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3-r1.ebuild,v 1.2 2013/06/08 16:35:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3-r1.ebuild,v 1.3 2013/09/05 18:47:08 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/envoy/envoy-0.0.2-r1.ebuild b/dev-python/envoy/envoy-0.0.2-r1.ebuild
index 5fca58ab0b1b..8fac99da2592 100644
--- a/dev-python/envoy/envoy-0.0.2-r1.ebuild
+++ b/dev-python/envoy/envoy-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/envoy/envoy-0.0.2-r1.ebuild,v 1.1 2013/06/05 19:18:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/envoy/envoy-0.0.2-r1.ebuild,v 1.2 2013/09/05 18:47:01 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
index f7930cafeca4..0173420e32ef 100644
--- a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r2.ebuild,v 1.13 2013/03/28 22:56:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r2.ebuild,v 1.14 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='tk?'
 
 inherit distutils-r1
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
index d060676f66e8..094cb562ef48 100644
--- a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
+++ b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild,v 1.4 2013/09/03 13:01:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild,v 1.5 2013/09/05 18:47:14 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 1dd7ba7cdb0a..1c10db4da6ee 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,2 +1,3 @@
 DIST eventlet-0.12.1.tar.gz 267022 SHA256 aaf97960b7e00f36844549399a22746c7ef27d76fffcd4056fb36bd242dd1e47 SHA512 601730bb6aafa83ee67dd3530c6b9649f78f9d348c1ef549133ffe076464309785eeed405f4a7786010e79963f3bf1ad70f0995b88f291df870c9c3f353d1a6c WHIRLPOOL 72c0573e182d3b411928bf18fea915bcc1cf3b416368262464418002b40a6dc8769f3594e662fc92e1c6fc7fe0e8bd55565c198f0afc9b618d7486b4fdc51d20
+DIST eventlet-0.13.0.tar.gz 276599 SHA256 d98118f01c064a6d256a264d4b939b2c6ad0814875c3b37859306c6ed1b4982c SHA512 eed2e4b648922c8a012938f5a3a06db6a7fc8ffb98f710e47c757a1410aa984865ca8fe4e4012e00ad2e16e9208222ed44d7e495c967090bab38d51170090d53 WHIRLPOOL 55b5926135b83d967b7bf0e691d9977f3455f30e096e4d1fda1e27cad51125afd47cc750155b3d70e5d7f0f8fd65e73091eb6add646186e268c53e62eabc23af
 DIST eventlet-0.9.16.tar.gz 317198 SHA256 b2d38084809b2f2a8e3cc5815b10912870cdbe97d9a4e5c1ff231ebc8da0e430 SHA512 4a6f0b883dcea17c435ab3d966285c1977def598c175cc002b33f30de4aff0992d03005ec3b358a7628d98bd4a752d39aba348c60feac6808cff01c1d10d7318 WHIRLPOOL fc9ab15bb6da5b0d08f4ba53d3755128e9dd043bf6f675f971497c83dbe06b99491513b9719d15299edf1f7a86c691369ffdc2e49f1c62fbab600e0a0c43a874
diff --git a/dev-python/eventlet/eventlet-0.13.0.ebuild b/dev-python/eventlet/eventlet-0.13.0.ebuild
new file mode 100644
index 000000000000..4214f8485468
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.13.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 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.1 2013/09/05 19:35:48 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="http://pypi.python.org/pypi/eventlet"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND}
+			dev-python/pyopenssl[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# Tests bind to static addresses, bug #456920
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/execnet/execnet-1.1-r1.ebuild b/dev-python/execnet/execnet-1.1-r1.ebuild
index feef8c17c6b0..9f8b5755f737 100644
--- a/dev-python/execnet/execnet-1.1-r1.ebuild
+++ b/dev-python/execnet/execnet-1.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/execnet/execnet-1.1-r1.ebuild,v 1.1 2013/01/20 00:04:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/execnet/execnet-1.1-r1.ebuild,v 1.2 2013/09/05 18:47:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index 0b3083433d90..a999ea09bd9d 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/extras/extras-0.0.3.ebuild,v 1.9 2013/07/13 11:45:44 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/extras/extras-0.0.3.ebuild,v 1.10 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/extremes/extremes-1.1.1.ebuild b/dev-python/extremes/extremes-1.1.1.ebuild
index cabe792147bb..e41e7878c945 100644
--- a/dev-python/extremes/extremes-1.1.1.ebuild
+++ b/dev-python/extremes/extremes-1.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/10 04:28:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/extremes/extremes-1.1.1.ebuild,v 1.2 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fabric/fabric-1.6.1-r1.ebuild b/dev-python/fabric/fabric-1.6.1-r1.ebuild
index 39fcd870a616..6c9541319878 100644
--- a/dev-python/fabric/fabric-1.6.1-r1.ebuild
+++ b/dev-python/fabric/fabric-1.6.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.6.1-r1.ebuild,v 1.2 2013/06/17 04:25:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.6.1-r1.ebuild,v 1.3 2013/09/05 14:15:26 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
@@ -19,8 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=">=dev-python/paramiko-1.10.0[${PYTHON_USEDEP}]
-	python_targets_python2_5? ( dev-python/multiprocessing[python_targets_python2_5] )"
+RDEPEND=">=dev-python/paramiko-1.10.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/fabric/fabric-1.7.0.ebuild b/dev-python/fabric/fabric-1.7.0.ebuild
index a5d3a6b78f3c..0b4d3bb736ec 100644
--- a/dev-python/fabric/fabric-1.7.0.ebuild
+++ b/dev-python/fabric/fabric-1.7.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.7.0.ebuild,v 1.1 2013/08/10 12:36:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.7.0.ebuild,v 1.2 2013/09/05 14:15:26 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
@@ -19,8 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=">=dev-python/paramiko-1.10.0[${PYTHON_USEDEP}]
-	python_targets_python2_5? ( dev-python/multiprocessing[python_targets_python2_5] )"
+RDEPEND=">=dev-python/paramiko-1.10.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/feedgenerator/feedgenerator-1.5.ebuild b/dev-python/feedgenerator/feedgenerator-1.5.ebuild
index dbeb56e66cc0..4ff1627ed14e 100644
--- a/dev-python/feedgenerator/feedgenerator-1.5.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.5.ebuild,v 1.2 2013/05/29 05:49:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.5.ebuild,v 1.3 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Standalone version of django.utils.feedgenerator"
diff --git a/dev-python/feedgenerator/feedgenerator-1.6.ebuild b/dev-python/feedgenerator/feedgenerator-1.6.ebuild
index 6acace61ac62..26294a0190cf 100644
--- a/dev-python/feedgenerator/feedgenerator-1.6.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.6.ebuild,v 1.1 2013/06/08 15:15:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.6.ebuild,v 1.2 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Standalone version of django.utils.feedgenerator"
diff --git a/dev-python/feedparser/feedparser-5.1.3-r1.ebuild b/dev-python/feedparser/feedparser-5.1.3-r1.ebuild
index 673e93bccca7..be2220cccc88 100644
--- a/dev-python/feedparser/feedparser-5.1.3-r1.ebuild
+++ b/dev-python/feedparser/feedparser-5.1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.7 2013/06/30 20:18:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.3-r1.ebuild,v 1.8 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/fixtures/fixtures-0.3.12-r1.ebuild b/dev-python/fixtures/fixtures-0.3.12-r1.ebuild
index be5de5050ca9..cdc82594404d 100644
--- a/dev-python/fixtures/fixtures-0.3.12-r1.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.12-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.12-r1.ebuild,v 1.2 2013/07/09 15:52:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.12-r1.ebuild,v 1.3 2013/09/05 18:46:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flake8/flake8-2.0.ebuild b/dev-python/flake8/flake8-2.0.ebuild
index c061807ccbba..5a556571792b 100644
--- a/dev-python/flake8/flake8-2.0.ebuild
+++ b/dev-python/flake8/flake8-2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.4 2013/08/28 11:15:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0.ebuild,v 1.5 2013/09/05 18:46:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
index 76a53875bcad..9a713bead94c 100644
--- a/dev-python/flup/flup-1.0.2-r1.ebuild
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flup/flup-1.0.2-r1.ebuild,v 1.4 2013/05/20 08:30:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flup/flup-1.0.2-r1.ebuild,v 1.5 2013/09/05 18:46:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/formencode/formencode-1.2.6-r1.ebuild b/dev-python/formencode/formencode-1.2.6-r1.ebuild
index a82aed098a9c..4f58741235c1 100644
--- a/dev-python/formencode/formencode-1.2.6-r1.ebuild
+++ b/dev-python/formencode/formencode-1.2.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-1.2.6-r1.ebuild,v 1.1 2013/07/03 05:44:13 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-1.2.6-r1.ebuild,v 1.2 2013/09/05 18:46:15 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
index a429424a57d5..de0d1a1ddd24 100644
--- a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
+++ b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.7.3-r1.ebuild,v 1.12 2013/06/02 08:43:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.7.3-r1.ebuild,v 1.13 2013/09/05 18:46:08 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fudge/fudge-0.9.6-r1.ebuild b/dev-python/fudge/fudge-0.9.6-r1.ebuild
index 2badfa03d9a8..12513a15b0ef 100644
--- a/dev-python/fudge/fudge-0.9.6-r1.ebuild
+++ b/dev-python/fudge/fudge-0.9.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-0.9.6-r1.ebuild,v 1.1 2013/09/01 10:11:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-0.9.6-r1.ebuild,v 1.2 2013/09/05 18:47:01 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/fudge/fudge-1.0.3-r2.ebuild b/dev-python/fudge/fudge-1.0.3-r2.ebuild
index 0010fc7a6c69..c37c8f763944 100644
--- a/dev-python/fudge/fudge-1.0.3-r2.ebuild
+++ b/dev-python/fudge/fudge-1.0.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.2 2013/09/01 10:11:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-1.0.3-r2.ebuild,v 1.3 2013/09/05 18:47:01 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futures/futures-2.1.4.ebuild b/dev-python/futures/futures-2.1.4.ebuild
index 6e1e66f38719..0153c1aa6588 100644
--- a/dev-python/futures/futures-2.1.4.ebuild
+++ b/dev-python/futures/futures-2.1.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.1.4.ebuild,v 1.2 2013/08/08 01:14:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/futures/futures-2.1.4.ebuild,v 1.3 2013/09/05 18:46:56 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1
 
 DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
diff --git a/dev-python/gdata/gdata-2.0.17-r1.ebuild b/dev-python/gdata/gdata-2.0.17-r1.ebuild
index 00dd2ac48626..f04986e281e3 100644
--- a/dev-python/gdata/gdata-2.0.17-r1.ebuild
+++ b/dev-python/gdata/gdata-2.0.17-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdata/gdata-2.0.17-r1.ebuild,v 1.1 2013/06/14 08:22:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdata/gdata-2.0.17-r1.ebuild,v 1.2 2013/09/05 18:46:34 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="ssl(+),xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
index 7dd8f27b4a29..ac3e221e3dee 100644
--- a/dev-python/gdata/gdata-2.0.18.ebuild
+++ b/dev-python/gdata/gdata-2.0.18.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdata/gdata-2.0.18.ebuild,v 1.2 2013/07/03 16:30:33 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdata/gdata-2.0.18.ebuild,v 1.3 2013/09/05 18:46:34 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="ssl(+),xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild
index 6bd0f1d21d86..fee8409f08ff 100644
--- a/dev-python/genshi/genshi-0.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.7.ebuild,v 1.4 2013/06/25 13:01:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.7.ebuild,v 1.5 2013/09/05 18:46:26 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/geoip-python/geoip-python-1.2.8-r1.ebuild b/dev-python/geoip-python/geoip-python-1.2.8-r1.ebuild
index 497868f57a71..7d5cba111cef 100644
--- a/dev-python/geoip-python/geoip-python-1.2.8-r1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.2.8-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.2.8-r1.ebuild,v 1.1 2013/05/26 19:07:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.2.8-r1.ebuild,v 1.2 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gntp/gntp-1.0.1.ebuild b/dev-python/gntp/gntp-1.0.1.ebuild
index 8008ee4b3275..af38b55320c9 100644
--- a/dev-python/gntp/gntp-1.0.1.ebuild
+++ b/dev-python/gntp/gntp-1.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gntp/gntp-1.0.1.ebuild,v 1.1 2013/06/06 16:31:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gntp/gntp-1.0.1.ebuild,v 1.2 2013/09/05 18:46:19 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild
index 756394ee2333..81c395010297 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1.ebuild,v 1.1 2013/06/27 03:12:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild,v 1.2 2013/09/05 18:46:56 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphy/graphy-1.0-r1.ebuild b/dev-python/graphy/graphy-1.0-r1.ebuild
index 04938f2a6eaa..f2e9241c2b5a 100644
--- a/dev-python/graphy/graphy-1.0-r1.ebuild
+++ b/dev-python/graphy/graphy-1.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/07/31 22:58:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graphy/graphy-1.0-r1.ebuild,v 1.2 2013/09/05 18:46:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/greenlet/greenlet-0.4.0-r1.ebuild b/dev-python/greenlet/greenlet-0.4.0-r1.ebuild
index b33ea156b038..cb3fb74411a4 100644
--- a/dev-python/greenlet/greenlet-0.4.0-r1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.0-r1.ebuild,v 1.2 2013/02/12 11:49:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.0-r1.ebuild,v 1.3 2013/09/05 18:47:05 mgorny Exp $
 
 EAPI=5
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/greenlet/greenlet-0.4.0-r2.ebuild b/dev-python/greenlet/greenlet-0.4.0-r2.ebuild
index 1a74c034fade..fc92b5dab892 100644
--- a/dev-python/greenlet/greenlet-0.4.0-r2.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.0-r2.ebuild,v 1.1 2013/05/29 01:58:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.0-r2.ebuild,v 1.2 2013/09/05 18:47:05 mgorny Exp $
 
 EAPI=5
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/greenlet/greenlet-0.4.1.ebuild b/dev-python/greenlet/greenlet-0.4.1.ebuild
index 69ccdc1220b9..cd133990cacc 100644
--- a/dev-python/greenlet/greenlet-0.4.1.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.1.ebuild,v 1.2 2013/07/11 21:20:14 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.1.ebuild,v 1.3 2013/09/05 18:47:05 mgorny Exp $
 
 EAPI=5
 
 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/happydoc/happydoc-3.1-r2.ebuild b/dev-python/happydoc/happydoc-3.1-r2.ebuild
index 04663e595c44..cf10eabe4949 100644
--- a/dev-python/happydoc/happydoc-3.1-r2.ebuild
+++ b/dev-python/happydoc/happydoc-3.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/06/14 17:48:17 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-3.1-r2.ebuild,v 1.2 2013/09/05 18:46:24 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/hgdistver/hgdistver-0.16-r1.ebuild b/dev-python/hgdistver/hgdistver-0.16-r1.ebuild
index e6895df562f5..b263ec69dfd7 100644
--- a/dev-python/hgdistver/hgdistver-0.16-r1.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.16-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgdistver/hgdistver-0.16-r1.ebuild,v 1.1 2013/06/23 05:14:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgdistver/hgdistver-0.16-r1.ebuild,v 1.2 2013/09/05 18:47:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hglib/hglib-1.0.ebuild b/dev-python/hglib/hglib-1.0.ebuild
index 45904bf949cd..e64377018036 100644
--- a/dev-python/hglib/hglib-1.0.ebuild
+++ b/dev-python/hglib/hglib-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-1.0.ebuild,v 1.2 2013/06/26 02:01:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-1.0.ebuild,v 1.3 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 PYTHON_REQ_USE="threads(+)"
 
 MY_P="python-${P}"
diff --git a/dev-python/hgtools/hgtools-2.0.2-r1.ebuild b/dev-python/hgtools/hgtools-2.0.2-r1.ebuild
index 4b0f798c5208..68d443cf29eb 100644
--- a/dev-python/hgtools/hgtools-2.0.2-r1.ebuild
+++ b/dev-python/hgtools/hgtools-2.0.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2-r1.ebuild,v 1.1 2013/05/06 15:31:47 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2-r1.ebuild,v 1.2 2013/09/05 18:46:43 mgorny Exp $
 
 EAPI=5
 # python3.2+: bug #450666 (doctest failure)
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/hgtools/hgtools-2.0.2.ebuild b/dev-python/hgtools/hgtools-2.0.2.ebuild
index 3dfd06aad782..d22be585a058 100644
--- a/dev-python/hgtools/hgtools-2.0.2.ebuild
+++ b/dev-python/hgtools/hgtools-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2.ebuild,v 1.5 2013/01/06 23:07:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2.ebuild,v 1.6 2013/09/05 18:46:43 mgorny Exp $
 
 EAPI=5
 # python3.2+: bug #450666 (doctest failure)
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hgtools/hgtools-3.0.2.ebuild b/dev-python/hgtools/hgtools-3.0.2.ebuild
index 802ae5b8eb1b..f0c28ac249cd 100644
--- a/dev-python/hgtools/hgtools-3.0.2.ebuild
+++ b/dev-python/hgtools/hgtools-3.0.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-3.0.2.ebuild,v 1.1 2013/06/23 12:11:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-3.0.2.ebuild,v 1.2 2013/09/05 18:46:43 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/hiredis/hiredis-0.1.1-r1.ebuild b/dev-python/hiredis/hiredis-0.1.1-r1.ebuild
index 0560c4f93e59..354b67c9da5d 100644
--- a/dev-python/hiredis/hiredis-0.1.1-r1.ebuild
+++ b/dev-python/hiredis/hiredis-0.1.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/06/23 16:34:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hiredis/hiredis-0.1.1-r1.ebuild,v 1.2 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hiredis/hiredis-0.1.1-r2.ebuild b/dev-python/hiredis/hiredis-0.1.1-r2.ebuild
index 593bf1cec5d1..269f25a79002 100644
--- a/dev-python/hiredis/hiredis-0.1.1-r2.ebuild
+++ b/dev-python/hiredis/hiredis-0.1.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/07/12 09:28:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hiredis/hiredis-0.1.1-r2.ebuild,v 1.2 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/html2text/html2text-3.200.3-r1.ebuild b/dev-python/html2text/html2text-3.200.3-r1.ebuild
index 9b6080b623b4..392b06e5b403 100644
--- a/dev-python/html2text/html2text-3.200.3-r1.ebuild
+++ b/dev-python/html2text/html2text-3.200.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/html2text-3.200.3-r1.ebuild,v 1.1 2013/02/15 02:39:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html2text/html2text-3.200.3-r1.ebuild,v 1.2 2013/09/05 18:47:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/html5lib/html5lib-0.95-r1.ebuild b/dev-python/html5lib/html5lib-0.95-r1.ebuild
index addb7fd9d729..89ddf5e1ba94 100644
--- a/dev-python/html5lib/html5lib-0.95-r1.ebuild
+++ b/dev-python/html5lib/html5lib-0.95-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.95-r1.ebuild,v 1.5 2013/05/24 15:19:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.95-r1.ebuild,v 1.6 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/html5lib/html5lib-1.0_beta1.ebuild b/dev-python/html5lib/html5lib-1.0_beta1.ebuild
index b24028379c32..584ee7f5523a 100644
--- a/dev-python/html5lib/html5lib-1.0_beta1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0_beta1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-1.0_beta1.ebuild,v 1.2 2013/06/27 21:16:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-1.0_beta1.ebuild,v 1.3 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/html5lib/html5lib-1.0_beta3.ebuild b/dev-python/html5lib/html5lib-1.0_beta3.ebuild
index 327cf216e139..a45b1a78e7bb 100644
--- a/dev-python/html5lib/html5lib-1.0_beta3.ebuild
+++ b/dev-python/html5lib/html5lib-1.0_beta3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-1.0_beta3.ebuild,v 1.2 2013/08/25 16:22:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-1.0_beta3.ebuild,v 1.3 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
index f446da9d3156..36f709b74eb0 100644
--- a/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
+++ b/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild,v 1.2 2013/06/08 18:11:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/htmlgen-2.2.2-r1.ebuild,v 1.3 2013/09/05 18:46:56 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-r1
 
diff --git a/dev-python/http-parser/http-parser-0.7.12.ebuild b/dev-python/http-parser/http-parser-0.7.12.ebuild
index d9d9aa24a71e..2c16e23bcacc 100644
--- a/dev-python/http-parser/http-parser-0.7.12.ebuild
+++ b/dev-python/http-parser/http-parser-0.7.12.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.7.12.ebuild,v 1.4 2013/02/09 04:42:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/http-parser/http-parser-0.7.12.ebuild,v 1.5 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/http-parser/http-parser-0.8.1-r1.ebuild b/dev-python/http-parser/http-parser-0.8.1-r1.ebuild
index 94a669fe0900..d36c1174f0fd 100644
--- a/dev-python/http-parser/http-parser-0.8.1-r1.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1-r1.ebuild,v 1.5 2013/07/11 21:30:47 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/http-parser/http-parser-0.8.1-r1.ebuild,v 1.6 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
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 68ec48ccbd8e..db2101a6993d 100644
--- a/dev-python/http-parser/http-parser-0.8.3.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/09/02 20:01:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/http-parser/http-parser-0.8.3.ebuild,v 1.2 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/httplib2/httplib2-0.7.7.ebuild b/dev-python/httplib2/httplib2-0.7.7.ebuild
index ba44b496d89f..335d8192506f 100644
--- a/dev-python/httplib2/httplib2-0.7.7.ebuild
+++ b/dev-python/httplib2/httplib2-0.7.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.7.7.ebuild,v 1.1 2012/12/20 07:35:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.7.7.ebuild,v 1.2 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/httplib2/httplib2-0.8.ebuild b/dev-python/httplib2/httplib2-0.8.ebuild
index 34d6175d1de5..9a69802aa008 100644
--- a/dev-python/httplib2/httplib2-0.8.ebuild
+++ b/dev-python/httplib2/httplib2-0.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.8.ebuild,v 1.1 2013/06/17 09:20:59 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/httplib2/httplib2-0.8.ebuild,v 1.2 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-3.3.ebuild b/dev-python/icalendar/icalendar-3.3.ebuild
index 1df1643de0e8..84d616ce25c6 100644
--- a/dev-python/icalendar/icalendar-3.3.ebuild
+++ b/dev-python/icalendar/icalendar-3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.3.ebuild,v 1.2 2013/03/09 07:32:15 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.3.ebuild,v 1.3 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-3.4.ebuild b/dev-python/icalendar/icalendar-3.4.ebuild
index 828a5190353a..1443121fc69d 100644
--- a/dev-python/icalendar/icalendar-3.4.ebuild
+++ b/dev-python/icalendar/icalendar-3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.4.ebuild,v 1.3 2013/07/08 07:56:07 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.4.ebuild,v 1.4 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-3.5.ebuild b/dev-python/icalendar/icalendar-3.5.ebuild
index 1cfdd6708d99..c9ac581ae119 100644
--- a/dev-python/icalendar/icalendar-3.5.ebuild
+++ b/dev-python/icalendar/icalendar-3.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.5.ebuild,v 1.1 2013/07/08 09:00:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.5.ebuild,v 1.2 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ijson/ijson-1.0-r1.ebuild b/dev-python/ijson/ijson-1.0-r1.ebuild
index 4074180cdd80..9202c357d73e 100644
--- a/dev-python/ijson/ijson-1.0-r1.ebuild
+++ b/dev-python/ijson/ijson-1.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ijson/ijson-1.0-r1.ebuild,v 1.1 2013/01/06 09:09:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ijson/ijson-1.0-r1.ebuild,v 1.2 2013/09/05 18:46:57 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/imaging/imaging-1.1.7-r2.ebuild b/dev-python/imaging/imaging-1.1.7-r2.ebuild
index d20475dd9ced..c625b9e5de27 100644
--- a/dev-python/imaging/imaging-1.1.7-r2.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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-r2.ebuild,v 1.5 2013/05/28 22:47:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.6 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='tk?'
 
 inherit eutils multilib distutils-r1
diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild
index 97fc718e7579..59c6bbcd40e7 100644
--- a/dev-python/imaging/imaging-1.1.7-r4.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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-r4.ebuild,v 1.2 2013/05/28 22:47:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r4.ebuild,v 1.3 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE='tk?'
 
 inherit distutils-r1
diff --git a/dev-python/imdbpy/imdbpy-4.9-r1.ebuild b/dev-python/imdbpy/imdbpy-4.9-r1.ebuild
index becc1eecf027..5ec57b5fb7d5 100644
--- a/dev-python/imdbpy/imdbpy-4.9-r1.ebuild
+++ b/dev-python/imdbpy/imdbpy-4.9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/imdbpy-4.9-r1.ebuild,v 1.1 2013/06/23 17:43:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/imdbpy-4.9-r1.ebuild,v 1.2 2013/09/05 18:46:45 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/importing/importing-1.10.ebuild b/dev-python/importing/importing-1.10.ebuild
index ea01ab614793..b128e0759f4c 100644
--- a/dev-python/importing/importing-1.10.ebuild
+++ b/dev-python/importing/importing-1.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/10 05:43:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/importing/importing-1.10.ebuild,v 1.2 2013/09/05 18:47:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iniparse/iniparse-0.4-r1.ebuild b/dev-python/iniparse/iniparse-0.4-r1.ebuild
index e5d019fe90df..e243397c2c21 100644
--- a/dev-python/iniparse/iniparse-0.4-r1.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iniparse/iniparse-0.4-r1.ebuild,v 1.4 2013/05/20 08:31:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iniparse/iniparse-0.4-r1.ebuild,v 1.5 2013/09/05 18:45:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild b/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild
index 3d41871febb3..586cf9e13048 100644
--- a/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild
+++ b/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild,v 1.1 2013/06/24 04:51:39 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild,v 1.2 2013/09/05 18:47:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddr/ipaddr-2.1.10-r1.ebuild b/dev-python/ipaddr/ipaddr-2.1.10-r1.ebuild
index f99650dbde2b..38704bccd6c0 100644
--- a/dev-python/ipaddr/ipaddr-2.1.10-r1.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.1.10-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ipaddr-2.1.10-r1.ebuild,v 1.4 2013/08/18 13:44:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddr/ipaddr-2.1.10-r1.ebuild,v 1.5 2013/09/05 18:46:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipy/ipy-0.76-r1.ebuild b/dev-python/ipy/ipy-0.76-r1.ebuild
index b4ac0c530caa..d2b5b45edcb6 100644
--- a/dev-python/ipy/ipy-0.76-r1.ebuild
+++ b/dev-python/ipy/ipy-0.76-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.76-r1.ebuild,v 1.4 2013/04/06 15:33:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.76-r1.ebuild,v 1.5 2013/09/05 18:46:57 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipy/ipy-0.81.ebuild b/dev-python/ipy/ipy-0.81.ebuild
index 09d7ffbe8b37..a71952a1d4d7 100644
--- a/dev-python/ipy/ipy-0.81.ebuild
+++ b/dev-python/ipy/ipy-0.81.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.81.ebuild,v 1.1 2013/06/24 11:56:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.81.ebuild,v 1.2 2013/09/05 18:46:57 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipython/ipython-0.13.2.ebuild b/dev-python/ipython/ipython-0.13.2.ebuild
index cf94c2956023..7c8b3bc82b33 100644
--- a/dev-python/ipython/ipython-0.13.2.ebuild
+++ b/dev-python/ipython/ipython-0.13.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v 1.7 2013/08/27 20:00:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v 1.8 2013/09/05 18:47:03 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='readline,sqlite'
 
 inherit distutils-r1 elisp-common eutils virtualx
diff --git a/dev-python/ipython/ipython-1.0.0.ebuild b/dev-python/ipython/ipython-1.0.0.ebuild
index 1ac8e67280c8..9cb83f826bc9 100644
--- a/dev-python/ipython/ipython-1.0.0.ebuild
+++ b/dev-python/ipython/ipython-1.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v 1.8 2013/08/28 08:07:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.0.0.ebuild,v 1.9 2013/09/05 18:47:03 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='readline,sqlite'
 
 inherit distutils-r1 elisp-common eutils virtualx
diff --git a/dev-python/irc/irc-8.3-r1.ebuild b/dev-python/irc/irc-8.3-r1.ebuild
index 0ea17399fcac..40adbe7e7404 100644
--- a/dev-python/irc/irc-8.3-r1.ebuild
+++ b/dev-python/irc/irc-8.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.3-r1.ebuild,v 1.1 2013/06/24 12:15:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.3-r1.ebuild,v 1.2 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/irc/irc-8.3.1.ebuild b/dev-python/irc/irc-8.3.1.ebuild
index 80e8e42ce955..74f4f01929e5 100644
--- a/dev-python/irc/irc-8.3.1.ebuild
+++ b/dev-python/irc/irc-8.3.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.3.1.ebuild,v 1.1 2013/07/08 05:15:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.3.1.ebuild,v 1.2 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/irc/irc-8.4.ebuild b/dev-python/irc/irc-8.4.ebuild
index c652dfebfaa5..2a8e31bd777b 100644
--- a/dev-python/irc/irc-8.4.ebuild
+++ b/dev-python/irc/irc-8.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.4.ebuild,v 1.1 2013/08/10 13:07:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.4.ebuild,v 1.2 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
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 ee20913eec8b..90d5405d4bae 100644
--- a/dev-python/irman-python/irman-python-0.1-r1.ebuild
+++ b/dev-python/irman-python/irman-python-0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/06/24 15:16:02 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irman-python/irman-python-0.1-r1.ebuild,v 1.2 2013/09/05 18:47:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/iso8601/iso8601-0.1.4-r1.ebuild b/dev-python/iso8601/iso8601-0.1.4-r1.ebuild
index 8a6fd7119575..5a93ebdb92cf 100644
--- a/dev-python/iso8601/iso8601-0.1.4-r1.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.4-r1.ebuild,v 1.2 2013/01/12 23:29:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.4-r1.ebuild,v 1.3 2013/09/05 18:46:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/isodate/isodate-0.4.9-r1.ebuild b/dev-python/isodate/isodate-0.4.9-r1.ebuild
index 2b419fc1e2ac..cdecfd2b8c0d 100644
--- a/dev-python/isodate/isodate-0.4.9-r1.ebuild
+++ b/dev-python/isodate/isodate-0.4.9-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/isodate/isodate-0.4.9-r1.ebuild,v 1.2 2013/06/24 16:02:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/isodate/isodate-0.4.9-r1.ebuild,v 1.3 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/itsdangerous/itsdangerous-0.21.ebuild b/dev-python/itsdangerous/itsdangerous-0.21.ebuild
index 3226ec507f3a..a2d075d51911 100644
--- a/dev-python/itsdangerous/itsdangerous-0.21.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-0.21.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.21.ebuild,v 1.2 2013/06/27 02:13:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.21.ebuild,v 1.3 2013/09/05 18:46:11 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/itsdangerous/itsdangerous-0.22.ebuild b/dev-python/itsdangerous/itsdangerous-0.22.ebuild
index 696b41b6b4f4..93c4554850ad 100644
--- a/dev-python/itsdangerous/itsdangerous-0.22.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-0.22.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.22.ebuild,v 1.1 2013/07/17 02:43:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.22.ebuild,v 1.2 2013/09/05 18:46:11 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jinja/jinja-2.6-r1.ebuild b/dev-python/jinja/jinja-2.6-r1.ebuild
index 6e664bb3abed..53c292749ecc 100644
--- a/dev-python/jinja/jinja-2.6-r1.ebuild
+++ b/dev-python/jinja/jinja-2.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r1.ebuild,v 1.12 2013/09/02 11:57:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r1.ebuild,v 1.13 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jinja/jinja-2.6-r100.ebuild b/dev-python/jinja/jinja-2.6-r100.ebuild
index de1099e37e41..0dcf76b829db 100644
--- a/dev-python/jinja/jinja-2.6-r100.ebuild
+++ b/dev-python/jinja/jinja-2.6-r100.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r100.ebuild,v 1.14 2013/09/02 11:22:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r100.ebuild,v 1.15 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,3_1,3_2} )
+PYTHON_COMPAT=( python3_2 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/jinja/jinja-2.6-r2.ebuild b/dev-python/jinja/jinja-2.6-r2.ebuild
index e94a984fea96..584ae70c5732 100644
--- a/dev-python/jinja/jinja-2.6-r2.ebuild
+++ b/dev-python/jinja/jinja-2.6-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r2.ebuild,v 1.2 2013/05/23 01:28:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r2.ebuild,v 1.3 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/jinja/jinja-2.7.1.ebuild b/dev-python/jinja/jinja-2.7.1.ebuild
index 87be2f6af00a..cf03d3053288 100644
--- a/dev-python/jinja/jinja-2.7.1.ebuild
+++ b/dev-python/jinja/jinja-2.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.7.1.ebuild,v 1.1 2013/08/07 13:49:31 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.7.1.ebuild,v 1.2 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/jinja/jinja-2.7.ebuild b/dev-python/jinja/jinja-2.7.ebuild
index eed51c7ad233..ea7161d93f3b 100644
--- a/dev-python/jinja/jinja-2.7.ebuild
+++ b/dev-python/jinja/jinja-2.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.7.ebuild,v 1.15 2013/09/02 11:22:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.7.ebuild,v 1.16 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/jonpy/jonpy-0.10-r1.ebuild b/dev-python/jonpy/jonpy-0.10-r1.ebuild
index 5b8f6dfec129..408677e777d0 100644
--- a/dev-python/jonpy/jonpy-0.10-r1.ebuild
+++ b/dev-python/jonpy/jonpy-0.10-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/jonpy-0.10-r1.ebuild,v 1.1 2013/06/25 08:44:17 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/jonpy-0.10-r1.ebuild,v 1.2 2013/09/05 18:47:15 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsmin/jsmin-2.0.3.ebuild b/dev-python/jsmin/jsmin-2.0.3.ebuild
index 0ae10231e572..657f718e613b 100644
--- a/dev-python/jsmin/jsmin-2.0.3.ebuild
+++ b/dev-python/jsmin/jsmin-2.0.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/jsmin-2.0.3.ebuild,v 1.1 2013/05/22 16:00:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/jsmin-2.0.3.ebuild,v 1.2 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild b/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild
index 701f11a926cf..b548f406ac26 100644
--- a/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild,v 1.3 2013/06/23 11:27:30 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild,v 1.4 2013/09/05 18:46:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/jsonschema-2.0.0.ebuild b/dev-python/jsonschema/jsonschema-2.0.0.ebuild
index db82127eb3d9..518942be0134 100644
--- a/dev-python/jsonschema/jsonschema-2.0.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonschema/jsonschema-2.0.0.ebuild,v 1.1 2013/05/27 00:57:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonschema/jsonschema-2.0.0.ebuild,v 1.2 2013/09/05 18:46:51 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of JSON-Schema validation for Python"
diff --git a/dev-python/keyring/keyring-1.0.ebuild b/dev-python/keyring/keyring-1.0.ebuild
index 2c00193843bb..42017e8ae74c 100644
--- a/dev-python/keyring/keyring-1.0.ebuild
+++ b/dev-python/keyring/keyring-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.5 2013/01/07 00:03:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.6 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/keyring/keyring-1.5-r1.ebuild b/dev-python/keyring/keyring-1.5-r1.ebuild
index 1d13ef376cd9..802fd646da86 100644
--- a/dev-python/keyring/keyring-1.5-r1.ebuild
+++ b/dev-python/keyring/keyring-1.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5-r1.ebuild,v 1.1 2013/07/12 20:03:09 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5-r1.ebuild,v 1.2 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} python{3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} pypy2_0 )
 #tests restricted due to unpackaged dependancies
 RESTRICT="test"
 
diff --git a/dev-python/keyring/keyring-1.5.ebuild b/dev-python/keyring/keyring-1.5.ebuild
index 3c60da5da578..3070faeb178e 100644
--- a/dev-python/keyring/keyring-1.5.ebuild
+++ b/dev-python/keyring/keyring-1.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5.ebuild,v 1.1 2013/06/27 17:40:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5.ebuild,v 1.2 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} python{3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} pypy2_0 )
 #tests restricted due to unpackaged dependancies
 RESTRICT="test"
 
diff --git a/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild b/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild
index 8fc57314e96a..9d5a100b9b69 100644
--- a/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild
+++ b/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild,v 1.1 2013/07/09 01:03:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/libnatpmp/libnatpmp-20120821-r1.ebuild,v 1.2 2013/09/05 18:46:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llfuse/llfuse-0.39.ebuild b/dev-python/llfuse/llfuse-0.39.ebuild
index 153831735d85..865f8730be3e 100644
--- a/dev-python/llfuse/llfuse-0.39.ebuild
+++ b/dev-python/llfuse/llfuse-0.39.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/llfuse/llfuse-0.39.ebuild,v 1.3 2013/07/21 08:27:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/llfuse/llfuse-0.39.ebuild,v 1.4 2013/09/05 18:46:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lockfile/lockfile-0.9.1-r1.ebuild b/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
index 01190a76f84c..23a1b890bb9e 100644
--- a/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.9.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lockfile/lockfile-0.9.1-r1.ebuild,v 1.6 2013/08/10 13:29:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lockfile/lockfile-0.9.1-r1.ebuild,v 1.7 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI=5
 # py2.5 dropped; Test file reveals py2.5 can't support a core file
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/logbook/logbook-0.4.1.ebuild b/dev-python/logbook/logbook-0.4.1.ebuild
index 1b62a8651dc3..c73a5b087fb6 100644
--- a/dev-python/logbook/logbook-0.4.1.ebuild
+++ b/dev-python/logbook/logbook-0.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/logbook-0.4.1.ebuild,v 1.3 2013/03/29 21:01:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/logbook-0.4.1.ebuild,v 1.4 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/logbook/logbook-0.4.2.ebuild b/dev-python/logbook/logbook-0.4.2.ebuild
index f85f9c15c403..8cc2aa0d6e4b 100644
--- a/dev-python/logbook/logbook-0.4.2.ebuild
+++ b/dev-python/logbook/logbook-0.4.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/logbook-0.4.2.ebuild,v 1.1 2013/06/30 14:50:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/logbook-0.4.2.ebuild,v 1.2 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI=5
 # py3.2 fails tests & is marked to be dropped next release which will be very soon
 # along with py2.5. See issue/86
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/logilab-common/logilab-common-0.59.1.ebuild b/dev-python/logilab-common/logilab-common-0.59.1.ebuild
index b7672155a23c..0ccc98b05c11 100644
--- a/dev-python/logilab-common/logilab-common-0.59.1.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.59.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.59.1.ebuild,v 1.4 2013/06/26 01:34:35 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.1.ebuild,v 1.5 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
 # broken with python3.3, bug #449276
-PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/logilab-common/logilab-common-0.60.0.ebuild b/dev-python/logilab-common/logilab-common-0.60.0.ebuild
index 0dd4825530d8..798e22ec4b69 100644
--- a/dev-python/logilab-common/logilab-common-0.60.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.60.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 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.60.0.ebuild,v 1.2 2013/09/02 17:31:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.60.0.ebuild,v 1.3 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
 
 # 0.60.0 fails unittest_umessage with python3.3
 # http://www.logilab.org/ticket/149345
-PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1 eutils
 
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 ab93c939d938..b6c491b6d863 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,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/07/15 08:48:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild,v 1.2 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild b/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild
index f88dfc7c0f73..0f1a28760172 100644
--- a/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild
+++ b/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild,v 1.3 2013/08/14 11:21:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lp_solve/lp_solve-5.5.2.0-r1.ebuild,v 1.4 2013/09/05 18:46:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/lxml/lxml-3.0.1.ebuild b/dev-python/lxml/lxml-3.0.1.ebuild
index bd7e97d1a587..1bdd08ea4704 100644
--- a/dev-python/lxml/lxml-3.0.1.ebuild
+++ b/dev-python/lxml/lxml-3.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.13 2013/02/02 22:00:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.0.1.ebuild,v 1.14 2013/09/05 18:46:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lxml/lxml-3.1.0.ebuild b/dev-python/lxml/lxml-3.1.0.ebuild
index 19f61beb9b6c..a83e3d73fd4b 100644
--- a/dev-python/lxml/lxml-3.1.0.ebuild
+++ b/dev-python/lxml/lxml-3.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.0.ebuild,v 1.1 2013/02/13 03:30:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.0.ebuild,v 1.2 2013/09/05 18:46:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lxml/lxml-3.1.1.ebuild b/dev-python/lxml/lxml-3.1.1.ebuild
index de6d9ab54523..f8fd56730627 100644
--- a/dev-python/lxml/lxml-3.1.1.ebuild
+++ b/dev-python/lxml/lxml-3.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.1.ebuild,v 1.1 2013/04/07 00:40:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.1.ebuild,v 1.2 2013/09/05 18:46:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lxml/lxml-3.1.2.ebuild b/dev-python/lxml/lxml-3.1.2.ebuild
index d205d5b25957..28c84bef57da 100644
--- a/dev-python/lxml/lxml-3.1.2.ebuild
+++ b/dev-python/lxml/lxml-3.1.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.2.ebuild,v 1.1 2013/04/12 07:07:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.1.2.ebuild,v 1.2 2013/09/05 18:46:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lxml/lxml-3.2.0.ebuild b/dev-python/lxml/lxml-3.2.0.ebuild
index 6e8c4a4e758f..5179443845b4 100644
--- a/dev-python/lxml/lxml-3.2.0.ebuild
+++ b/dev-python/lxml/lxml-3.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.5 2013/05/22 21:40:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.6 2013/09/05 18:46:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/lxml/lxml-3.2.1.ebuild b/dev-python/lxml/lxml-3.2.1.ebuild
index 3fef9d6ccca7..8eb27319291f 100644
--- a/dev-python/lxml/lxml-3.2.1.ebuild
+++ b/dev-python/lxml/lxml-3.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.11 2013/09/02 12:11:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.12 2013/09/05 14:18:30 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -22,7 +22,6 @@ RDEPEND=">=dev-libs/libxml2-2.7.2
 	beautifulsoup3? (
 		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
 		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
-		python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] )
 		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
 		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
 	)"
diff --git a/dev-python/m2crypto/m2crypto-0.21.1-r1.ebuild b/dev-python/m2crypto/m2crypto-0.21.1-r1.ebuild
index 238f1b5b375e..6d71c6f9dd1e 100644
--- a/dev-python/m2crypto/m2crypto-0.21.1-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.21.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r1.ebuild,v 1.1 2013/02/15 22:19:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r1.ebuild,v 1.2 2013/09/05 18:46:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
index d6cf5e84a34e..1daa0a1c7a90 100644
--- a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
+++ b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/07/08 13:26:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2secret/m2secret-0.1.1-r1.ebuild,v 1.2 2013/09/05 18:47:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mako/mako-0.7.3-r1.ebuild b/dev-python/mako/mako-0.7.3-r1.ebuild
index 3d56f3103405..6935364f8018 100644
--- a/dev-python/mako/mako-0.7.3-r1.ebuild
+++ b/dev-python/mako/mako-0.7.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1998-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-0.7.3-r1.ebuild,v 1.8 2013/09/02 12:10:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-0.7.3-r1.ebuild,v 1.9 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/manifestdestiny/manifestdestiny-0.5.6-r1.ebuild b/dev-python/manifestdestiny/manifestdestiny-0.5.6-r1.ebuild
index 91add396778b..e8d6fbd503d3 100644
--- a/dev-python/manifestdestiny/manifestdestiny-0.5.6-r1.ebuild
+++ b/dev-python/manifestdestiny/manifestdestiny-0.5.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/manifestdestiny/manifestdestiny-0.5.6-r1.ebuild,v 1.1 2013/07/08 15:18:20 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/manifestdestiny/manifestdestiny-0.5.6-r1.ebuild,v 1.2 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7}  pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7}  pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/manuel/manuel-1.7.1.ebuild b/dev-python/manuel/manuel-1.7.1.ebuild
index 1d0c2ccfac21..d6725a165a10 100644
--- a/dev-python/manuel/manuel-1.7.1.ebuild
+++ b/dev-python/manuel/manuel-1.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.4 2013/07/08 15:58:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/manuel/manuel-1.7.1.ebuild,v 1.5 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} python{3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_{6,7} python{3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/markdown/markdown-2.2.1-r1.ebuild b/dev-python/markdown/markdown-2.2.1-r1.ebuild
index 18578f0fa84b..aac89fdd70c2 100644
--- a/dev-python/markdown/markdown-2.2.1-r1.ebuild
+++ b/dev-python/markdown/markdown-2.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.2.1-r1.ebuild,v 1.8 2013/06/05 02:46:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.2.1-r1.ebuild,v 1.9 2013/09/05 18:46:34 mgorny Exp $
 
 EAPI=5
 # python3.3 because of dev-python/pygments
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/markdown-2.3.1.ebuild b/dev-python/markdown/markdown-2.3.1.ebuild
index 29281f336e83..9917f98ecdfe 100644
--- a/dev-python/markdown/markdown-2.3.1.ebuild
+++ b/dev-python/markdown/markdown-2.3.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.3.1.ebuild,v 1.4 2013/06/06 03:04:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.3.1.ebuild,v 1.5 2013/09/05 18:46:34 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/markdown-2.3.ebuild b/dev-python/markdown/markdown-2.3.ebuild
index 64443342932f..35b5eb810574 100644
--- a/dev-python/markdown/markdown-2.3.ebuild
+++ b/dev-python/markdown/markdown-2.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.3.ebuild,v 1.2 2013/06/05 02:46:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.3.ebuild,v 1.3 2013/09/05 18:46:34 mgorny Exp $
 
 EAPI=5
 # python3.3 because of dev-python/pygments
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown2/markdown2-2.1.0-r1.ebuild b/dev-python/markdown2/markdown2-2.1.0-r1.ebuild
index f1053f0fe1ce..99ce3be681f3 100644
--- a/dev-python/markdown2/markdown2-2.1.0-r1.ebuild
+++ b/dev-python/markdown2/markdown2-2.1.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown2/markdown2-2.1.0-r1.ebuild,v 1.1 2013/02/02 12:22:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown2/markdown2-2.1.0-r1.ebuild,v 1.2 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markupsafe/markupsafe-0.15-r1.ebuild b/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
index 4c6430a4b92c..e25641002da7 100644
--- a/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.15-r1.ebuild,v 1.14 2013/09/02 11:22:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.15-r1.ebuild,v 1.15 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 MY_PN="MarkupSafe"
diff --git a/dev-python/markupsafe/markupsafe-0.18.ebuild b/dev-python/markupsafe/markupsafe-0.18.ebuild
index b54ba6377a33..9653734d1eb8 100644
--- a/dev-python/markupsafe/markupsafe-0.18.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.18.ebuild,v 1.2 2013/08/07 11:21:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.18.ebuild,v 1.3 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 MY_PN="MarkupSafe"
diff --git a/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild b/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild
index 50d6c19629ae..3b5669acef72 100644
--- a/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild,v 1.12 2013/06/09 17:47:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild,v 1.13 2013/09/05 18:46:20 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='tk?'
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/matplotlib/matplotlib-1.2.1.ebuild b/dev-python/matplotlib/matplotlib-1.2.1.ebuild
index 18d09823cf7d..9062a13386ae 100644
--- a/dev-python/matplotlib/matplotlib-1.2.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.1.ebuild,v 1.4 2013/06/09 17:47:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.1.ebuild,v 1.5 2013/09/05 18:46:20 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='tk?'
 
 inherit distutils-r1 eutils flag-o-matic
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index 824272679c33..acf88b5a2d66 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mccabe/mccabe-0.2.1.ebuild,v 1.3 2013/08/28 11:15:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mccabe/mccabe-0.2.1.ebuild,v 1.4 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mecab-python/mecab-python-0.996.ebuild b/dev-python/mecab-python/mecab-python-0.996.ebuild
index 98e22408e94c..a24dfe8c3150 100644
--- a/dev-python/mecab-python/mecab-python-0.996.ebuild
+++ b/dev-python/mecab-python/mecab-python-0.996.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mecab-python/mecab-python-0.996.ebuild,v 1.3 2013/08/03 09:09:07 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mecab-python/mecab-python-0.996.ebuild,v 1.4 2013/09/05 18:46:40 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
index 90997b67f113..ab62b8b8e12b 100644
--- a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
+++ b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mechanize/mechanize-0.2.5-r1.ebuild,v 1.1 2013/07/19 11:58:10 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mechanize/mechanize-0.2.5-r1.ebuild,v 1.2 2013/09/05 18:46:19 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
index 7972922ac2dc..dfdcc365e782 100644
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/medusa/medusa-0.5.4-r1.ebuild,v 1.1 2013/06/08 19:03:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/medusa/medusa-0.5.4-r1.ebuild,v 1.2 2013/09/05 18:46:15 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/meld3/meld3-0.6.10-r1.ebuild b/dev-python/meld3/meld3-0.6.10-r1.ebuild
index 5dbcd1c5bacc..53544896f624 100644
--- a/dev-python/meld3/meld3-0.6.10-r1.ebuild
+++ b/dev-python/meld3/meld3-0.6.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.10-r1.ebuild,v 1.1 2013/06/05 09:53:23 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.10-r1.ebuild,v 1.2 2013/09/05 18:46:02 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/meld3/meld3-0.6.9-r1.ebuild b/dev-python/meld3/meld3-0.6.9-r1.ebuild
index 600108ef997c..6567aa8a9363 100644
--- a/dev-python/meld3/meld3-0.6.9-r1.ebuild
+++ b/dev-python/meld3/meld3-0.6.9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.9-r1.ebuild,v 1.1 2013/07/19 12:24:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.9-r1.ebuild,v 1.2 2013/09/05 18:46:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mimeparse/mimeparse-0.1.3-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.3-r1.ebuild
index a63bd7d79998..5e2aefb57cf2 100644
--- a/dev-python/mimeparse/mimeparse-0.1.3-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mimeparse/mimeparse-0.1.3-r1.ebuild,v 1.7 2013/07/10 14:55:42 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mimeparse/mimeparse-0.1.3-r1.ebuild,v 1.8 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
index 41dee78d1dde..b69e5a9f569b 100644
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild,v 1.7 2013/07/13 11:44:18 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild,v 1.8 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild b/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild
index adb9a108ff39..ade73fbfd13b 100644
--- a/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild,v 1.4 2012/12/17 19:58:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/miniupnpc/miniupnpc-1.7-r1.ebuild,v 1.5 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=(python2_6 python2_7 pypy1_9)
+PYTHON_COMPAT=(python2_6 python2_7)
 
 inherit distutils-r1
 
diff --git a/dev-python/miniupnpc/miniupnpc-1.8.ebuild b/dev-python/miniupnpc/miniupnpc-1.8.ebuild
index ebe0c2b13351..0b44366cac7b 100644
--- a/dev-python/miniupnpc/miniupnpc-1.8.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-1.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/miniupnpc/miniupnpc-1.8.ebuild,v 1.2 2013/08/07 09:52:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/miniupnpc/miniupnpc-1.8.ebuild,v 1.3 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=(python2_6 python2_7 pypy1_9 pypy2_0)
+PYTHON_COMPAT=(python2_6 python2_7 pypy2_0)
 
 inherit distutils-r1
 
diff --git a/dev-python/mock/mock-1.0.1-r1.ebuild b/dev-python/mock/mock-1.0.1-r1.ebuild
index 68cb0b743e5c..d0a8ca699c21 100644
--- a/dev-python/mock/mock-1.0.1-r1.ebuild
+++ b/dev-python/mock/mock-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r1.ebuild,v 1.13 2013/05/20 17:55:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r1.ebuild,v 1.14 2013/09/05 18:46:26 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mocker/mocker-1.1.1-r1.ebuild b/dev-python/mocker/mocker-1.1.1-r1.ebuild
index 55aad9a93d30..e6d46c533742 100644
--- a/dev-python/mocker/mocker-1.1.1-r1.ebuild
+++ b/dev-python/mocker/mocker-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/07/20 09:30:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mocker/mocker-1.1.1-r1.ebuild,v 1.2 2013/09/05 18:46:39 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
index 278f0361c769..a9c11878727e 100644
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ b/dev-python/mox/mox-0.5.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mox/mox-0.5.3-r1.ebuild,v 1.4 2013/05/20 12:43:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mox/mox-0.5.3-r1.ebuild,v 1.5 2013/09/05 18:47:01 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mozfile/mozfile-0.9.ebuild b/dev-python/mozfile/mozfile-0.9.ebuild
index bd13e50191f0..4eae926f2c85 100644
--- a/dev-python/mozfile/mozfile-0.9.ebuild
+++ b/dev-python/mozfile/mozfile-0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozfile/mozfile-0.9.ebuild,v 1.1 2013/07/23 11:44:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozfile/mozfile-0.9.ebuild,v 1.2 2013/09/05 18:47:04 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mozinfo/mozinfo-0.5-r1.ebuild b/dev-python/mozinfo/mozinfo-0.5-r1.ebuild
index acae634be961..e6a2b2844cc9 100644
--- a/dev-python/mozinfo/mozinfo-0.5-r1.ebuild
+++ b/dev-python/mozinfo/mozinfo-0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozinfo/mozinfo-0.5-r1.ebuild,v 1.1 2013/07/22 05:49:05 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozinfo/mozinfo-0.5-r1.ebuild,v 1.2 2013/09/05 18:46:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mozprocess/mozprocess-0.11-r1.ebuild b/dev-python/mozprocess/mozprocess-0.11-r1.ebuild
index 98b68088b070..df38cd0476f9 100644
--- a/dev-python/mozprocess/mozprocess-0.11-r1.ebuild
+++ b/dev-python/mozprocess/mozprocess-0.11-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozprocess/mozprocess-0.11-r1.ebuild,v 1.1 2013/07/22 06:02:25 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozprocess/mozprocess-0.11-r1.ebuild,v 1.2 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mozprofile/mozprofile-0.11-r1.ebuild b/dev-python/mozprofile/mozprofile-0.11-r1.ebuild
index acb576f01830..16e677f5c247 100644
--- a/dev-python/mozprofile/mozprofile-0.11-r1.ebuild
+++ b/dev-python/mozprofile/mozprofile-0.11-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozprofile/mozprofile-0.11-r1.ebuild,v 1.3 2013/08/07 16:39:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozprofile/mozprofile-0.11-r1.ebuild,v 1.4 2013/09/05 18:47:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/mozprofile/mozprofile-0.12.ebuild b/dev-python/mozprofile/mozprofile-0.12.ebuild
index ac8d6d8b9b1c..0e78a8b411e8 100644
--- a/dev-python/mozprofile/mozprofile-0.12.ebuild
+++ b/dev-python/mozprofile/mozprofile-0.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozprofile/mozprofile-0.12.ebuild,v 1.1 2013/08/10 09:45:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozprofile/mozprofile-0.12.ebuild,v 1.2 2013/09/05 18:47:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/mozrunner/mozrunner-5.18-r1.ebuild b/dev-python/mozrunner/mozrunner-5.18-r1.ebuild
index c9e0bae8b584..a0aa042eb941 100644
--- a/dev-python/mozrunner/mozrunner-5.18-r1.ebuild
+++ b/dev-python/mozrunner/mozrunner-5.18-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.18-r1.ebuild,v 1.1 2013/07/23 11:54:39 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.18-r1.ebuild,v 1.2 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mozrunner/mozrunner-5.23.ebuild b/dev-python/mozrunner/mozrunner-5.23.ebuild
index cdb3c9a6c9a0..8cbb91c4bb10 100644
--- a/dev-python/mozrunner/mozrunner-5.23.ebuild
+++ b/dev-python/mozrunner/mozrunner-5.23.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.23.ebuild,v 1.1 2013/08/10 12:56:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.23.ebuild,v 1.2 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mozrunner/mozrunner-5.24.ebuild b/dev-python/mozrunner/mozrunner-5.24.ebuild
index 605683747178..e056c5b6f1da 100644
--- a/dev-python/mozrunner/mozrunner-5.24.ebuild
+++ b/dev-python/mozrunner/mozrunner-5.24.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.24.ebuild,v 1.1 2013/09/02 08:55:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mozrunner/mozrunner-5.24.ebuild,v 1.2 2013/09/05 18:46:27 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mpi4py/mpi4py-1.3-r1.ebuild b/dev-python/mpi4py/mpi4py-1.3-r1.ebuild
index 3b0bb722d5eb..f1e84bda69ba 100644
--- a/dev-python/mpi4py/mpi4py-1.3-r1.ebuild
+++ b/dev-python/mpi4py/mpi4py-1.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpi4py/mpi4py-1.3-r1.ebuild,v 1.1 2013/07/26 10:00:09 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpi4py/mpi4py-1.3-r1.ebuild,v 1.2 2013/09/05 18:47:18 mgorny Exp $
 
 EAPI=5
 # README.txt excludes 3.3, absent tox.ini includes 3.3, tests fail py3.3
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mpmath/mpmath-0.17-r1.ebuild b/dev-python/mpmath/mpmath-0.17-r1.ebuild
index 806b0824a878..a625e7643bac 100644
--- a/dev-python/mpmath/mpmath-0.17-r1.ebuild
+++ b/dev-python/mpmath/mpmath-0.17-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.17-r1.ebuild,v 1.1 2013/07/18 15:18:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.17-r1.ebuild,v 1.2 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1 eutils # virtualx
 
diff --git a/dev-python/mpmath/mpmath-0.17.ebuild b/dev-python/mpmath/mpmath-0.17.ebuild
index f175ee22b5a1..4fb15385506f 100644
--- a/dev-python/mpmath/mpmath-0.17.ebuild
+++ b/dev-python/mpmath/mpmath-0.17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.17.ebuild,v 1.8 2013/01/18 13:34:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpmath/mpmath-0.17.ebuild,v 1.9 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1 eutils # virtualx
 
diff --git a/dev-python/msgpack/msgpack-0.2.4.ebuild b/dev-python/msgpack/msgpack-0.2.4.ebuild
index f20720f4dd0e..87eefef84cf0 100644
--- a/dev-python/msgpack/msgpack-0.2.4.ebuild
+++ b/dev-python/msgpack/msgpack-0.2.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.2.4.ebuild,v 1.2 2013/01/13 12:42:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.2.4.ebuild,v 1.3 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/msgpack/msgpack-0.3.0.ebuild b/dev-python/msgpack/msgpack-0.3.0.ebuild
index 0d64f6ad68a8..a1bbe5d5c44d 100644
--- a/dev-python/msgpack/msgpack-0.3.0.ebuild
+++ b/dev-python/msgpack/msgpack-0.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.3.0.ebuild,v 1.3 2013/05/10 04:54:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.3.0.ebuild,v 1.4 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
index 366a044f2997..bf27444680e4 100644
--- a/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/03/09 15:47:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mygpoclient/mygpoclient-1.7-r1.ebuild,v 1.2 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
index c18f5bcf676c..4eaed7b993b6 100644
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild,v 1.4 2013/02/24 12:14:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild,v 1.5 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/netifaces/netifaces-0.8-r1.ebuild b/dev-python/netifaces/netifaces-0.8-r1.ebuild
index 338b93af5c08..f16713559b43 100644
--- a/dev-python/netifaces/netifaces-0.8-r1.ebuild
+++ b/dev-python/netifaces/netifaces-0.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/netifaces/netifaces-0.8-r1.ebuild,v 1.1 2013/06/17 06:29:38 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/netifaces/netifaces-0.8-r1.ebuild,v 1.2 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
index 04221b02eb5b..4e1cf919d4da 100644
--- a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
+++ b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild,v 1.1 2013/04/22 14:12:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild,v 1.2 2013/09/05 18:46:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
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 f1a9e62b8450..fe4041d5a642 100644
--- a/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.2 2013/07/27 08:37:43 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-exclude/nose-exclude-0.1.9.ebuild,v 1.3 2013/09/05 18:46:52 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose/nose-1.1.2-r1.ebuild b/dev-python/nose/nose-1.1.2-r1.ebuild
index 7784d9996020..5d19078806ad 100644
--- a/dev-python/nose/nose-1.1.2-r1.ebuild
+++ b/dev-python/nose/nose-1.1.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.2-r1.ebuild,v 1.16 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.2-r1.ebuild,v 1.17 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
diff --git a/dev-python/nose/nose-1.2.1.ebuild b/dev-python/nose/nose-1.2.1.ebuild
index e17df633e9c4..73f6083b24a5 100644
--- a/dev-python/nose/nose-1.2.1.ebuild
+++ b/dev-python/nose/nose-1.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1.ebuild,v 1.5 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1.ebuild,v 1.6 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
diff --git a/dev-python/nose/nose-1.2.1_p2012.ebuild b/dev-python/nose/nose-1.2.1_p2012.ebuild
index 69b12f4c9740..ba32db052183 100644
--- a/dev-python/nose/nose-1.2.1_p2012.ebuild
+++ b/dev-python/nose/nose-1.2.1_p2012.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1_p2012.ebuild,v 1.4 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1_p2012.ebuild,v 1.5 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1 eutils vcs-snapshot
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
diff --git a/dev-python/nose/nose-1.3.0.ebuild b/dev-python/nose/nose-1.3.0.ebuild
index adea9a2efd08..6da637c1d5f7 100644
--- a/dev-python/nose/nose-1.3.0.ebuild
+++ b/dev-python/nose/nose-1.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.0.ebuild,v 1.16 2013/08/18 07:50:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.0.ebuild,v 1.17 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index dc551390776b..9b75e7248ec1 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-9999.ebuild,v 1.5 2013/08/18 07:50:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-9999.ebuild,v 1.6 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://github.com/nose-devs/${PN}.git
 inherit git-2
 #endif
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
diff --git a/dev-python/nosehtmloutput/nosehtmloutput-0.0.4-r1.ebuild b/dev-python/nosehtmloutput/nosehtmloutput-0.0.4-r1.ebuild
index 137fe81d141f..c7d82eca212b 100644
--- a/dev-python/nosehtmloutput/nosehtmloutput-0.0.4-r1.ebuild
+++ b/dev-python/nosehtmloutput/nosehtmloutput-0.0.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nosehtmloutput/nosehtmloutput-0.0.4-r1.ebuild,v 1.3 2013/07/27 17:03:16 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nosehtmloutput/nosehtmloutput-0.0.4-r1.ebuild,v 1.4 2013/09/05 18:47:18 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild
index abcaad391a6b..b4f609068533 100644
--- a/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild,v 1.1 2013/06/18 06:50:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild,v 1.2 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/nosexcover-1.0.8.ebuild b/dev-python/nosexcover/nosexcover-1.0.8.ebuild
index 761a5d42dd8e..1add5f6f0529 100644
--- a/dev-python/nosexcover/nosexcover-1.0.8.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.8.ebuild,v 1.1 2013/06/18 06:50:45 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.8.ebuild,v 1.2 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild b/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
index c862238bf346..3229abded8ab 100644
--- a/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
+++ b/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild,v 1.1 2013/07/28 10:24:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild,v 1.2 2013/09/05 18:46:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/numpy/numpy-1.6.2-r2.ebuild b/dev-python/numpy/numpy-1.6.2-r2.ebuild
index 2d32a078b080..e0e2fdc35c61 100644
--- a/dev-python/numpy/numpy-1.6.2-r2.ebuild
+++ b/dev-python/numpy/numpy-1.6.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.16 2013/03/10 16:20:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2-r2.ebuild,v 1.17 2013/09/05 18:46:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/numpy/numpy-1.7.1.ebuild b/dev-python/numpy/numpy-1.7.1.ebuild
index 60faf1d3ee9e..29fd1911b47c 100644
--- a/dev-python/numpy/numpy-1.7.1.ebuild
+++ b/dev-python/numpy/numpy-1.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild,v 1.2 2013/08/27 18:29:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.7.1.ebuild,v 1.3 2013/09/05 18:46:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 FORTRAN_NEEDED=lapack
 
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
index a829531770f4..6ac63307cf00 100644
--- a/dev-python/oauth/oauth-1.0.1-r1.ebuild
+++ b/dev-python/oauth/oauth-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/06/29 12:25:59 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth/oauth-1.0.1-r1.ebuild,v 1.2 2013/09/05 18:46:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2/oauth2-1.5.211-r1.ebuild b/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
index 8e99ec8c1e6a..4be5c9d34591 100644
--- a/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/05/09 23:14:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2/oauth2-1.5.211-r1.ebuild,v 1.2 2013/09/05 18:47:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.3.6.ebuild b/dev-python/oauthlib/oauthlib-0.3.6.ebuild
index fb4e12022e94..c811df090fb6 100644
--- a/dev-python/oauthlib/oauthlib-0.3.6.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.3.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.6.ebuild,v 1.1 2013/02/06 06:53:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.6.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.3.7.ebuild b/dev-python/oauthlib/oauthlib-0.3.7.ebuild
index 565fa928c516..74c42d2a05b5 100644
--- a/dev-python/oauthlib/oauthlib-0.3.7.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.3.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.7.ebuild,v 1.1 2013/02/12 09:53:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.7.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.3.8.ebuild b/dev-python/oauthlib/oauthlib-0.3.8.ebuild
index 90a043c5a55e..2a0c6e27bb2d 100644
--- a/dev-python/oauthlib/oauthlib-0.3.8.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.3.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.8.ebuild,v 1.1 2013/03/06 03:39:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.3.8.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.4.0.ebuild b/dev-python/oauthlib/oauthlib-0.4.0.ebuild
index b5fd1cb99931..3d2864ae08db 100644
--- a/dev-python/oauthlib/oauthlib-0.4.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.4.0.ebuild,v 1.1 2013/03/28 06:31:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.4.0.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.4.1.ebuild b/dev-python/oauthlib/oauthlib-0.4.1.ebuild
index f8bfc2a4f3da..73442806064e 100644
--- a/dev-python/oauthlib/oauthlib-0.4.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.4.1.ebuild,v 1.1 2013/05/22 07:02:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.4.1.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.4.2.ebuild b/dev-python/oauthlib/oauthlib-0.4.2.ebuild
index 5c9913ab5112..901e72c5853b 100644
--- a/dev-python/oauthlib/oauthlib-0.4.2.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.4.2.ebuild,v 1.1 2013/06/06 03:27:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.4.2.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.5.0.ebuild b/dev-python/oauthlib/oauthlib-0.5.0.ebuild
index 60c7afd8f7d3..1e7a2b58dc71 100644
--- a/dev-python/oauthlib/oauthlib-0.5.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.5.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.5.0.ebuild,v 1.1 2013/07/09 18:22:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.5.0.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-0.5.1.ebuild b/dev-python/oauthlib/oauthlib-0.5.1.ebuild
index 5087660dfc35..06beafeace41 100644
--- a/dev-python/oauthlib/oauthlib-0.5.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.5.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.5.1.ebuild,v 1.1 2013/07/31 22:05:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.5.1.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openpyxl/openpyxl-1.6.2.ebuild b/dev-python/openpyxl/openpyxl-1.6.2.ebuild
index ce9ffd2100c8..1fd24cfe58a2 100644
--- a/dev-python/openpyxl/openpyxl-1.6.2.ebuild
+++ b/dev-python/openpyxl/openpyxl-1.6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-1.6.2.ebuild,v 1.1 2013/05/04 10:50:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/openpyxl/openpyxl-1.6.2.ebuild,v 1.2 2013/09/05 18:47:02 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
index b370deaf7e42..1a61d7f40972 100644
--- a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
+++ b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/optcomplete/optcomplete-1.2-r1.ebuild,v 1.1 2013/07/28 14:36:55 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optcomplete/optcomplete-1.2-r1.ebuild,v 1.2 2013/09/05 18:46:53 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/paramiko-1.10.0.ebuild b/dev-python/paramiko/paramiko-1.10.0.ebuild
index a372a1bbf957..b2e8f5433e6c 100644
--- a/dev-python/paramiko/paramiko-1.10.0.ebuild
+++ b/dev-python/paramiko/paramiko-1.10.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.10.0.ebuild,v 1.1 2013/03/02 06:20:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.10.0.ebuild,v 1.2 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/paramiko-1.10.1.ebuild b/dev-python/paramiko/paramiko-1.10.1.ebuild
index 65c5e867d9b2..a15c1f266a67 100644
--- a/dev-python/paramiko/paramiko-1.10.1.ebuild
+++ b/dev-python/paramiko/paramiko-1.10.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.10.1.ebuild,v 1.13 2013/07/29 07:16:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.10.1.ebuild,v 1.14 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramiko/paramiko-1.9.0-r1.ebuild b/dev-python/paramiko/paramiko-1.9.0-r1.ebuild
index c0363012fe73..75ef451376d1 100644
--- a/dev-python/paramiko/paramiko-1.9.0-r1.ebuild
+++ b/dev-python/paramiko/paramiko-1.9.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.9.0-r1.ebuild,v 1.2 2013/02/21 03:45:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.9.0-r1.ebuild,v 1.3 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/passlib/passlib-1.6.1.ebuild b/dev-python/passlib/passlib-1.6.1.ebuild
index f3e6c1ab0644..a15f98d11b00 100644
--- a/dev-python/passlib/passlib-1.6.1.ebuild
+++ b/dev-python/passlib/passlib-1.6.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/passlib-1.6.1.ebuild,v 1.3 2013/02/12 13:17:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/passlib/passlib-1.6.1.ebuild,v 1.4 2013/09/05 18:46:43 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
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 2e2c657cab16..11fed12c7cb0 100644
--- a/dev-python/paste/paste-1.7.5.1-r1.ebuild
+++ b/dev-python/paste/paste-1.7.5.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.4 2013/03/20 21:24:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-1.7.5.1-r1.ebuild,v 1.5 2013/09/05 18:46:46 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild
index 1da8a140d32b..d80d0c269ff3 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild,v 1.1 2013/02/12 23:48:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.5.0-r1.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paver/paver-1.1.1-r1.ebuild b/dev-python/paver/paver-1.1.1-r1.ebuild
index b73c0094a48c..553398aa2fe5 100644
--- a/dev-python/paver/paver-1.1.1-r1.ebuild
+++ b/dev-python/paver/paver-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.1.1-r1.ebuild,v 1.5 2013/05/20 08:38:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.1.1-r1.ebuild,v 1.6 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 # Trivial test fail under pypy:
 # https://github.com/paver/paver/pull/88
 
diff --git a/dev-python/paver/paver-1.2.0.ebuild b/dev-python/paver/paver-1.2.0.ebuild
index 50f6740f2f8f..b6cc07200a07 100644
--- a/dev-python/paver/paver-1.2.0.ebuild
+++ b/dev-python/paver/paver-1.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.2.0.ebuild,v 1.3 2013/04/22 06:45:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.2.0.ebuild,v 1.4 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/paver/paver-1.2.1.ebuild b/dev-python/paver/paver-1.2.1.ebuild
index 0a0ed00dd1a5..e93f08188d43 100644
--- a/dev-python/paver/paver-1.2.1.ebuild
+++ b/dev-python/paver/paver-1.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.2.1.ebuild,v 1.2 2013/07/29 07:30:17 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.2.1.ebuild,v 1.3 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pdfrw/pdfrw-0.1.ebuild b/dev-python/pdfrw/pdfrw-0.1.ebuild
index 49977c9b2aaa..8a06c8b16da5 100644
--- a/dev-python/pdfrw/pdfrw-0.1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pdfrw/pdfrw-0.1.ebuild,v 1.2 2013/06/26 15:53:29 yac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pdfrw/pdfrw-0.1.ebuild,v 1.3 2013/09/05 18:47:00 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/peak-rules/peak-rules-0.5.ebuild b/dev-python/peak-rules/peak-rules-0.5.ebuild
index c5e20620a6c1..ed9aef6980f6 100644
--- a/dev-python/peak-rules/peak-rules-0.5.ebuild
+++ b/dev-python/peak-rules/peak-rules-0.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/peak-rules/peak-rules-0.5.ebuild,v 1.1 2013/04/10 08:27:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/peak-rules/peak-rules-0.5.ebuild,v 1.2 2013/09/05 18:47:07 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/pep8-1.4.5.ebuild b/dev-python/pep8/pep8-1.4.5.ebuild
index 56765997a3ee..658c7923bc2e 100644
--- a/dev-python/pep8/pep8-1.4.5.ebuild
+++ b/dev-python/pep8/pep8-1.4.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.4.5.ebuild,v 1.3 2013/08/28 11:15:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.4.5.ebuild,v 1.4 2013/09/05 18:46:19 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pep8/pep8-1.4.6.ebuild b/dev-python/pep8/pep8-1.4.6.ebuild
index 558e117f717e..1adf9747c7fc 100644
--- a/dev-python/pep8/pep8-1.4.6.ebuild
+++ b/dev-python/pep8/pep8-1.4.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.4.6.ebuild,v 1.1 2013/07/08 06:15:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.4.6.ebuild,v 1.2 2013/09/05 18:46:19 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/peppercorn/peppercorn-0.4-r1.ebuild b/dev-python/peppercorn/peppercorn-0.4-r1.ebuild
index b6087a39ed55..5fe7365c8af3 100644
--- a/dev-python/peppercorn/peppercorn-0.4-r1.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/peppercorn-0.4-r1.ebuild,v 1.1 2013/08/16 11:53:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/peppercorn-0.4-r1.ebuild,v 1.2 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pexpect/pexpect-2.4-r1.ebuild b/dev-python/pexpect/pexpect-2.4-r1.ebuild
index 5f0c7cb076f6..4652a7d993e9 100644
--- a/dev-python/pexpect/pexpect-2.4-r1.ebuild
+++ b/dev-python/pexpect/pexpect-2.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-2.4-r1.ebuild,v 1.2 2013/06/24 07:21:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-2.4-r1.ebuild,v 1.3 2013/09/05 18:46:20 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pgmagick/pgmagick-0.5.6.ebuild b/dev-python/pgmagick/pgmagick-0.5.6.ebuild
index 062eebbfb171..b0a2b7867182 100644
--- a/dev-python/pgmagick/pgmagick-0.5.6.ebuild
+++ b/dev-python/pgmagick/pgmagick-0.5.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pgmagick/pgmagick-0.5.6.ebuild,v 1.1 2013/05/17 08:41:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pgmagick/pgmagick-0.5.6.ebuild,v 1.2 2013/09/05 18:46:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pip/pip-1.3.1.ebuild b/dev-python/pip/pip-1.3.1.ebuild
index b8daf41cd97a..dd4e8c715977 100644
--- a/dev-python/pip/pip-1.3.1.ebuild
+++ b/dev-python/pip/pip-1.3.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.3.1.ebuild,v 1.4 2013/05/03 19:35:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.3.1.ebuild,v 1.5 2013/09/05 18:46:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit bash-completion-r1 distutils-r1 eutils
 
diff --git a/dev-python/pip/pip-1.4.ebuild b/dev-python/pip/pip-1.4.ebuild
index dc203250cfd2..ccf0f68feee7 100644
--- a/dev-python/pip/pip-1.4.ebuild
+++ b/dev-python/pip/pip-1.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.4.ebuild,v 1.2 2013/07/24 14:47:16 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.4.ebuild,v 1.3 2013/09/05 18:46:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit bash-completion-r1 distutils-r1 eutils
 
diff --git a/dev-python/ply/ply-3.4-r1.ebuild b/dev-python/ply/ply-3.4-r1.ebuild
index 8b66045b7b2a..3c38390e1129 100644
--- a/dev-python/ply/ply-3.4-r1.ebuild
+++ b/dev-python/ply/ply-3.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-3.4-r1.ebuild,v 1.2 2013/05/22 02:03:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-3.4-r1.ebuild,v 1.3 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pmw/pmw-1.3.3.ebuild b/dev-python/pmw/pmw-1.3.3.ebuild
index 1f5e3820fcc8..10292097827f 100644
--- a/dev-python/pmw/pmw-1.3.3.ebuild
+++ b/dev-python/pmw/pmw-1.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.3.3.ebuild,v 1.4 2013/05/10 04:57:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.3.3.ebuild,v 1.5 2013/09/05 18:46:47 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1
diff --git a/dev-python/pmw/pmw-2.0.0.ebuild b/dev-python/pmw/pmw-2.0.0.ebuild
index 9bcf89002f37..1bfa2d7693ca 100644
--- a/dev-python/pmw/pmw-2.0.0.ebuild
+++ b/dev-python/pmw/pmw-2.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.ebuild,v 1.4 2013/05/10 04:57:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-2.0.0.ebuild,v 1.5 2013/09/05 18:46:47 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
 PYTHON_REQ_USE="tk"
 
 inherit distutils-r1
diff --git a/dev-python/prettytable/prettytable-0.7.1.ebuild b/dev-python/prettytable/prettytable-0.7.1.ebuild
index 6e344cbb8cec..6493603d4ddb 100644
--- a/dev-python/prettytable/prettytable-0.7.1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.1.ebuild,v 1.1 2013/03/11 00:17:10 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.1.ebuild,v 1.2 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/progressbar/progressbar-2.3-r1.ebuild b/dev-python/progressbar/progressbar-2.3-r1.ebuild
index 28960e77a8bf..ebbcf2a1e414 100644
--- a/dev-python/progressbar/progressbar-2.3-r1.ebuild
+++ b/dev-python/progressbar/progressbar-2.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/progressbar/progressbar-2.3-r1.ebuild,v 1.3 2013/05/25 09:30:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/progressbar/progressbar-2.3-r1.ebuild,v 1.4 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pry/pry-0.2.1-r1.ebuild b/dev-python/pry/pry-0.2.1-r1.ebuild
index fe5b726e1d74..6f56c7c790d8 100644
--- a/dev-python/pry/pry-0.2.1-r1.ebuild
+++ b/dev-python/pry/pry-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pry/pry-0.2.1-r1.ebuild,v 1.1 2013/01/13 23:02:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pry/pry-0.2.1-r1.ebuild,v 1.2 2013/09/05 18:46:47 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-0.7.1.ebuild b/dev-python/psutil/psutil-0.7.1.ebuild
index 9b9ad4104959..c98f0f4b7269 100644
--- a/dev-python/psutil/psutil-0.7.1.ebuild
+++ b/dev-python/psutil/psutil-0.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-0.7.1.ebuild,v 1.3 2013/05/12 18:07:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-0.7.1.ebuild,v 1.4 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-1.0.0.ebuild b/dev-python/psutil/psutil-1.0.0.ebuild
index 6d821941766e..5e9a3224f348 100644
--- a/dev-python/psutil/psutil-1.0.0.ebuild
+++ b/dev-python/psutil/psutil-1.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.0.0.ebuild,v 1.1 2013/07/10 18:34:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.0.0.ebuild,v 1.2 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psutil/psutil-1.0.1.ebuild b/dev-python/psutil/psutil-1.0.1.ebuild
index 31c3595ab29a..41a690e909f9 100644
--- a/dev-python/psutil/psutil-1.0.1.ebuild
+++ b/dev-python/psutil/psutil-1.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.0.1.ebuild,v 1.3 2013/08/12 17:02:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-1.0.1.ebuild,v 1.4 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
index 83d9837c1b35..5126b92421fb 100644
--- a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.3 2013/01/19 11:52:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21-r1.ebuild,v 1.4 2013/09/05 18:46:24 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools-utils python-r1
 
diff --git a/dev-python/psycopg/psycopg-2.4.6-r1.ebuild b/dev-python/psycopg/psycopg-2.4.6-r1.ebuild
index f8169ac543aa..39327ba6568a 100644
--- a/dev-python/psycopg/psycopg-2.4.6-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.4.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.6-r1.ebuild,v 1.4 2013/02/24 12:15:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.6-r1.ebuild,v 1.5 2013/09/05 18:46:24 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.4.6-r2.ebuild b/dev-python/psycopg/psycopg-2.4.6-r2.ebuild
index 9b3bb026eff4..aae3396f0155 100644
--- a/dev-python/psycopg/psycopg-2.4.6-r2.ebuild
+++ b/dev-python/psycopg/psycopg-2.4.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.6-r2.ebuild,v 1.1 2013/03/24 02:17:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.6-r2.ebuild,v 1.2 2013/09/05 18:46:24 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.5.1.ebuild b/dev-python/psycopg/psycopg-2.5.1.ebuild
index b34919907989..ef11ebef54b3 100644
--- a/dev-python/psycopg/psycopg-2.5.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.5.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.1.ebuild,v 1.1 2013/06/25 08:10:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.1.ebuild,v 1.2 2013/09/05 18:46:24 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/psycopg/psycopg-2.5.ebuild b/dev-python/psycopg/psycopg-2.5.ebuild
index 69816f05e82c..a8110cd665e7 100644
--- a/dev-python/psycopg/psycopg-2.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.ebuild,v 1.1 2013/04/08 05:03:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.ebuild,v 1.2 2013/09/05 18:46:24 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pudb/pudb-2012.3-r1.ebuild b/dev-python/pudb/pudb-2012.3-r1.ebuild
index bc11475969b4..2ee3119ee163 100644
--- a/dev-python/pudb/pudb-2012.3-r1.ebuild
+++ b/dev-python/pudb/pudb-2012.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2012.3-r1.ebuild,v 1.1 2013/03/08 22:38:41 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2012.3-r1.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_6 python2_7 python3_1 python3_2 )
+PYTHON_COMPAT=( python2_6 python2_7 python3_2 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pudb/pudb-2013.1.ebuild b/dev-python/pudb/pudb-2013.1.ebuild
index 4a9c1485367c..289cc69a369b 100644
--- a/dev-python/pudb/pudb-2013.1.ebuild
+++ b/dev-python/pudb/pudb-2013.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.1.ebuild,v 1.1 2013/03/18 09:04:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.1.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pudb/pudb-2013.2.ebuild b/dev-python/pudb/pudb-2013.2.ebuild
index 5891a7413207..11706870e500 100644
--- a/dev-python/pudb/pudb-2013.2.ebuild
+++ b/dev-python/pudb/pudb-2013.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.2.ebuild,v 1.1 2013/06/01 08:33:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.2.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pudb/pudb-2013.3.2.ebuild b/dev-python/pudb/pudb-2013.3.2.ebuild
index c5f68266ce59..5d6cdec09ffc 100644
--- a/dev-python/pudb/pudb-2013.3.2.ebuild
+++ b/dev-python/pudb/pudb-2013.3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.3.2.ebuild,v 1.1 2013/06/19 06:51:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.3.2.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pudb/pudb-2013.3.3.ebuild b/dev-python/pudb/pudb-2013.3.3.ebuild
index 97aefaea81d2..031849d9c81c 100644
--- a/dev-python/pudb/pudb-2013.3.3.ebuild
+++ b/dev-python/pudb/pudb-2013.3.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.3.3.ebuild,v 1.1 2013/07/08 07:46:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.3.3.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pudb/pudb-2013.3.4.ebuild b/dev-python/pudb/pudb-2013.3.4.ebuild
index e52991bd9050..f73c4eecc91b 100644
--- a/dev-python/pudb/pudb-2013.3.4.ebuild
+++ b/dev-python/pudb/pudb-2013.3.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.3.4.ebuild,v 1.1 2013/07/22 04:04:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pudb/pudb-2013.3.4.ebuild,v 1.2 2013/09/05 18:46:00 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-1.0.11.ebuild b/dev-python/py-amqp/py-amqp-1.0.11.ebuild
index 6d71347c56b2..c1b1dba27639 100644
--- a/dev-python/py-amqp/py-amqp-1.0.11.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.0.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.0.11.ebuild,v 1.1 2013/04/16 08:21:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.0.11.ebuild,v 1.2 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-1.0.12.ebuild b/dev-python/py-amqp/py-amqp-1.0.12.ebuild
index 288791dcbcce..7ea8a4628cf6 100644
--- a/dev-python/py-amqp/py-amqp-1.0.12.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.0.12.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.0.12.ebuild,v 1.1 2013/06/27 16:16:08 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.0.12.ebuild,v 1.2 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-1.0.13.ebuild b/dev-python/py-amqp/py-amqp-1.0.13.ebuild
index 00f79b7c88b5..40843c521e79 100644
--- a/dev-python/py-amqp/py-amqp-1.0.13.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.0.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.0.13.ebuild,v 1.1 2013/08/10 11:44:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.0.13.ebuild,v 1.2 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-1.0.9.ebuild b/dev-python/py-amqp/py-amqp-1.0.9.ebuild
index a0c645a5f377..9c15d062dd92 100644
--- a/dev-python/py-amqp/py-amqp-1.0.9.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.0.9.ebuild,v 1.2 2013/04/26 16:27:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.0.9.ebuild,v 1.3 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-1.2.1.ebuild b/dev-python/py-amqp/py-amqp-1.2.1.ebuild
index 40c56fa0c074..f21aa7cd2995 100644
--- a/dev-python/py-amqp/py-amqp-1.2.1.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.2.1.ebuild,v 1.1 2013/08/26 02:48:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-amqp/py-amqp-1.2.1.ebuild,v 1.2 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild b/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild
index 07467d282b02..2248d3847f4e 100644
--- a/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild
+++ b/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild,v 1.1 2013/03/02 16:56:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild,v 1.2 2013/09/05 18:46:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py/py-1.4.12-r1.ebuild b/dev-python/py/py-1.4.12-r1.ebuild
index 648dce1442ce..1d14d35bb488 100644
--- a/dev-python/py/py-1.4.12-r1.ebuild
+++ b/dev-python/py/py-1.4.12-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.12-r1.ebuild,v 1.16 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.12-r1.ebuild,v 1.17 2013/09/05 18:46:39 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
diff --git a/dev-python/py/py-1.4.13.ebuild b/dev-python/py/py-1.4.13.ebuild
index 628fbd33c755..9121466f5760 100644
--- a/dev-python/py/py-1.4.13.ebuild
+++ b/dev-python/py/py-1.4.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.16 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.17 2013/09/05 18:46:39 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
diff --git a/dev-python/py/py-1.4.14.ebuild b/dev-python/py/py-1.4.14.ebuild
index 442d6385af86..42de6f6fe4e2 100644
--- a/dev-python/py/py-1.4.14.ebuild
+++ b/dev-python/py/py-1.4.14.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.14.ebuild,v 1.2 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.14.ebuild,v 1.3 2013/09/05 18:46:39 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
diff --git a/dev-python/py/py-1.4.15.ebuild b/dev-python/py/py-1.4.15.ebuild
index 1d5dc31b26cd..4bcce2ababec 100644
--- a/dev-python/py/py-1.4.15.ebuild
+++ b/dev-python/py/py-1.4.15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.15.ebuild,v 1.2 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.15.ebuild,v 1.3 2013/09/05 18:46:39 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
index a987055301b7..51c76d4fc13d 100644
--- a/dev-python/pyGPG/pyGPG-9999.ebuild
+++ b/dev-python/pyGPG/pyGPG-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyGPG/pyGPG-9999.ebuild,v 1.3 2012/12/17 19:36:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyGPG/pyGPG-9999.ebuild,v 1.4 2013/09/05 18:45:58 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_5,2_6,2_7})
+PYTHON_COMPAT=(python{2_6,2_7})
 
 EGIT_MASTER="pyGPG"
 EGIT_BRANCH="master"
diff --git a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
index 67815319ec72..fd98e1a6486a 100644
--- a/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
+++ b/dev-python/pyPdf/pyPdf-1.13-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/pyPdf-1.13-r1.ebuild,v 1.1 2013/06/18 07:18:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/pyPdf-1.13-r1.ebuild,v 1.2 2013/09/05 18:46:48 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r1.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r1.ebuild
index eef024c0c1db..e04a11f6753b 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r1.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsaaudio/pyalsaaudio-0.7-r1.ebuild,v 1.2 2013/05/20 01:24:54 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsaaudio/pyalsaaudio-0.7-r1.ebuild,v 1.3 2013/09/05 18:46:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyamg/pyamg-2.0.5.ebuild b/dev-python/pyamg/pyamg-2.0.5.ebuild
index 9e3ffdf53519..4a3eb82600ca 100644
--- a/dev-python/pyamg/pyamg-2.0.5.ebuild
+++ b/dev-python/pyamg/pyamg-2.0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/pyamg-2.0.5.ebuild,v 1.1 2013/02/07 18:56:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/pyamg-2.0.5.ebuild,v 1.2 2013/09/05 18:46:40 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/pyasn1-0.1.6.ebuild b/dev-python/pyasn1/pyasn1-0.1.6.ebuild
index 537989960e34..bfad160e655a 100644
--- a/dev-python/pyasn1/pyasn1-0.1.6.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1/pyasn1-0.1.6.ebuild,v 1.14 2013/04/02 13:24:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1/pyasn1-0.1.6.ebuild,v 1.15 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyasn1/pyasn1-0.1.7.ebuild b/dev-python/pyasn1/pyasn1-0.1.7.ebuild
index 081234068fa5..4ccb4c6457fc 100644
--- a/dev-python/pyasn1/pyasn1-0.1.7.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.1.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1/pyasn1-0.1.7.ebuild,v 1.1 2013/05/08 02:58:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyasn1/pyasn1-0.1.7.ebuild,v 1.2 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
index bc58758f9f5d..ec9c2f7c205a 100644
--- a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
+++ b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.17 2013/06/30 13:50:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.18 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{6,7} python3_{1,2,3} )
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
 
 inherit eutils python-r1 waf-utils
 
diff --git a/dev-python/pycountry/pycountry-0.14.7-r1.ebuild b/dev-python/pycountry/pycountry-0.14.7-r1.ebuild
index 5d02083e315d..0ccb6fdecab4 100644
--- a/dev-python/pycountry/pycountry-0.14.7-r1.ebuild
+++ b/dev-python/pycountry/pycountry-0.14.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-0.14.7-r1.ebuild,v 1.1 2013/06/12 16:38:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-0.14.7-r1.ebuild,v 1.2 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycountry/pycountry-0.14.8.ebuild b/dev-python/pycountry/pycountry-0.14.8.ebuild
index 684664c480f9..f573b40e1933 100644
--- a/dev-python/pycountry/pycountry-0.14.8.ebuild
+++ b/dev-python/pycountry/pycountry-0.14.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-0.14.8.ebuild,v 1.1 2013/06/18 08:00:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycountry/pycountry-0.14.8.ebuild,v 1.2 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycparser/pycparser-2.09.1-r1.ebuild b/dev-python/pycparser/pycparser-2.09.1-r1.ebuild
index 604262ec398c..5d5816eff361 100644
--- a/dev-python/pycparser/pycparser-2.09.1-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.09.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.09.1-r1.ebuild,v 1.3 2013/05/09 12:19:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.09.1-r1.ebuild,v 1.4 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/pycparser/pycparser-2.10.ebuild b/dev-python/pycparser/pycparser-2.10.ebuild
index 899cc9ec117a..04f9d7443d0d 100644
--- a/dev-python/pycparser/pycparser-2.10.ebuild
+++ b/dev-python/pycparser/pycparser-2.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.10.ebuild,v 1.1 2013/08/03 15:55:38 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.10.ebuild,v 1.2 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/pycrypto/pycrypto-2.6-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6-r2.ebuild
index be301251a8d7..c993ce02bf31 100644
--- a/dev-python/pycrypto/pycrypto-2.6-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6-r2.ebuild,v 1.14 2013/07/02 07:43:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6-r2.ebuild,v 1.15 2013/09/05 18:45:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
index 1b530b5e11d7..c07d93e11e8a 100644
--- a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild,v 1.2 2012/12/21 19:14:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild,v 1.3 2013/09/05 18:47:16 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/pycups/pycups-1.9.63.ebuild b/dev-python/pycups/pycups-1.9.63.ebuild
index 9da57b5223aa..abc9b2ada56b 100644
--- a/dev-python/pycups/pycups-1.9.63.ebuild
+++ b/dev-python/pycups/pycups-1.9.63.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.63.ebuild,v 1.2 2013/08/01 17:10:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.63.ebuild,v 1.3 2013/09/05 18:47:08 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the CUPS API"
diff --git a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
index 668857445626..eb62b1790ab7 100644
--- a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r2.ebuild,v 1.1 2013/02/05 22:37:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r2.ebuild,v 1.2 2013/09/05 18:46:48 mgorny Exp $
 
 EAPI=5
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
index 2cb755dd8116..3c3b659844ba 100644
--- a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.8 2013/09/02 11:12:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.10 2013/09/05 18:46:48 mgorny Exp $
 
 EAPI=5
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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"
+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"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pydns/pydns-2.3.6-r1.ebuild b/dev-python/pydns/pydns-2.3.6-r1.ebuild
index ee9a8099cc68..43f08d9aa324 100644
--- a/dev-python/pydns/pydns-2.3.6-r1.ebuild
+++ b/dev-python/pydns/pydns-2.3.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-2.3.6-r1.ebuild,v 1.3 2013/08/25 02:23:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-2.3.6-r1.ebuild,v 1.4 2013/09/05 18:46:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydns/pydns-3.0.2-r1.ebuild b/dev-python/pydns/pydns-3.0.2-r1.ebuild
index 571191aa5fd9..8af66212cdf2 100644
--- a/dev-python/pydns/pydns-3.0.2-r1.ebuild
+++ b/dev-python/pydns/pydns-3.0.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-3.0.2-r1.ebuild,v 1.2 2013/08/25 02:23:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydns/pydns-3.0.2-r1.ebuild,v 1.3 2013/09/05 18:46:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyev/pyev-0.8.1.ebuild b/dev-python/pyev/pyev-0.8.1.ebuild
index 98f39d5ae966..d8b69303307d 100644
--- a/dev-python/pyev/pyev-0.8.1.ebuild
+++ b/dev-python/pyev/pyev-0.8.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.2 2013/03/17 18:15:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyev/pyev-0.8.1.ebuild,v 1.3 2013/09/05 18:47:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfits/pyfits-3.1.1-r1.ebuild b/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
index 5599a2f72ad1..2180fc52c2fd 100644
--- a/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
+++ b/dev-python/pyfits/pyfits-3.1.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.1-r1.ebuild,v 1.1 2013/04/22 21:50:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.1-r1.ebuild,v 1.2 2013/09/05 18:46:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Provides an interface to FITS formatted files under python"
diff --git a/dev-python/pyfits/pyfits-3.1.2.ebuild b/dev-python/pyfits/pyfits-3.1.2.ebuild
index 44b39daed6ba..f84469a0e2ac 100644
--- a/dev-python/pyfits/pyfits-3.1.2.ebuild
+++ b/dev-python/pyfits/pyfits-3.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.2.ebuild,v 1.1 2013/04/24 19:13:43 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfits/pyfits-3.1.2.ebuild,v 1.2 2013/09/05 18:46:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Provides an interface to FITS formatted files under python"
diff --git a/dev-python/pyflakes/pyflakes-0.7.2.ebuild b/dev-python/pyflakes/pyflakes-0.7.2.ebuild
index 0d890c8f6eb2..208f40c78fcb 100644
--- a/dev-python/pyflakes/pyflakes-0.7.2.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.7.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.7.2.ebuild,v 1.5 2013/08/18 13:28:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.7.2.ebuild,v 1.6 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=(python{2_5,2_6,2_7,3_{2,3}} )
+PYTHON_COMPAT=(python{2_6,2_7,3_{2,3}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflakes/pyflakes-0.7.3.ebuild b/dev-python/pyflakes/pyflakes-0.7.3.ebuild
index e23706f53785..52b8f63427d5 100644
--- a/dev-python/pyflakes/pyflakes-0.7.3.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.7.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.7.3.ebuild,v 1.2 2013/07/03 03:37:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.7.3.ebuild,v 1.3 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=(python{2_5,2_6,2_7,3_{2,3}} )
+PYTHON_COMPAT=(python{2_6,2_7,3_{2,3}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyflann/pyflann-1.8.4.ebuild b/dev-python/pyflann/pyflann-1.8.4.ebuild
index 330a043c3c47..1bf396ad5fdc 100644
--- a/dev-python/pyflann/pyflann-1.8.4.ebuild
+++ b/dev-python/pyflann/pyflann-1.8.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflann/pyflann-1.8.4.ebuild,v 1.2 2013/08/21 22:03:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflann/pyflann-1.8.4.ebuild,v 1.3 2013/09/05 18:47:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild b/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild
index 9749b6042aab..81a90e14d849 100644
--- a/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild,v 1.6 2013/05/20 08:39:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0-r1.ebuild,v 1.7 2013/09/05 18:46:54 mgorny Exp $
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
index 3c2de3ee57cd..6c89644e6806 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.2 2013/07/22 11:54:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.3 2013/09/05 18:47:08 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} pypy2_0 )
+PYTHON_COMPAT=( python2_{6,7} pypy2_0 )
 PYTHON_REQ_USE="ssl(+)"
 # pypy has no spwd.so
 
diff --git a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
index 60a1cc8d77a6..c72326916ac5 100644
--- a/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
+++ b/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild,v 1.8 2013/05/25 07:54:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.9.2_pre20120101-r2.ebuild,v 1.9 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit flag-o-matic distutils-r1 virtualx
 
diff --git a/dev-python/pygeocoder/pygeocoder-1.1.4.ebuild b/dev-python/pygeocoder/pygeocoder-1.1.4.ebuild
index 8e6224866782..13b2a3cdd58d 100644
--- a/dev-python/pygeocoder/pygeocoder-1.1.4.ebuild
+++ b/dev-python/pygeocoder/pygeocoder-1.1.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygeocoder/pygeocoder-1.1.4.ebuild,v 1.1 2013/05/16 03:40:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygeocoder/pygeocoder-1.1.4.ebuild,v 1.2 2013/09/05 18:47:12 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for Google Geocoding API V3"
diff --git a/dev-python/pygit2/pygit2-0.17.3-r1.ebuild b/dev-python/pygit2/pygit2-0.17.3-r1.ebuild
index 04624a8cfe9d..3c558683e31a 100644
--- a/dev-python/pygit2/pygit2-0.17.3-r1.ebuild
+++ b/dev-python/pygit2/pygit2-0.17.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygit2/pygit2-0.17.3-r1.ebuild,v 1.1 2013/01/06 08:36:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygit2/pygit2-0.17.3-r1.ebuild,v 1.2 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/pygit2/pygit2-0.18.1.ebuild b/dev-python/pygit2/pygit2-0.18.1.ebuild
index cda0c5751703..3cad6630ea4f 100644
--- a/dev-python/pygit2/pygit2-0.18.1.ebuild
+++ b/dev-python/pygit2/pygit2-0.18.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygit2/pygit2-0.18.1.ebuild,v 1.1 2013/04/21 06:28:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygit2/pygit2-0.18.1.ebuild,v 1.2 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygit2/pygit2-0.19.0.ebuild b/dev-python/pygit2/pygit2-0.19.0.ebuild
index b599eb7cc306..dfd508c164cb 100644
--- a/dev-python/pygit2/pygit2-0.19.0.ebuild
+++ b/dev-python/pygit2/pygit2-0.19.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygit2/pygit2-0.19.0.ebuild,v 1.1 2013/07/16 09:14:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygit2/pygit2-0.19.0.ebuild,v 1.2 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/pyglet/pyglet-1.1.4-r2.ebuild b/dev-python/pyglet/pyglet-1.1.4-r2.ebuild
index db9cdcbb7aa9..4bc93d6bc312 100644
--- a/dev-python/pyglet/pyglet-1.1.4-r2.ebuild
+++ b/dev-python/pyglet/pyglet-1.1.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyglet/pyglet-1.1.4-r2.ebuild,v 1.1 2013/03/18 12:35:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyglet/pyglet-1.1.4-r2.ebuild,v 1.2 2013/09/05 18:47:02 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygments/pygments-1.5-r1.ebuild b/dev-python/pygments/pygments-1.5-r1.ebuild
index 1777ee3e119a..161c81218186 100644
--- a/dev-python/pygments/pygments-1.5-r1.ebuild
+++ b/dev-python/pygments/pygments-1.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.5-r1.ebuild,v 1.16 2013/03/05 09:14:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.5-r1.ebuild,v 1.17 2013/09/05 18:47:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygments/pygments-1.6.ebuild b/dev-python/pygments/pygments-1.6.ebuild
index cfe4a46245fc..3206eacc298c 100644
--- a/dev-python/pygments/pygments-1.6.ebuild
+++ b/dev-python/pygments/pygments-1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6.ebuild,v 1.13 2013/06/02 08:44:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6.ebuild,v 1.14 2013/09/05 18:47:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygobject/pygobject-3.2.2-r1.ebuild b/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
index 1434ffc39f1d..f60a65d78698 100644
--- a/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.2.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.12 2013/04/10 19:51:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.2.2-r1.ebuild,v 1.13 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit autotools eutils gnome2 python-r1 virtualx
 
diff --git a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
index 80435e3f668e..ad9be5d89e93 100644
--- a/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.4.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.8 2013/09/05 05:54:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.4.2-r1.ebuild,v 1.9 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit autotools eutils gnome2 python-r1 virtualx
 
diff --git a/dev-python/pygobject/pygobject-3.8.3.ebuild b/dev-python/pygobject/pygobject-3.8.3.ebuild
index e755694d4b67..a3ae346eed20 100644
--- a/dev-python/pygobject/pygobject-3.8.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.8.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.8.3.ebuild,v 1.4 2013/09/05 05:54:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.8.3.ebuild,v 1.5 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit autotools eutils gnome2 python-r1 virtualx
 
diff --git a/dev-python/pyh2o/pyh2o-9999.ebuild b/dev-python/pyh2o/pyh2o-9999.ebuild
index e9831ecf2ae4..ba1be59d5d4d 100644
--- a/dev-python/pyh2o/pyh2o-9999.ebuild
+++ b/dev-python/pyh2o/pyh2o-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyh2o/pyh2o-9999.ebuild,v 1.4 2013/08/07 11:21:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyh2o/pyh2o-9999.ebuild,v 1.5 2013/09/05 18:46:08 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
index 59eb6246f0c4..cfaf3201bad0 100644
--- a/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild,v 1.8 2013/05/29 17:18:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild,v 1.9 2013/09/05 18:46:56 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylast/pylast-0.5.11-r1.ebuild b/dev-python/pylast/pylast-0.5.11-r1.ebuild
index e30050b38dc5..758fa789e875 100644
--- a/dev-python/pylast/pylast-0.5.11-r1.ebuild
+++ b/dev-python/pylast/pylast-0.5.11-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylast/pylast-0.5.11-r1.ebuild,v 1.1 2013/06/08 15:45:46 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylast/pylast-0.5.11-r1.ebuild,v 1.2 2013/09/05 18:47:04 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylibmc/pylibmc-1.2.3.ebuild b/dev-python/pylibmc/pylibmc-1.2.3.ebuild
index c665e2e66de2..ca7dde9f36da 100644
--- a/dev-python/pylibmc/pylibmc-1.2.3.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.2.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/pylibmc-1.2.3.ebuild,v 1.2 2013/01/24 12:17:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/pylibmc-1.2.3.ebuild,v 1.3 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
index 38279e272905..a98614fa5036 100644
--- a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
+++ b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylirc/pylirc-0.0.5-r1.ebuild,v 1.1 2013/07/01 08:38:36 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylirc/pylirc-0.0.5-r1.ebuild,v 1.2 2013/09/05 18:46:45 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymongo/pymongo-2.5.2.ebuild b/dev-python/pymongo/pymongo-2.5.2.ebuild
index b22cdc1e1886..bd34fa7ca0bf 100644
--- a/dev-python/pymongo/pymongo-2.5.2.ebuild
+++ b/dev-python/pymongo/pymongo-2.5.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.5.2.ebuild,v 1.1 2013/06/02 16:21:35 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.5.2.ebuild,v 1.2 2013/09/05 18:47:15 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit check-reqs distutils-r1
 
diff --git a/dev-python/pymongo/pymongo-2.6.1.ebuild b/dev-python/pymongo/pymongo-2.6.1.ebuild
index 6603f7d356d4..99f04b60f2c6 100644
--- a/dev-python/pymongo/pymongo-2.6.1.ebuild
+++ b/dev-python/pymongo/pymongo-2.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.6.1.ebuild,v 1.1 2013/09/05 07:12:11 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.6.1.ebuild,v 1.2 2013/09/05 18:47:15 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit check-reqs distutils-r1
 
diff --git a/dev-python/pymountboot/pymountboot-0.2.1.ebuild b/dev-python/pymountboot/pymountboot-0.2.1.ebuild
index fb549758820b..c798c462c313 100644
--- a/dev-python/pymountboot/pymountboot-0.2.1.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/pymountboot-0.2.1.ebuild,v 1.3 2012/12/17 19:59:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/pymountboot-0.2.1.ebuild,v 1.4 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
index d4203bfec3ef..af9d378617d0 100644
--- a/dev-python/pymountboot/pymountboot-0.2.2.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/pymountboot-0.2.2.ebuild,v 1.4 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/pymountboot-0.2.2.ebuild,v 1.5 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index 4ebbf010dbee..ceb5835430f0 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/pymountboot-9999.ebuild,v 1.4 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymountboot/pymountboot-9999.ebuild,v 1.5 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
index dcffc89d7ab1..1df801b90461 100644
--- a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymssql/pymssql-1.0.2-r1.ebuild,v 1.9 2013/09/05 10:47:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymssql/pymssql-1.0.2-r1.ebuild,v 1.10 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
index f295e424dfbb..68aa6ab1a030 100644
--- a/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
+++ b/dev-python/pynzb/pynzb-0.1.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/02/10 02:24:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pynzb/pynzb-0.1.0-r1.ebuild,v 1.2 2013/09/05 18:46:56 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyogg/pyogg-1.3-r2.ebuild b/dev-python/pyogg/pyogg-1.3-r2.ebuild
index e278abbbdf3a..a38286658b2b 100644
--- a/dev-python/pyogg/pyogg-1.3-r2.ebuild
+++ b/dev-python/pyogg/pyogg-1.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyogg/pyogg-1.3-r2.ebuild,v 1.2 2013/06/08 19:49:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyogg/pyogg-1.3-r2.ebuild,v 1.3 2013/09/05 18:46:26 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild b/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
index 15a2eb2b438b..102e072a3da0 100644
--- a/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
+++ b/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild,v 1.1 2013/06/08 20:00:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild,v 1.2 2013/09/05 18:47:17 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild
index 1f03b690381c..5d71a0e854ae 100644
--- a/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild,v 1.10 2013/04/22 17:13:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild,v 1.11 2013/09/05 18:47:10 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
index f0d769909251..65b7f2d8c8dc 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild,v 1.1 2013/08/27 23:31:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild,v 1.2 2013/09/05 18:47:06 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME_TARBALL_SUFFIX="bz2"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit gnome2 multilib python-r1
 
diff --git a/dev-python/pypam/pypam-0.5.0-r2.ebuild b/dev-python/pypam/pypam-0.5.0-r2.ebuild
index 0ae8ad553c88..b07a3a1b7f75 100644
--- a/dev-python/pypam/pypam-0.5.0-r2.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypam/pypam-0.5.0-r2.ebuild,v 1.3 2013/02/02 22:00:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypam/pypam-0.5.0-r2.ebuild,v 1.4 2013/09/05 18:47:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
index 3bc817ca008d..3c81cfe5b93f 100644
--- a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild,v 1.2 2013/08/07 11:21:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild,v 1.3 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/pyparsing-1.5.7.ebuild b/dev-python/pyparsing/pyparsing-1.5.7.ebuild
index 3f67238cc500..02b1b34ca290 100644
--- a/dev-python/pyparsing/pyparsing-1.5.7.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.5.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.7.ebuild,v 1.3 2013/08/07 11:21:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.7.ebuild,v 1.4 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/pyparsing-2.0.0.ebuild b/dev-python/pyparsing/pyparsing-2.0.0.ebuild
index cec3b40b37d0..58928d6679db 100644
--- a/dev-python/pyparsing/pyparsing-2.0.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.0.ebuild,v 1.1 2013/01/01 14:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.0.ebuild,v 1.2 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/pyparsing-2.0.1.ebuild b/dev-python/pyparsing/pyparsing-2.0.1.ebuild
index cf9ab505d023..a312628be1e9 100644
--- a/dev-python/pyparsing/pyparsing-2.0.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.1.ebuild,v 1.1 2013/08/11 03:14:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.1.ebuild,v 1.2 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/pypax-0.8.1-r1.ebuild b/dev-python/pypax/pypax-0.8.1-r1.ebuild
index 79ce43b35778..fe3069f1524c 100644
--- a/dev-python/pypax/pypax-0.8.1-r1.ebuild
+++ b/dev-python/pypax/pypax-0.8.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.1-r1.ebuild,v 1.10 2013/04/13 07:36:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.1-r1.ebuild,v 1.11 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/pypax-0.8.3.ebuild b/dev-python/pypax/pypax-0.8.3.ebuild
index e169b099d6b8..1224472fe641 100644
--- a/dev-python/pypax/pypax-0.8.3.ebuild
+++ b/dev-python/pypax/pypax-0.8.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.3.ebuild,v 1.10 2013/06/29 16:21:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypax/pypax-0.8.3.ebuild,v 1.11 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
index 83642f1c8dee..1d6621b2e5eb 100644
--- a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.2 2013/05/10 05:31:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild,v 1.3 2013/09/05 18:47:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 flag-o-matic eutils
 
diff --git a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
index a2a35dc7536e..79c073aaf90d 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild,v 1.4 2013/08/07 11:21:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild,v 1.5 2013/09/05 18:46:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 inherit eutils multilib pax-utils python-any-r1 versionator
 
 BINHOST="http://dev.gentoo.org/~mgorny/dist/${PN}"
diff --git a/dev-python/pypy/pypy-2.0.2.ebuild b/dev-python/pypy/pypy-2.0.2.ebuild
index 35ebfa2c78d5..3956d3d3a202 100644
--- a/dev-python/pypy/pypy-2.0.2.ebuild
+++ b/dev-python/pypy/pypy-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0.2.ebuild,v 1.6 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0.2.ebuild,v 1.7 2013/09/05 18:45:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 inherit check-reqs eutils multilib multiprocessing pax-utils \
 	python-any-r1 toolchain-funcs versionator
 
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 705e0cf6c2db..f91ece15bc13 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-9999.ebuild,v 1.2 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-9999.ebuild,v 1.3 2013/09/05 18:45:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 inherit check-reqs eutils multilib mercurial multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs versionator
 
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
index 019ba92ae299..178594f17ed7 100644
--- a/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
+++ b/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.2 2013/06/05 02:52:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-5.2.0-r1.ebuild,v 1.3 2013/09/05 18:45:58 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit flag-o-matic python-r1
 
diff --git a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
index 2d234cfbed89..6a22424a88eb 100644
--- a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.9-r1.ebuild,v 1.12 2013/06/02 08:44:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.9-r1.ebuild,v 1.13 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyro/pyro-3.16-r1.ebuild b/dev-python/pyro/pyro-3.16-r1.ebuild
index 84435c64e5db..6ebcfdc77371 100644
--- a/dev-python/pyro/pyro-3.16-r1.ebuild
+++ b/dev-python/pyro/pyro-3.16-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-3.16-r1.ebuild,v 1.1 2013/05/22 10:28:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-3.16-r1.ebuild,v 1.2 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyro/pyro-4.17-r1.ebuild b/dev-python/pyro/pyro-4.17-r1.ebuild
index c7ff97fb51ec..29462e68bec5 100644
--- a/dev-python/pyro/pyro-4.17-r1.ebuild
+++ b/dev-python/pyro/pyro-4.17-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.17-r1.ebuild,v 1.5 2013/06/29 18:31:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.17-r1.ebuild,v 1.6 2013/09/05 18:46:32 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyro/pyro-4.20.ebuild b/dev-python/pyro/pyro-4.20.ebuild
index ed7ff14bb6f6..d55b8e4cbc37 100644
--- a/dev-python/pyro/pyro-4.20.ebuild
+++ b/dev-python/pyro/pyro-4.20.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.20.ebuild,v 1.2 2013/07/18 19:33:31 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.20.ebuild,v 1.3 2013/09/05 14:20:01 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
@@ -29,8 +29,6 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		python_targets_python2_6? (
 			dev-python/unittest2[python_targets_python2_6] )
-		python_targets_python3_1? (
-			dev-python/unittest2[python_targets_python3_1] )
 	)"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pysctp/pysctp-0.6.ebuild b/dev-python/pysctp/pysctp-0.6.ebuild
index eeb7ab04956c..d28656c409c4 100644
--- a/dev-python/pysctp/pysctp-0.6.ebuild
+++ b/dev-python/pysctp/pysctp-0.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysctp/pysctp-0.6.ebuild,v 1.5 2012/12/02 20:54:57 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysctp/pysctp-0.6.ebuild,v 1.6 2013/09/05 18:46:57 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="PySCTP gives access to the SCTP transport protocol from Python."
diff --git a/dev-python/pyserial/pyserial-2.6-r1.ebuild b/dev-python/pyserial/pyserial-2.6-r1.ebuild
index 660f3dd1255b..6c11825edbbc 100644
--- a/dev-python/pyserial/pyserial-2.6-r1.ebuild
+++ b/dev-python/pyserial/pyserial-2.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.6-r1.ebuild,v 1.16 2013/08/07 11:21:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.6-r1.ebuild,v 1.17 2013/09/05 18:46:28 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild b/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild
index f2f1f898d982..8864ba5efb87 100644
--- a/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild,v 1.1 2013/08/03 12:04:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysnmp/pysnmp-4.2.2-r1.ebuild,v 1.2 2013/09/05 18:46:46 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysvn/pysvn-1.7.7.ebuild b/dev-python/pysvn/pysvn-1.7.7.ebuild
index 144b654e1fb5..3fb2c4acc083 100644
--- a/dev-python/pysvn/pysvn-1.7.7.ebuild
+++ b/dev-python/pysvn/pysvn-1.7.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.7.ebuild,v 1.2 2013/03/19 10:02:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.7.ebuild,v 1.3 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit eutils distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pysvn/pysvn-1.7.8.ebuild b/dev-python/pysvn/pysvn-1.7.8.ebuild
index a03717d3f106..7ae46a6b7518 100644
--- a/dev-python/pysvn/pysvn-1.7.8.ebuild
+++ b/dev-python/pysvn/pysvn-1.7.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.8.ebuild,v 1.1 2013/08/28 00:33:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.8.ebuild,v 1.2 2013/09/05 18:46:31 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild b/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild
index 520e05c4dcd5..72e634b376b5 100644
--- a/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild,v 1.2 2013/01/06 23:11:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild,v 1.3 2013/09/05 18:46:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest/pytest-2.3.4.ebuild b/dev-python/pytest/pytest-2.3.4.ebuild
index 2025238a8d7e..7546f36827f9 100644
--- a/dev-python/pytest/pytest-2.3.4.ebuild
+++ b/dev-python/pytest/pytest-2.3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4.ebuild,v 1.18 2013/08/07 11:21:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4.ebuild,v 1.19 2013/09/05 18:46:13 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="py.test: simple powerful testing with Python"
diff --git a/dev-python/pytest/pytest-2.3.5.ebuild b/dev-python/pytest/pytest-2.3.5.ebuild
index 9e8a8cd8bb70..dc0cec7b1c0a 100644
--- a/dev-python/pytest/pytest-2.3.5.ebuild
+++ b/dev-python/pytest/pytest-2.3.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.5.ebuild,v 1.13 2013/08/18 13:24:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.5.ebuild,v 1.14 2013/09/05 18:46:13 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="py.test: simple powerful testing with Python"
diff --git a/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild
index b602b46d0741..99047df8eb9e 100644
--- a/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1-r1.ebuild,v 1.11 2013/07/14 10:23:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.1-r1.ebuild,v 1.12 2013/09/05 18:47:14 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-debian/python-debian-0.1.21_p2.ebuild b/dev-python/python-debian/python-debian-0.1.21_p2.ebuild
index 931e4e049a4b..5cdb200d52a6 100644
--- a/dev-python/python-debian/python-debian-0.1.21_p2.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.21_p2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-debian/python-debian-0.1.21_p2.ebuild,v 1.1 2013/08/02 02:14:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-debian/python-debian-0.1.21_p2.ebuild,v 1.2 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_{6,7},3_{1,2,3}} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} pypy2_0 )
 
 inherit distutils-r1
 
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 69f027c256db..91d89aea153d 100644
--- a/dev-python/python-digest/python-digest-1.7-r1.ebuild
+++ b/dev-python/python-digest/python-digest-1.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/05/30 15:48:07 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-digest/python-digest-1.7-r1.ebuild,v 1.2 2013/09/05 18:46:40 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.33-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.33-r1.ebuild
index b79801f29f0b..bab21e1bbb01 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.33-r1.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.33-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-distutils-extra/python-distutils-extra-2.33-r1.ebuild,v 1.1 2013/02/24 15:26:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-distutils-extra/python-distutils-extra-2.33-r1.ebuild,v 1.2 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.37-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.37-r1.ebuild
index b59545a69c18..2f3df65540d0 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.37-r1.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.37-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-distutils-extra/python-distutils-extra-2.37-r1.ebuild,v 1.4 2013/05/20 08:31:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-distutils-extra/python-distutils-extra-2.37-r1.ebuild,v 1.5 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gflags/python-gflags-2.0.ebuild b/dev-python/python-gflags/python-gflags-2.0.ebuild
index f6ad273007c4..013d5a3cd305 100644
--- a/dev-python/python-gflags/python-gflags-2.0.ebuild
+++ b/dev-python/python-gflags/python-gflags-2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.7 2013/07/08 07:42:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gflags/python-gflags-2.0.ebuild,v 1.8 2013/09/05 18:47:01 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild
index ef9f4b8032ad..14a25c179c55 100644
--- a/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild,v 1.1 2013/01/08 19:00:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.1-r1.ebuild,v 1.2 2013/09/05 18:46:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild
index 2fdfa98f465d..0c989f8b88a8 100644
--- a/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild,v 1.1 2013/01/20 14:32:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gnupg/python-gnupg-0.3.2.ebuild,v 1.2 2013/09/05 18:46:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-irclib/python-irclib-0.4.8-r1.ebuild b/dev-python/python-irclib/python-irclib-0.4.8-r1.ebuild
index f96156b0b3a5..c676aca5c978 100644
--- a/dev-python/python-irclib/python-irclib-0.4.8-r1.ebuild
+++ b/dev-python/python-irclib/python-irclib-0.4.8-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-irclib/python-irclib-0.4.8-r1.ebuild,v 1.1 2013/07/08 17:28:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-irclib/python-irclib-0.4.8-r1.ebuild,v 1.2 2013/09/05 18:46:20 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
index e7fbd54a2b94..b9872334c96a 100644
--- a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild,v 1.5 2013/07/02 14:51:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild,v 1.6 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
 # pypy: bug #458558 (wrong linker options due to not respecting CC)
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 multilib
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.12.ebuild b/dev-python/python-ldap/python-ldap-2.4.12.ebuild
index 237332014059..731e3db2f86c 100644
--- a/dev-python/python-ldap/python-ldap-2.4.12.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.12.ebuild,v 1.3 2013/07/02 14:51:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.12.ebuild,v 1.4 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
 # pypy: bug #458558 (wrong linker options due to not respecting CC)
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 multilib
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.13.ebuild b/dev-python/python-ldap/python-ldap-2.4.13.ebuild
index 204a491fdb9a..30189b5a4d4e 100644
--- a/dev-python/python-ldap/python-ldap-2.4.13.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.13.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.13.ebuild,v 1.3 2013/07/02 14:51:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.13.ebuild,v 1.4 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
 # pypy: bug #458558 (wrong linker options due to not respecting CC)
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 multilib
 
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index c955ca298710..a4684b6281d5 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.3 2013/07/02 14:51:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.4 2013/09/05 18:46:36 mgorny Exp $
 
 EAPI=5
 
 # pypy: bug #458558 (wrong linker options due to not respecting CC)
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DISTUTILS_IN_SOURCE_BUILD=1
 DISTUTILS_NO_PARALLEL_BUILD=1
 
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild
index 7ffd04433cc6..ec71a51c2181 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.10.2-r1.ebuild,v 1.5 2013/08/14 13:18:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild,v 1.6 2013/09/05 18:46:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
index a0439e774744..e7b3b2406b4e 100644
--- a/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild,v 1.1 2013/08/05 16:07:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild,v 1.2 2013/09/05 18:46:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
index 387578b7d2e4..9b211903c7a0 100644
--- a/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
+++ b/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild,v 1.1 2013/08/05 16:07:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild,v 1.2 2013/09/05 18:46:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 git-2
 
diff --git a/dev-python/python-magic/python-magic-0.4.3.ebuild b/dev-python/python-magic/python-magic-0.4.3.ebuild
index aa400b35746d..e853481e80b1 100644
--- a/dev-python/python-magic/python-magic-0.4.3.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/python-magic-0.4.3.ebuild,v 1.2 2013/05/12 18:09:40 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/python-magic-0.4.3.ebuild,v 1.3 2013/09/05 18:46:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1
 
 DESCRIPTION="Access the libmagic file type identification library"
diff --git a/dev-python/python-memcached/python-memcached-1.48-r1.ebuild b/dev-python/python-memcached/python-memcached-1.48-r1.ebuild
index 9d096c2d058f..1d337062b27a 100644
--- a/dev-python/python-memcached/python-memcached-1.48-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.48-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/python-memcached-1.48-r1.ebuild,v 1.1 2013/05/22 14:26:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/python-memcached-1.48-r1.ebuild,v 1.2 2013/09/05 18:47:00 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-mhash/python-mhash-1.4-r1.ebuild b/dev-python/python-mhash/python-mhash-1.4-r1.ebuild
index 6ba397aa4545..0253038dfe6d 100644
--- a/dev-python/python-mhash/python-mhash-1.4-r1.ebuild
+++ b/dev-python/python-mhash/python-mhash-1.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mhash/python-mhash-1.4-r1.ebuild,v 1.2 2013/05/20 08:32:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mhash/python-mhash-1.4-r1.ebuild,v 1.3 2013/09/05 18:46:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/python-mpd/python-mpd-0.4.6.ebuild b/dev-python/python-mpd/python-mpd-0.4.6.ebuild
index 7d1f29d85683..1db54182dffd 100644
--- a/dev-python/python-mpd/python-mpd-0.4.6.ebuild
+++ b/dev-python/python-mpd/python-mpd-0.4.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.4.6.ebuild,v 1.1 2013/01/08 18:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.4.6.ebuild,v 1.2 2013/09/05 18:46:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-mpd/python-mpd-0.5.1.ebuild b/dev-python/python-mpd/python-mpd-0.5.1.ebuild
index 008ef37b7cf9..906e436971d8 100644
--- a/dev-python/python-mpd/python-mpd-0.5.1.ebuild
+++ b/dev-python/python-mpd/python-mpd-0.5.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.5.1.ebuild,v 1.4 2013/04/26 12:42:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.5.1.ebuild,v 1.5 2013/09/05 18:46:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.4.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.4.ebuild
index 89cf2c2a718a..94c990a80088 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.4.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.4.ebuild,v 1.2 2013/06/08 13:39:36 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.4.ebuild,v 1.3 2013/09/05 18:47:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1 vcs-snapshot
 
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 37d184768a50..89498007fece 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,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/02/02 15:22:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild,v 1.2 2013/09/05 18:46:43 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index b70f0cd9ded1..31781ccade64 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1 +1,2 @@
 DIST python-neutronclient-2.2.6.tar.gz 117690 SHA256 674d3fe98a907aff6001bfa6e5284993bd49295190a3aae5feb862f939b6fb5e SHA512 87a9378471249829b1b83d4f9af2638e481004857246e8810c8a8ed196448262b9e87a7a1f49bb52000a6c6a7ac51e71a4d9cf6a9c1b760cf75414c0e05f64c1 WHIRLPOOL 15d0896bc9d33b387ec856ce626a3fd307f8dddacf84d49dfbb45eabca7fff13c0112ab3bd4258b77e867815222568355bc4c55d271bc0113a05a31c9d75c8f3
+DIST python-neutronclient-2.3.0.tar.gz 138187 SHA256 b87ff9cb94d84fcfe23c9b8c411e00568b7f72870ed595ec0ad0a0665f981389 SHA512 5b5254dbda7cb955a2c69bc6fd8dc8c322824ac0d9aa93e586917ab9d9fe4c6035f9dbaab8fd3f197e642ebda02cfdcf26aa865a3c126889a3ff0941cbe3acc1 WHIRLPOOL 04a853847cda82c3940bb9291eb3804cd07adbfd3f126ffe1825261bc0704cc59451d4ab98cae14ee63db8fa3af0e2c4cc26993b742b9e5f0b6279d811bace90
diff --git a/dev-python/python-neutronclient/python-neutronclient-2.3.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-2.3.0.ebuild
new file mode 100644
index 000000000000..72206ffda79f
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-2.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-neutronclient/python-neutronclient-2.3.0.ebuild,v 1.1 2013/09/05 20:40:46 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		>=dev-python/cliff-1.4[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]"
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 1a54c65720ed..5f36eb1f2983 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,11 +1,11 @@
 # Copyright 1999-2013 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.4 2013/05/10 05:02:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-openid/python-openid-2.2.5-r1.ebuild,v 1.5 2013/09/05 18:46:26 mgorny Exp $
 
 EAPI=5
 
 PYTHON_REQ_USE='sqlite?'
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-pam/python-pam-0.1.4.ebuild b/dev-python/python-pam/python-pam-0.1.4.ebuild
index 92f170850795..c839e6478648 100644
--- a/dev-python/python-pam/python-pam-0.1.4.ebuild
+++ b/dev-python/python-pam/python-pam-0.1.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-pam/python-pam-0.1.4.ebuild,v 1.2 2013/01/01 00:15:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-pam/python-pam-0.1.4.ebuild,v 1.3 2013/09/05 18:46:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild b/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
index 044eeb16ec24..7dec6df8ce24 100644
--- a/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
+++ b/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild,v 1.1 2013/05/27 01:28:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild,v 1.2 2013/09/05 18:46:45 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-twitter/python-twitter-1.0.ebuild b/dev-python/python-twitter/python-twitter-1.0.ebuild
index 028b351eb50b..6d07664a6db9 100644
--- a/dev-python/python-twitter/python-twitter-1.0.ebuild
+++ b/dev-python/python-twitter/python-twitter-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-twitter/python-twitter-1.0.ebuild,v 1.1 2013/06/17 09:05:20 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-twitter/python-twitter-1.0.ebuild,v 1.2 2013/09/05 18:47:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-uinput/python-uinput-0.9.ebuild b/dev-python/python-uinput/python-uinput-0.9.ebuild
index 745858585f7b..1e04f52e8ce3 100644
--- a/dev-python/python-uinput/python-uinput-0.9.ebuild
+++ b/dev-python/python-uinput/python-uinput-0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-uinput/python-uinput-0.9.ebuild,v 1.1 2013/03/18 17:43:50 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-uinput/python-uinput-0.9.ebuild,v 1.2 2013/09/05 18:46:51 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_{6,7},3_{1,2,3}})
+PYTHON_COMPAT=(python{2_{6,7},3_{2,3}})
 inherit eutils distutils-r1
 
 DESCRIPTION="Pythonic API to the Linux uinput kernel module. "
diff --git a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
index b6cea6e0bf83..7545fb3b231d 100644
--- a/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild,v 1.1 2013/02/24 20:24:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-xlib/python-xlib-0.15_rc1-r2.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-2012.1.ebuild b/dev-python/pytools/pytools-2012.1.ebuild
index 8d4cf1e6b7d8..6510c8a8b866 100644
--- a/dev-python/pytools/pytools-2012.1.ebuild
+++ b/dev-python/pytools/pytools-2012.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2012.1.ebuild,v 1.3 2013/05/13 06:03:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2012.1.ebuild,v 1.4 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-2013.1.ebuild b/dev-python/pytools/pytools-2013.1.ebuild
index dde028a557d6..7105899c00ab 100644
--- a/dev-python/pytools/pytools-2013.1.ebuild
+++ b/dev-python/pytools/pytools-2013.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.1.ebuild,v 1.1 2013/05/13 06:03:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.1.ebuild,v 1.2 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-2013.2.ebuild b/dev-python/pytools/pytools-2013.2.ebuild
index 139d5941c151..7d15b0d18b4a 100644
--- a/dev-python/pytools/pytools-2013.2.ebuild
+++ b/dev-python/pytools/pytools-2013.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.2.ebuild,v 1.1 2013/06/03 07:51:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.2.ebuild,v 1.2 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-2013.5.3.ebuild b/dev-python/pytools/pytools-2013.5.3.ebuild
index d600bf9c06bd..78a4f000f77a 100644
--- a/dev-python/pytools/pytools-2013.5.3.ebuild
+++ b/dev-python/pytools/pytools-2013.5.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.3.ebuild,v 1.2 2013/07/08 05:07:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.3.ebuild,v 1.3 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-2013.5.5.ebuild b/dev-python/pytools/pytools-2013.5.5.ebuild
index b005320921ae..ef7d5f0919df 100644
--- a/dev-python/pytools/pytools-2013.5.5.ebuild
+++ b/dev-python/pytools/pytools-2013.5.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.5.ebuild,v 1.2 2013/08/09 11:17:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.5.ebuild,v 1.3 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-2013.5.6.ebuild b/dev-python/pytools/pytools-2013.5.6.ebuild
index e27b32ba2a22..4973ebd3ed53 100644
--- a/dev-python/pytools/pytools-2013.5.6.ebuild
+++ b/dev-python/pytools/pytools-2013.5.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.6.ebuild,v 1.1 2013/08/09 11:17:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.6.ebuild,v 1.2 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-2013.5.ebuild b/dev-python/pytools/pytools-2013.5.ebuild
index 420b3788a31c..83b2524a15af 100644
--- a/dev-python/pytools/pytools-2013.5.ebuild
+++ b/dev-python/pytools/pytools-2013.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.ebuild,v 1.1 2013/06/14 06:18:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-2013.5.ebuild,v 1.2 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
index 61acd16836f8..6a4caf7883fe 100644
--- a/dev-python/pytools/pytools-9999.ebuild
+++ b/dev-python/pytools/pytools-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-9999.ebuild,v 1.5 2013/08/25 03:23:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytools/pytools-9999.ebuild,v 1.6 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 git-2
 
diff --git a/dev-python/pytz/pytz-2012j.ebuild b/dev-python/pytz/pytz-2012j.ebuild
index d2df7a610bf0..770c9aad4616 100644
--- a/dev-python/pytz/pytz-2012j.ebuild
+++ b/dev-python/pytz/pytz-2012j.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2012j.ebuild,v 1.14 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2012j.ebuild,v 1.15 2013/09/05 18:46:15 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="World timezone definitions for Python"
diff --git a/dev-python/pytz/pytz-2013b.ebuild b/dev-python/pytz/pytz-2013b.ebuild
index c7386a0ba71f..4bd58fdd4fa9 100644
--- a/dev-python/pytz/pytz-2013b.ebuild
+++ b/dev-python/pytz/pytz-2013b.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2013b.ebuild,v 1.13 2013/08/07 11:21:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2013b.ebuild,v 1.14 2013/09/05 18:46:15 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="World timezone definitions for Python"
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
index 760f8eb831f7..8f0ae3802ad2 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild,v 1.1 2013/06/08 19:51:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild,v 1.2 2013/09/05 18:46:24 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pyx/pyx-0.12.1-r1.ebuild b/dev-python/pyx/pyx-0.12.1-r1.ebuild
index 8a63ddd03c9c..2d1baab8fa55 100644
--- a/dev-python/pyx/pyx-0.12.1-r1.ebuild
+++ b/dev-python/pyx/pyx-0.12.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.12.1-r1.ebuild,v 1.4 2013/02/27 13:46:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.12.1-r1.ebuild,v 1.5 2013/09/05 18:46:45 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild
index 3a51c6f854c6..cb0246dff650 100644
--- a/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild,v 1.5 2013/03/22 18:00:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.0-r1.ebuild,v 1.6 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxattr/pyxattr-0.5.1.ebuild b/dev-python/pyxattr/pyxattr-0.5.1.ebuild
index 0b6b447044b5..bd7e70415abc 100644
--- a/dev-python/pyxattr/pyxattr-0.5.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.1.ebuild,v 1.5 2013/03/22 18:00:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.1.ebuild,v 1.6 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyxattr/pyxattr-0.5.2.ebuild b/dev-python/pyxattr/pyxattr-0.5.2.ebuild
index 64f79b5960c1..5949d9f7ccf8 100644
--- a/dev-python/pyxattr/pyxattr-0.5.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.2.ebuild,v 1.13 2013/04/14 21:23:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.2.ebuild,v 1.14 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyxattr/pyxattr-9999.ebuild b/dev-python/pyxattr/pyxattr-9999.ebuild
index 00f7404f9719..09791656ebd0 100644
--- a/dev-python/pyxattr/pyxattr-9999.ebuild
+++ b/dev-python/pyxattr/pyxattr-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-9999.ebuild,v 1.2 2013/02/22 19:01:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-9999.ebuild,v 1.3 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 #if LIVE
 EGIT_REPO_URI="https://github.com/iustin/${PN}.git
diff --git a/dev-python/pyxdg/pyxdg-0.25.ebuild b/dev-python/pyxdg/pyxdg-0.25.ebuild
index d50810dac313..c1a4f6be076b 100644
--- a/dev-python/pyxdg/pyxdg-0.25.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.25.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.25.ebuild,v 1.16 2013/08/07 11:21:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.25.ebuild,v 1.17 2013/09/05 18:47:17 mgorny Exp $
 
 EAPI=5
 
 # py3.3 removed due to nosetests
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="A Python module to deal with freedesktop.org specifications"
diff --git a/dev-python/pyxml/pyxml-0.8.4-r3.ebuild b/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
index ce343ff29f5a..b92346cae793 100644
--- a/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.4-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r3.ebuild,v 1.4 2013/02/02 22:00:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r3.ebuild,v 1.5 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pyyaml/pyyaml-3.10-r1.ebuild b/dev-python/pyyaml/pyyaml-3.10-r1.ebuild
index 4e1551ff4367..3b026febc244 100644
--- a/dev-python/pyyaml/pyyaml-3.10-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.10-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.10-r1.ebuild,v 1.2 2013/02/16 22:21:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.10-r1.ebuild,v 1.3 2013/09/05 18:46:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyzmq/pyzmq-13.1.0.ebuild b/dev-python/pyzmq/pyzmq-13.1.0.ebuild
index 65ff066e35d7..f98481a5d128 100644
--- a/dev-python/pyzmq/pyzmq-13.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-13.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-13.1.0.ebuild,v 1.4 2013/08/20 19:18:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-13.1.0.ebuild,v 1.5 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
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 ddcf9b442102..fef70096202d 100644
--- a/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
+++ b/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.3 2013/03/30 13:04:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzmq/pyzmq-2.2.0.1-r1.ebuild,v 1.4 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.7.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.7.1.ebuild
index b51174c255da..346ffcc6c079 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.7.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.1.ebuild,v 1.2 2013/06/24 09:06:48 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.1.ebuild,v 1.3 2013/09/05 18:46:48 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils multilib python-r1 toolchain-funcs
 
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
index 3d4dfbec85ef..c3ddecbb874e 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild,v 1.5 2013/09/04 09:21:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.7.2.ebuild,v 1.8 2013/09/05 19:25:04 ago Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils multilib python-r1 toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild
index dbd434d1fe4e..547b7ddd094b 100644
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild,v 1.1 2013/03/04 19:38:25 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.0.ebuild,v 1.2 2013/09/05 18:46:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
index c3a438c7ebe5..28de0404c46d 100644
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild,v 1.1 2013/03/04 19:38:25 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild,v 1.2 2013/09/05 18:46:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1 git-2
 
diff --git a/dev-python/rarfile/rarfile-2.6.ebuild b/dev-python/rarfile/rarfile-2.6.ebuild
index 0975f47b126c..ef0bb2ab97fd 100644
--- a/dev-python/rarfile/rarfile-2.6.ebuild
+++ b/dev-python/rarfile/rarfile-2.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rarfile/rarfile-2.6.ebuild,v 1.1 2013/05/04 11:43:07 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rarfile/rarfile-2.6.ebuild,v 1.2 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1
 
 DESCRIPTION="Module for RAR archive reading"
diff --git a/dev-python/rdflib/rdflib-3.2.3-r1.ebuild b/dev-python/rdflib/rdflib-3.2.3-r1.ebuild
index 56b7eb88d84e..f48413cbc993 100644
--- a/dev-python/rdflib/rdflib-3.2.3-r1.ebuild
+++ b/dev-python/rdflib/rdflib-3.2.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-3.2.3-r1.ebuild,v 1.1 2013/05/12 17:57:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-3.2.3-r1.ebuild,v 1.2 2013/09/05 18:47:13 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_USE_WITH="sqlite?"
 DISTUTILS_NO_PARALLEL_BUILD=true
 
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 9b642736e89d..758f92658d96 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,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/06/16 11:38:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/recaptcha-client/recaptcha-client-1.0.6-r1.ebuild,v 1.2 2013/09/05 18:46:44 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/redis-py-2.7.2-r1.ebuild b/dev-python/redis-py/redis-py-2.7.2-r1.ebuild
index 83a835d16bd9..06afd3eb7b2d 100644
--- a/dev-python/redis-py/redis-py-2.7.2-r1.ebuild
+++ b/dev-python/redis-py/redis-py-2.7.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.2-r1.ebuild,v 1.4 2013/05/14 09:37:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.2-r1.ebuild,v 1.5 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/redis-py-2.7.4.ebuild b/dev-python/redis-py/redis-py-2.7.4.ebuild
index 3e6fc5c773a1..7caf079ffad2 100644
--- a/dev-python/redis-py/redis-py-2.7.4.ebuild
+++ b/dev-python/redis-py/redis-py-2.7.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.4.ebuild,v 1.3 2013/06/25 13:01:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.4.ebuild,v 1.4 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/redis-py-2.7.5.ebuild b/dev-python/redis-py/redis-py-2.7.5.ebuild
index b1b413e63087..b44f4a1da53f 100644
--- a/dev-python/redis-py/redis-py-2.7.5.ebuild
+++ b/dev-python/redis-py/redis-py-2.7.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.5.ebuild,v 1.1 2013/05/22 07:48:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.5.ebuild,v 1.2 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/redis-py-2.7.6.ebuild b/dev-python/redis-py/redis-py-2.7.6.ebuild
index c9c761d3fd49..d88509c560de 100644
--- a/dev-python/redis-py/redis-py-2.7.6.ebuild
+++ b/dev-python/redis-py/redis-py-2.7.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.6.ebuild,v 1.1 2013/06/17 08:47:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.6.ebuild,v 1.2 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/reportlab/reportlab-2.6.ebuild b/dev-python/reportlab/reportlab-2.6.ebuild
index d89eb6921c74..fff39489878f 100644
--- a/dev-python/reportlab/reportlab-2.6.ebuild
+++ b/dev-python/reportlab/reportlab-2.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.6.ebuild,v 1.4 2013/06/08 14:34:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.6.ebuild,v 1.5 2013/09/05 18:47:05 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 # Tests crash with pypy
 
 inherit distutils-r1 eutils flag-o-matic prefix
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 0ccad18d4dd7..5934df4b6129 100644
--- a/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/02/16 19:20:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild,v 1.2 2013/09/05 18:46:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-cache/requests-cache-0.3.0.ebuild b/dev-python/requests-cache/requests-cache-0.3.0.ebuild
index 8a27a89381e5..944990db97e0 100644
--- a/dev-python/requests-cache/requests-cache-0.3.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-cache/requests-cache-0.3.0.ebuild,v 1.2 2013/02/28 17:32:47 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-cache/requests-cache-0.3.0.ebuild,v 1.3 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-cache/requests-cache-0.4.0.ebuild b/dev-python/requests-cache/requests-cache-0.4.0.ebuild
index 5b490d3fa676..7728ff6a6a64 100644
--- a/dev-python/requests-cache/requests-cache-0.4.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-cache/requests-cache-0.4.0.ebuild,v 1.1 2013/05/02 05:41:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-cache/requests-cache-0.4.0.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-cache/requests-cache-0.4.2.ebuild b/dev-python/requests-cache/requests-cache-0.4.2.ebuild
index b1b469a9a03d..3256c1b9a1fb 100644
--- a/dev-python/requests-cache/requests-cache-0.4.2.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-cache/requests-cache-0.4.2.ebuild,v 1.1 2013/09/02 04:08:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests-cache/requests-cache-0.4.2.ebuild,v 1.2 2013/09/05 18:46:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-1.0.4.ebuild b/dev-python/requests/requests-1.0.4.ebuild
index 30a30016872e..ea09af7448f3 100644
--- a/dev-python/requests/requests-1.0.4.ebuild
+++ b/dev-python/requests/requests-1.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.0.4.ebuild,v 1.2 2013/01/09 02:13:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.0.4.ebuild,v 1.3 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-1.1.0.ebuild b/dev-python/requests/requests-1.1.0.ebuild
index 53ce3ab525ea..bef687cab9f4 100644
--- a/dev-python/requests/requests-1.1.0.ebuild
+++ b/dev-python/requests/requests-1.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.4 2013/03/28 10:18:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.5 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-1.2.0.ebuild b/dev-python/requests/requests-1.2.0.ebuild
index fb3e604bd690..74da12a45145 100644
--- a/dev-python/requests/requests-1.2.0.ebuild
+++ b/dev-python/requests/requests-1.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.0.ebuild,v 1.3 2013/05/16 17:17:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.0.ebuild,v 1.4 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-1.2.1.ebuild b/dev-python/requests/requests-1.2.1.ebuild
index 50f60af6de74..a1884392a1bc 100644
--- a/dev-python/requests/requests-1.2.1.ebuild
+++ b/dev-python/requests/requests-1.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.1.ebuild,v 1.1 2013/05/21 08:09:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.1.ebuild,v 1.2 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-1.2.2.ebuild b/dev-python/requests/requests-1.2.2.ebuild
index e846e205d447..adc4ba85851d 100644
--- a/dev-python/requests/requests-1.2.2.ebuild
+++ b/dev-python/requests/requests-1.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.2.ebuild,v 1.1 2013/05/22 07:14:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.2.ebuild,v 1.2 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/requests-1.2.3.ebuild b/dev-python/requests/requests-1.2.3.ebuild
index 85a3bd399f6c..e2be3b0acd14 100644
--- a/dev-python/requests/requests-1.2.3.ebuild
+++ b/dev-python/requests/requests-1.2.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.3.ebuild,v 1.2 2013/08/11 13:25:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.2.3.ebuild,v 1.3 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/restkit/restkit-4.2.1-r1.ebuild b/dev-python/restkit/restkit-4.2.1-r1.ebuild
index e22b0de69134..10fac3b19757 100644
--- a/dev-python/restkit/restkit-4.2.1-r1.ebuild
+++ b/dev-python/restkit/restkit-4.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.1-r1.ebuild,v 1.4 2013/07/11 22:14:16 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.1-r1.ebuild,v 1.5 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rope/rope-0.9.4-r1.ebuild b/dev-python/rope/rope-0.9.4-r1.ebuild
index 94408a11005a..db7c1df49cdf 100644
--- a/dev-python/rope/rope-0.9.4-r1.ebuild
+++ b/dev-python/rope/rope-0.9.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rope/rope-0.9.4-r1.ebuild,v 1.1 2013/07/18 15:50:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rope/rope-0.9.4-r1.ebuild,v 1.2 2013/09/05 18:46:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/routes/routes-1.12.3-r1.ebuild b/dev-python/routes/routes-1.12.3-r1.ebuild
index 19ec7fecf6c9..fac88548a44e 100644
--- a/dev-python/routes/routes-1.12.3-r1.ebuild
+++ b/dev-python/routes/routes-1.12.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-1.12.3-r1.ebuild,v 1.1 2013/03/25 14:57:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-1.12.3-r1.ebuild,v 1.2 2013/09/05 18:46:14 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild
index 86be8b51da97..8e84b5235dd4 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild,v 1.4 2013/06/26 03:03:20 yac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild,v 1.5 2013/09/05 18:46:39 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild b/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild
index 70d076240b2f..034d2fd6f380 100644
--- a/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild
+++ b/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild,v 1.2 2013/04/10 14:15:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild,v 1.3 2013/09/05 18:47:15 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils versionator flag-o-matic
 
diff --git a/dev-python/selenium/selenium-2.29.0.ebuild b/dev-python/selenium/selenium-2.29.0.ebuild
index a9ddb9dfcaf7..86da76ec4265 100644
--- a/dev-python/selenium/selenium-2.29.0.ebuild
+++ b/dev-python/selenium/selenium-2.29.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/selenium/selenium-2.29.0.ebuild,v 1.2 2013/01/24 02:19:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/selenium/selenium-2.29.0.ebuild,v 1.3 2013/09/05 18:46:06 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/serpent/serpent-1.2.ebuild b/dev-python/serpent/serpent-1.2.ebuild
index 07b7c0ef0bc6..220026d7762c 100644
--- a/dev-python/serpent/serpent-1.2.ebuild
+++ b/dev-python/serpent/serpent-1.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/serpent/serpent-1.2.ebuild,v 1.2 2013/07/10 12:41:55 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/serpent/serpent-1.2.ebuild,v 1.3 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/serpent/serpent-1.3.ebuild b/dev-python/serpent/serpent-1.3.ebuild
index 437bce40b65d..6e076f7644e5 100644
--- a/dev-python/serpent/serpent-1.3.ebuild
+++ b/dev-python/serpent/serpent-1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/serpent/serpent-1.3.ebuild,v 1.1 2013/09/02 05:16:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/serpent/serpent-1.3.ebuild,v 1.2 2013/09/05 18:46:33 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild
index efa655ef7c00..637e83649f14 100644
--- a/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild,v 1.1 2013/02/15 16:52:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.6-r1.ebuild,v 1.2 2013/09/05 18:46:03 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/setproctitle/setproctitle-1.1.7.ebuild b/dev-python/setproctitle/setproctitle-1.1.7.ebuild
index fa5cff35ce26..386e2ce084fd 100644
--- a/dev-python/setproctitle/setproctitle-1.1.7.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.7.ebuild,v 1.3 2013/05/20 08:42:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setproctitle/setproctitle-1.1.7.ebuild,v 1.4 2013/09/05 18:46:03 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/setuptools-git/setuptools-git-1.0_beta1.ebuild b/dev-python/setuptools-git/setuptools-git-1.0_beta1.ebuild
index 20f754ff101a..2a8d77e71b76 100644
--- a/dev-python/setuptools-git/setuptools-git-1.0_beta1.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.0_beta1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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_beta1.ebuild,v 1.1 2013/01/26 06:26:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools-git/setuptools-git-1.0_beta1.ebuild,v 1.2 2013/09/05 18:47:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 python3_1 python3_2 python3_3 )
+PYTHON_COMPAT=( python2_6 python2_7 python3_2 python3_3 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/setuptools/setuptools-0.6.30-r1.ebuild b/dev-python/setuptools/setuptools-0.6.30-r1.ebuild
index 8b2fbfe03a30..a63a04b2928c 100644
--- a/dev-python/setuptools/setuptools-0.6.30-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.30-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.30-r1.ebuild,v 1.16 2013/07/06 01:29:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.30-r1.ebuild,v 1.17 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/setuptools/setuptools-0.6.33.ebuild b/dev-python/setuptools/setuptools-0.6.33.ebuild
index 92c3ea15d88f..6433901750c0 100644
--- a/dev-python/setuptools/setuptools-0.6.33.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.33.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.33.ebuild,v 1.7 2013/08/07 11:21:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.33.ebuild,v 1.8 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/setuptools/setuptools-0.6.45-r1.ebuild b/dev-python/setuptools/setuptools-0.6.45-r1.ebuild
index 947675f3589c..cc200b5df4f6 100644
--- a/dev-python/setuptools/setuptools-0.6.45-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.45-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.45-r1.ebuild,v 1.4 2013/08/07 11:21:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.45-r1.ebuild,v 1.5 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/setuptools/setuptools-0.8-r1.ebuild b/dev-python/setuptools/setuptools-0.8-r1.ebuild
index e9b175846a9a..e33a4e599f03 100644
--- a/dev-python/setuptools/setuptools-0.8-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.8-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.8-r1.ebuild,v 1.9 2013/08/29 19:46:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.8-r1.ebuild,v 1.10 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/setuptools-0.9.8-r1.ebuild b/dev-python/setuptools/setuptools-0.9.8-r1.ebuild
index a0b6eb337b0c..5a08a77afd39 100644
--- a/dev-python/setuptools/setuptools-0.9.8-r1.ebuild
+++ b/dev-python/setuptools/setuptools-0.9.8-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.9.8-r1.ebuild,v 1.1 2013/08/05 08:18:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.9.8-r1.ebuild,v 1.2 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/setuptools-1.0.ebuild b/dev-python/setuptools/setuptools-1.0.ebuild
index e29afa6db4dc..2f5b369626c7 100644
--- a/dev-python/setuptools/setuptools-1.0.ebuild
+++ b/dev-python/setuptools/setuptools-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-1.0.ebuild,v 1.1 2013/08/25 06:39:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-1.0.ebuild,v 1.2 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/setuptools-1.1.ebuild b/dev-python/setuptools/setuptools-1.1.ebuild
index 80c396f79d58..ed1dc5d6d6c9 100644
--- a/dev-python/setuptools/setuptools-1.1.ebuild
+++ b/dev-python/setuptools/setuptools-1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-1.1.ebuild,v 1.1 2013/08/27 05:16:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-1.1.ebuild,v 1.2 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index eea77970b5c0..7dc657f7fa3e 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-9999.ebuild,v 1.5 2013/07/21 11:29:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-9999.ebuild,v 1.6 2013/09/05 18:46:35 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 #if LIVE
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 a8a3680f1e46..7cc55fa8a640 100644
--- a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
+++ b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/05/18 12:57:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild,v 1.2 2013/09/05 18:47:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sh/sh-1.07.ebuild b/dev-python/sh/sh-1.07.ebuild
index 332ac2946492..7c1ec865ff8c 100644
--- a/dev-python/sh/sh-1.07.ebuild
+++ b/dev-python/sh/sh-1.07.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sh/sh-1.07.ebuild,v 1.2 2013/03/28 19:11:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sh/sh-1.07.ebuild,v 1.3 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_{6,7},3_{1,2,3}})
+PYTHON_COMPAT=(python{2_{6,7},3_{2,3}})
 inherit distutils-r1
 
 DESCRIPTION="Python subprocess interface"
diff --git a/dev-python/sh/sh-1.08.ebuild b/dev-python/sh/sh-1.08.ebuild
index 1db9bf61cf28..6b682331b5e0 100644
--- a/dev-python/sh/sh-1.08.ebuild
+++ b/dev-python/sh/sh-1.08.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sh/sh-1.08.ebuild,v 1.2 2013/03/28 19:13:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sh/sh-1.08.ebuild,v 1.3 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_{6,7},3_{1,2,3}})
+PYTHON_COMPAT=(python{2_{6,7},3_{2,3}})
 inherit distutils-r1
 
 DESCRIPTION="Python subprocess interface"
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 12719495d3bc..7d9e3ac01fbd 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild,v 1.4 2013/08/20 19:17:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild,v 1.5 2013/09/05 18:46:38 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplejson/simplejson-3.0.7.ebuild b/dev-python/simplejson/simplejson-3.0.7.ebuild
index e22f32b62bec..7d2c5c630937 100644
--- a/dev-python/simplejson/simplejson-3.0.7.ebuild
+++ b/dev-python/simplejson/simplejson-3.0.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.0.7.ebuild,v 1.5 2013/03/09 11:23:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.0.7.ebuild,v 1.6 2013/09/05 18:46:03 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simplejson/simplejson-3.1.3.ebuild b/dev-python/simplejson/simplejson-3.1.3.ebuild
index e40bf197ab9e..dbf7b6fb2777 100644
--- a/dev-python/simplejson/simplejson-3.1.3.ebuild
+++ b/dev-python/simplejson/simplejson-3.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.1.3.ebuild,v 1.5 2013/05/16 13:06:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.1.3.ebuild,v 1.6 2013/09/05 18:46:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simplejson/simplejson-3.2.0.ebuild b/dev-python/simplejson/simplejson-3.2.0.ebuild
index 7fd5af1e8012..21b62a4056c2 100644
--- a/dev-python/simplejson/simplejson-3.2.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.2.0.ebuild,v 1.2 2013/05/02 12:36:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.2.0.ebuild,v 1.3 2013/09/05 18:46:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simplejson/simplejson-3.3.0.ebuild b/dev-python/simplejson/simplejson-3.3.0.ebuild
index 5bc9fce64d37..1d7e13f8059b 100644
--- a/dev-python/simplejson/simplejson-3.3.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.3.0.ebuild,v 1.9 2013/07/13 11:41:28 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.3.0.ebuild,v 1.10 2013/09/05 18:46:03 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/simples3/simples3-1.0.ebuild b/dev-python/simples3/simples3-1.0.ebuild
index 8c6fbd8b37ec..f14a12c31fc1 100644
--- a/dev-python/simples3/simples3-1.0.ebuild
+++ b/dev-python/simples3/simples3-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simples3/simples3-1.0.ebuild,v 1.2 2013/01/13 21:05:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simples3/simples3-1.0.ebuild,v 1.3 2013/09/05 18:46:55 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sip/sip-4.14.3.ebuild b/dev-python/sip/sip-4.14.3.ebuild
index b0c903ead507..5323a812dbbf 100644
--- a/dev-python/sip/sip-4.14.3.ebuild
+++ b/dev-python/sip/sip-4.14.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.3.ebuild,v 1.13 2013/03/30 13:05:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.3.ebuild,v 1.14 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils python-r1 toolchain-funcs
 
diff --git a/dev-python/sip/sip-4.14.6.ebuild b/dev-python/sip/sip-4.14.6.ebuild
index 394672719d15..ad0bd6ca3167 100644
--- a/dev-python/sip/sip-4.14.6.ebuild
+++ b/dev-python/sip/sip-4.14.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.6.ebuild,v 1.2 2013/06/24 07:49:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.6.ebuild,v 1.3 2013/09/05 18:46:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils python-r1 toolchain-funcs
 
diff --git a/dev-python/sip/sip-4.14.7.ebuild b/dev-python/sip/sip-4.14.7.ebuild
index c4b8140bf8f7..99453690c8f6 100644
--- a/dev-python/sip/sip-4.14.7.ebuild
+++ b/dev-python/sip/sip-4.14.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.7.ebuild,v 1.6 2013/09/04 09:20:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.7.ebuild,v 1.9 2013/09/05 19:24:51 ago Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils python-r1 toolchain-funcs
 
@@ -28,7 +28,7 @@ fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/10"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug doc"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/six/six-1.2.0-r1.ebuild b/dev-python/six/six-1.2.0-r1.ebuild
index 8f6dec793060..b350f0952c81 100644
--- a/dev-python/six/six-1.2.0-r1.ebuild
+++ b/dev-python/six/six-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.2.0-r1.ebuild,v 1.4 2013/08/07 11:21:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.2.0-r1.ebuild,v 1.5 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/six/six-1.3.0.ebuild b/dev-python/six/six-1.3.0.ebuild
index 47905f2ef394..95da52f2c870 100644
--- a/dev-python/six/six-1.3.0.ebuild
+++ b/dev-python/six/six-1.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.3.0.ebuild,v 1.12 2013/08/25 16:19:29 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.3.0.ebuild,v 1.13 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/six/six-9999.ebuild b/dev-python/six/six-9999.ebuild
index bbde1e25b8a7..0edf14bd140e 100644
--- a/dev-python/six/six-9999.ebuild
+++ b/dev-python/six/six-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.5 2013/08/25 16:20:49 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.6 2013/09/05 18:46:23 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 #if LIVE
 EHG_REPO_URI="https://bitbucket.org/gutworth/six"
diff --git a/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild b/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild
index 3c6d4c29203e..77f3ba4ebc95 100644
--- a/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild
+++ b/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild,v 1.2 2013/01/29 07:46:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/skype4py-1.0.32.1-r1.ebuild,v 1.3 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/skype4py/skype4py-1.0.34.ebuild b/dev-python/skype4py/skype4py-1.0.34.ebuild
index 8ed8d14f8dc7..0aeb5f1b7928 100644
--- a/dev-python/skype4py/skype4py-1.0.34.ebuild
+++ b/dev-python/skype4py/skype4py-1.0.34.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/skype4py-1.0.34.ebuild,v 1.1 2013/02/04 08:31:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/skype4py-1.0.34.ebuild,v 1.2 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/skype4py/skype4py-1.0.35.ebuild b/dev-python/skype4py/skype4py-1.0.35.ebuild
index 18aceaf7ff3e..56d6bc8c8d72 100644
--- a/dev-python/skype4py/skype4py-1.0.35.ebuild
+++ b/dev-python/skype4py/skype4py-1.0.35.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/skype4py-1.0.35.ebuild,v 1.1 2013/06/02 22:30:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/skype4py/skype4py-1.0.35.ebuild,v 1.2 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild b/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild
index 12429b7b3398..c8c023a4210a 100644
--- a/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild
+++ b/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild,v 1.1 2013/04/23 05:38:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sleekxmpp/sleekxmpp-1.1.11.ebuild,v 1.2 2013/09/05 18:46:37 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 # tests currently fail under 3.3
 
 inherit eutils distutils-r1
diff --git a/dev-python/smmap/smmap-0.8.2-r1.ebuild b/dev-python/smmap/smmap-0.8.2-r1.ebuild
index 401cc2e68e89..37711130b84a 100644
--- a/dev-python/smmap/smmap-0.8.2-r1.ebuild
+++ b/dev-python/smmap/smmap-0.8.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/smmap/smmap-0.8.2-r1.ebuild,v 1.1 2013/05/07 14:34:25 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/smmap/smmap-0.8.2-r1.ebuild,v 1.2 2013/09/05 18:47:10 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/soappy/soappy-0.12.5-r2.ebuild b/dev-python/soappy/soappy-0.12.5-r2.ebuild
index f06e2323ce01..55810de41729 100644
--- a/dev-python/soappy/soappy-0.12.5-r2.ebuild
+++ b/dev-python/soappy/soappy-0.12.5-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.12.5-r2.ebuild,v 1.1 2013/02/15 22:48:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.12.5-r2.ebuild,v 1.2 2013/09/05 18:47:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl?,xml"
 
 inherit distutils-r1
diff --git a/dev-python/socketpool/socketpool-0.5.2-r1.ebuild b/dev-python/socketpool/socketpool-0.5.2-r1.ebuild
index 49b509fd2e2e..f51803bc862d 100644
--- a/dev-python/socketpool/socketpool-0.5.2-r1.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/socketpool-0.5.2-r1.ebuild,v 1.7 2013/07/11 21:22:30 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/socketpool-0.5.2-r1.ebuild,v 1.8 2013/09/05 18:46:41 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/socketpool/socketpool-0.5.2.ebuild b/dev-python/socketpool/socketpool-0.5.2.ebuild
index 1e77ffc33095..0fe97aba8b9e 100644
--- a/dev-python/socketpool/socketpool-0.5.2.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/socketpool-0.5.2.ebuild,v 1.4 2013/04/25 18:20:01 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/socketpool/socketpool-0.5.2.ebuild,v 1.5 2013/09/05 18:46:41 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_6 python2_7 pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/socksipy/socksipy-1.00.ebuild b/dev-python/socksipy/socksipy-1.00.ebuild
index cf4b1acc4f81..71cf5fe69db2 100644
--- a/dev-python/socksipy/socksipy-1.00.ebuild
+++ b/dev-python/socksipy/socksipy-1.00.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/socksipy/socksipy-1.00.ebuild,v 1.1 2013/06/29 23:41:22 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/socksipy/socksipy-1.00.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit python-r1
 
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
index fc7593dd8aa8..8401fadfbe7f 100644
--- a/dev-python/soya/soya-0.14-r1.ebuild
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14-r1.ebuild,v 1.2 2013/06/09 17:33:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14-r1.ebuild,v 1.3 2013/09/05 18:47:14 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index 986e1ec34a63..c19d451bb368 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/speaklater/speaklater-1.3-r1.ebuild,v 1.1 2013/06/09 06:18:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/speaklater/speaklater-1.3-r1.ebuild,v 1.2 2013/09/05 18:46:44 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
diff --git a/dev-python/sphinx/sphinx-1.1.3-r5.ebuild b/dev-python/sphinx/sphinx-1.1.3-r5.ebuild
index 203a58dfd9e9..741b19a502db 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r5.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r5.ebuild,v 1.7 2013/02/03 10:57:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r5.ebuild,v 1.8 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/sphinx/sphinx-1.1.3-r6.ebuild b/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
index 44da29b0b273..d1fce0d2f633 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r6.ebuild,v 1.13 2013/09/02 11:57:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r6.ebuild,v 1.14 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
index 5a192d9c6a3b..f2c4cbde750b 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r7.ebuild,v 1.12 2013/09/02 11:59:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r7.ebuild,v 1.13 2013/09/05 18:46:10 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild b/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild
index c57a24b71a89..e32d25305bf1 100644
--- a/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild
+++ b/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild,v 1.1 2013/06/01 15:15:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2_pre20130530.ebuild,v 1.2 2013/09/05 18:46:11 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.ebuild
index 2b330dec145e..172eef5fc7fe 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1.8.ebuild,v 1.1 2013/06/10 09:07:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.ebuild,v 1.2 2013/09/05 18:46:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.9.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.9.ebuild
index 0a9e5ea186fb..6db22e8b1252 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.9.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1.9.ebuild,v 1.1 2013/08/10 12:26:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.9.ebuild,v 1.2 2013/09/05 18:46:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
index 05ff2ac26e2b..569687db5ca6 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild,v 1.2 2013/04/29 06:33:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild,v 1.3 2013/09/05 18:47:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxtogithub/sphinxtogithub-1.0.0.ebuild b/dev-python/sphinxtogithub/sphinxtogithub-1.0.0.ebuild
index 865e076bd66e..dfe8928b4f75 100644
--- a/dev-python/sphinxtogithub/sphinxtogithub-1.0.0.ebuild
+++ b/dev-python/sphinxtogithub/sphinxtogithub-1.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxtogithub/sphinxtogithub-1.0.0.ebuild,v 1.1 2013/06/25 10:55:53 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxtogithub/sphinxtogithub-1.0.0.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
index bce98f35714b..605baa94871b 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild,v 1.3 2013/04/30 13:00:12 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild,v 1.4 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils flag-o-matic
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.8.1.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.8.1.ebuild
index 0935f6687652..df7f08acc0b4 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.8.1.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.8.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.1.ebuild,v 1.2 2013/05/10 05:09:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.1.ebuild,v 1.3 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils flag-o-matic
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild
index 29cf8533ccbb..b2517686db97 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild,v 1.3 2013/09/02 17:44:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild,v 1.4 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 eutils flag-o-matic
 
diff --git a/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
index 95e593d92d5e..7a7c526491d9 100644
--- a/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
+++ b/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/05/04 20:18:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlitecachec/sqlitecachec-1.1.4-r1.ebuild,v 1.2 2013/09/05 18:46:39 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild b/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild
index cc5abbc57e2f..4babf532e50b 100644
--- a/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild
+++ b/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild,v 1.1 2013/07/03 07:33:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.4.1-r1.ebuild,v 1.2 2013/09/05 18:47:02 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite?"
 inherit distutils-r1
 
diff --git a/dev-python/ssh/ssh-1.8.0-r1.ebuild b/dev-python/ssh/ssh-1.8.0-r1.ebuild
index 8c624921fcc4..f2e2ae1c62ed 100644
--- a/dev-python/ssh/ssh-1.8.0-r1.ebuild
+++ b/dev-python/ssh/ssh-1.8.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ssh/ssh-1.8.0-r1.ebuild,v 1.1 2013/04/19 11:59:15 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ssh/ssh-1.8.0-r1.ebuild,v 1.2 2013/09/05 18:47:01 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/stevedore/stevedore-0.9.1.ebuild b/dev-python/stevedore/stevedore-0.9.1.ebuild
index 4696d729dd67..c585596c199a 100644
--- a/dev-python/stevedore/stevedore-0.9.1.ebuild
+++ b/dev-python/stevedore/stevedore-0.9.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/stevedore-0.9.1.ebuild,v 1.4 2013/08/28 11:15:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stevedore/stevedore-0.9.1.ebuild,v 1.5 2013/09/05 18:47:12 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/stsci-distutils/stsci-distutils-0.3.2-r1.ebuild b/dev-python/stsci-distutils/stsci-distutils-0.3.2-r1.ebuild
index 439ae69c4c18..805074aa2a1e 100644
--- a/dev-python/stsci-distutils/stsci-distutils-0.3.2-r1.ebuild
+++ b/dev-python/stsci-distutils/stsci-distutils-0.3.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.2-r1.ebuild,v 1.3 2013/04/24 21:01:38 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stsci-distutils/stsci-distutils-0.3.2-r1.ebuild,v 1.4 2013/09/05 18:46:55 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
diff --git a/dev-python/stsci-distutils/stsci-distutils-0.3.4.ebuild b/dev-python/stsci-distutils/stsci-distutils-0.3.4.ebuild
index bf61053a069d..c3a0ae781998 100644
--- a/dev-python/stsci-distutils/stsci-distutils-0.3.4.ebuild
+++ b/dev-python/stsci-distutils/stsci-distutils-0.3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.4.ebuild,v 1.1 2013/08/10 09:51:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stsci-distutils/stsci-distutils-0.3.4.ebuild,v 1.2 2013/09/05 18:46:55 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
diff --git a/dev-python/subunit/subunit-0.0.10-r1.ebuild b/dev-python/subunit/subunit-0.0.10-r1.ebuild
index 9762e4799eb6..a5d82394bf1b 100644
--- a/dev-python/subunit/subunit-0.0.10-r1.ebuild
+++ b/dev-python/subunit/subunit-0.0.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.10-r1.ebuild,v 1.3 2013/06/17 11:28:59 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.10-r1.ebuild,v 1.4 2013/09/05 18:47:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit autotools-utils python-single-r1
 
diff --git a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
index cab74e0a66a3..f8ff72c51e05 100644
--- a/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
+++ b/dev-python/sudsds/sudsds-1.0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sudsds/sudsds-1.0.1-r1.ebuild,v 1.4 2013/05/20 08:27:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sudsds/sudsds-1.0.1-r1.ebuild,v 1.5 2013/09/05 18:46:48 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/symboltype/symboltype-1.0.ebuild b/dev-python/symboltype/symboltype-1.0.ebuild
index 4210c1d7afc7..581225d4d0de 100644
--- a/dev-python/symboltype/symboltype-1.0.ebuild
+++ b/dev-python/symboltype/symboltype-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/10 03:36:07 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/symboltype/symboltype-1.0.ebuild,v 1.2 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tagpy/tagpy-2013.1.ebuild b/dev-python/tagpy/tagpy-2013.1.ebuild
index 33399877fbfa..175829f77033 100644
--- a/dev-python/tagpy/tagpy-2013.1.ebuild
+++ b/dev-python/tagpy/tagpy-2013.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tagpy/tagpy-2013.1.ebuild,v 1.1 2013/05/11 21:44:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tagpy/tagpy-2013.1.ebuild,v 1.2 2013/09/05 18:47:12 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempita/tempita-0.5.1-r1.ebuild b/dev-python/tempita/tempita-0.5.1-r1.ebuild
index 39dd73937b07..73d204812cdd 100644
--- a/dev-python/tempita/tempita-0.5.1-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.1-r1.ebuild,v 1.12 2013/06/02 08:39:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.1-r1.ebuild,v 1.13 2013/09/05 18:46:29 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testtools/testtools-0.9.24-r1.ebuild b/dev-python/testtools/testtools-0.9.24-r1.ebuild
index 58018a4e85e7..14896c0dfb0c 100644
--- a/dev-python/testtools/testtools-0.9.24-r1.ebuild
+++ b/dev-python/testtools/testtools-0.9.24-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.24-r1.ebuild,v 1.13 2013/06/17 10:05:56 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.24-r1.ebuild,v 1.14 2013/09/05 18:46:55 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/timelib/timelib-0.2.4-r1.ebuild b/dev-python/timelib/timelib-0.2.4-r1.ebuild
index cc214e776ddd..4717dd5bf9c6 100644
--- a/dev-python/timelib/timelib-0.2.4-r1.ebuild
+++ b/dev-python/timelib/timelib-0.2.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/04/18 16:59:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/timelib/timelib-0.2.4-r1.ebuild,v 1.2 2013/09/05 18:46:51 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tlslite/tlslite-0.4.3-r1.ebuild b/dev-python/tlslite/tlslite-0.4.3-r1.ebuild
index b71afdace280..dc5cc1f3fa48 100644
--- a/dev-python/tlslite/tlslite-0.4.3-r1.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/tlslite-0.4.3-r1.ebuild,v 1.3 2013/08/07 13:28:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/tlslite-0.4.3-r1.ebuild,v 1.4 2013/09/05 18:47:17 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/translationstring/translationstring-1.1-r1.ebuild b/dev-python/translationstring/translationstring-1.1-r1.ebuild
index e8cc3ff0a864..2b330ff48abe 100644
--- a/dev-python/translationstring/translationstring-1.1-r1.ebuild
+++ b/dev-python/translationstring/translationstring-1.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/translationstring/translationstring-1.1-r1.ebuild,v 1.2 2013/08/16 12:51:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/translationstring/translationstring-1.1-r1.ebuild,v 1.3 2013/09/05 18:47:03 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild
index 2e77017bebd7..63ad980f849d 100644
--- a/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild
+++ b/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild,v 1.1 2013/04/17 17:07:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-0.10.ebuild,v 1.2 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild b/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild
index c8a926e6da1e..a2fc0a58c74d 100644
--- a/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild
+++ b/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild,v 1.2 2013/02/03 21:28:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-0.9.ebuild,v 1.3 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/transmissionrpc/transmissionrpc-9999.ebuild b/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
index bde51fc60bed..29ba0be1c424 100644
--- a/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
+++ b/dev-python/transmissionrpc/transmissionrpc-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-9999.ebuild,v 1.4 2013/04/17 17:07:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/transmissionrpc/transmissionrpc-9999.ebuild,v 1.5 2013/09/05 18:46:30 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
index c900c65b02d2..1e002598f840 100644
--- a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
+++ b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild,v 1.3 2013/05/20 08:43:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild,v 1.4 2013/09/05 18:46:57 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/turbojson/turbojson-1.3-r1.ebuild b/dev-python/turbojson/turbojson-1.3-r1.ebuild
index ebd22e8a8486..9d529d524dac 100644
--- a/dev-python/turbojson/turbojson-1.3-r1.ebuild
+++ b/dev-python/turbojson/turbojson-1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/turbojson/turbojson-1.3-r1.ebuild,v 1.2 2013/05/10 05:16:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/turbojson/turbojson-1.3-r1.ebuild,v 1.3 2013/09/05 18:46:21 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tweepy/tweepy-2.0.ebuild b/dev-python/tweepy/tweepy-2.0.ebuild
index 46e86ac43b56..ec1fc1bcb34b 100644
--- a/dev-python/tweepy/tweepy-2.0.ebuild
+++ b/dev-python/tweepy/tweepy-2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tweepy/tweepy-2.0.ebuild,v 1.1 2013/03/10 09:04:27 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tweepy/tweepy-2.0.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild
index dc13052359ca..f27731386591 100644
--- a/dev-python/twill/twill-0.9-r1.ebuild
+++ b/dev-python/twill/twill-0.9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twill/twill-0.9-r1.ebuild,v 1.1 2013/03/28 04:12:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twill/twill-0.9-r1.ebuild,v 1.2 2013/09/05 18:47:04 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/twitter/twitter-1.10.0.ebuild b/dev-python/twitter/twitter-1.10.0.ebuild
index a89cb163af10..dad33425119d 100644
--- a/dev-python/twitter/twitter-1.10.0.ebuild
+++ b/dev-python/twitter/twitter-1.10.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twitter/twitter-1.10.0.ebuild,v 1.1 2013/06/25 07:48:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twitter/twitter-1.10.0.ebuild,v 1.2 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/twitter/twitter-1.9.2-r1.ebuild b/dev-python/twitter/twitter-1.9.2-r1.ebuild
index efa33c57edf1..36ca6867a895 100644
--- a/dev-python/twitter/twitter-1.9.2-r1.ebuild
+++ b/dev-python/twitter/twitter-1.9.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twitter/twitter-1.9.2-r1.ebuild,v 1.1 2013/04/09 08:12:14 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twitter/twitter-1.9.2-r1.ebuild,v 1.2 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/twitter/twitter-1.9.4.ebuild b/dev-python/twitter/twitter-1.9.4.ebuild
index 11d3456d3b3b..6d750340ce54 100644
--- a/dev-python/twitter/twitter-1.9.4.ebuild
+++ b/dev-python/twitter/twitter-1.9.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twitter/twitter-1.9.4.ebuild,v 1.1 2013/04/22 07:28:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twitter/twitter-1.9.4.ebuild,v 1.2 2013/09/05 18:46:17 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/txAMQP/txAMQP-0.6.2.ebuild b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
index 05cc96279a3a..7be142f7723d 100644
--- a/dev-python/txAMQP/txAMQP-0.6.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.2 2013/08/03 09:45:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.6.2.ebuild,v 1.3 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
diff --git a/dev-python/unidecode/unidecode-0.04.9-r1.ebuild b/dev-python/unidecode/unidecode-0.04.9-r1.ebuild
index 911ea9785667..96d954e7d016 100644
--- a/dev-python/unidecode/unidecode-0.04.9-r1.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.9-r1.ebuild,v 1.2 2013/05/29 05:55:13 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.9-r1.ebuild,v 1.3 2013/09/05 18:46:40 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 MY_PN=Unidecode
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/unittest2/unittest2-0.5.1-r1.ebuild b/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
index 93d2384d2bc7..cbdda7901af5 100644
--- a/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
+++ b/dev-python/unittest2/unittest2-0.5.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-0.5.1-r1.ebuild,v 1.12 2013/08/07 13:26:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-0.5.1-r1.ebuild,v 1.13 2013/09/05 18:45:59 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild b/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
index cadfff4822d4..1ff338bed0e6 100644
--- a/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
+++ b/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild,v 1.3 2013/08/18 13:44:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/urlgrabber-3.9.1-r2.ebuild,v 1.4 2013/09/05 18:47:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/urllib3/urllib3-1.6.ebuild b/dev-python/urllib3/urllib3-1.6.ebuild
index d307d88c5c0d..e6d4eb0be3fb 100644
--- a/dev-python/urllib3/urllib3-1.6.ebuild
+++ b/dev-python/urllib3/urllib3-1.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.6.ebuild,v 1.2 2013/05/11 13:55:43 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.6.ebuild,v 1.3 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/urllib3/urllib3-1.7.ebuild b/dev-python/urllib3/urllib3-1.7.ebuild
index 1f1abbac4c21..a503948e3d80 100644
--- a/dev-python/urllib3/urllib3-1.7.ebuild
+++ b/dev-python/urllib3/urllib3-1.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.7.ebuild,v 1.1 2013/08/26 02:45:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.7.ebuild,v 1.2 2013/09/05 18:46:07 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/urwid/urwid-1.1.1-r1.ebuild b/dev-python/urwid/urwid-1.1.1-r1.ebuild
index 5abf68567654..983d595aef5f 100644
--- a/dev-python/urwid/urwid-1.1.1-r1.ebuild
+++ b/dev-python/urwid/urwid-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.1-r1.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.1-r1.ebuild,v 1.3 2013/09/05 18:46:50 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/vatnumber/vatnumber-1.0-r1.ebuild b/dev-python/vatnumber/vatnumber-1.0-r1.ebuild
index d721da60ebb7..b2f276c7d759 100644
--- a/dev-python/vatnumber/vatnumber-1.0-r1.ebuild
+++ b/dev-python/vatnumber/vatnumber-1.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/vatnumber/vatnumber-1.0-r1.ebuild,v 1.1 2013/03/21 16:16:28 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vatnumber/vatnumber-1.0-r1.ebuild,v 1.2 2013/09/05 18:47:16 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
index 93414920317e..c44386fc10dc 100644
--- a/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
+++ b/dev-python/versiontools/versiontools-1.9.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/03/21 14:47:10 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/versiontools/versiontools-1.9.1-r1.ebuild,v 1.2 2013/09/05 18:47:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 #DISTUTILS_SRC_TEST=setup.py
 
 inherit distutils-r1
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild
index 3c74d3a46c72..79b0be26d914 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild,v 1.3 2013/08/18 13:25:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv-clone/virtualenv-clone-0.2.4-r1.ebuild,v 1.4 2013/09/05 18:47:11 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} python{3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7} python3_2 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/virtualenv-1.10-r1.ebuild b/dev-python/virtualenv/virtualenv-1.10-r1.ebuild
index d93ad00a6004..c46988b841bd 100644
--- a/dev-python/virtualenv/virtualenv-1.10-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-1.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.10-r1.ebuild,v 1.3 2013/08/25 14:58:56 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.10-r1.ebuild,v 1.4 2013/09/05 18:46:44 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild b/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
index 5525ad46d165..61386ea8e9cf 100644
--- a/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild,v 1.17 2013/09/02 11:57:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild,v 1.18 2013/09/05 18:46:44 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/w3lib/w3lib-1.2-r1.ebuild b/dev-python/w3lib/w3lib-1.2-r1.ebuild
index fc5eec1e6583..51227d74c35e 100644
--- a/dev-python/w3lib/w3lib-1.2-r1.ebuild
+++ b/dev-python/w3lib/w3lib-1.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/w3lib-1.2-r1.ebuild,v 1.1 2013/03/21 12:49:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/w3lib-1.2-r1.ebuild,v 1.2 2013/09/05 18:46:45 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/w3lib/w3lib-1.3.ebuild b/dev-python/w3lib/w3lib-1.3.ebuild
index c0b14563b292..13cff7046ea8 100644
--- a/dev-python/w3lib/w3lib-1.3.ebuild
+++ b/dev-python/w3lib/w3lib-1.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/w3lib-1.3.ebuild,v 1.1 2013/06/13 08:28:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/w3lib-1.3.ebuild,v 1.2 2013/09/05 18:46:45 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/webpy/webpy-0.37-r1.ebuild b/dev-python/webpy/webpy-0.37-r1.ebuild
index 9e1a157bda1c..fd5a9c02e238 100644
--- a/dev-python/webpy/webpy-0.37-r1.ebuild
+++ b/dev-python/webpy/webpy-0.37-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webpy/webpy-0.37-r1.ebuild,v 1.1 2013/03/21 10:59:53 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webpy/webpy-0.37-r1.ebuild,v 1.2 2013/09/05 18:47:09 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index ea8c13ca4e9d..a87cfff8daad 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,2 +1,3 @@
 DIST v0.3.0.tar.gz 277499 SHA256 6466ba0031635a8442006ec5bfa9a19c92906b5229119b8a3cd8556d348ae801 SHA512 667390779b0e9e0a6311ed0fde1ed165692c53d0a49d6050ca218ce00bf2a5bf6825b6debaa4d364ff56a391bfcb4587ddbcb27d9faa1074f0e8475c8140d03f WHIRLPOOL ce819b4cbd5cbda977a453a6bf26f3a5db0da87a0132029c6a07bbacbe51b3178c3e19756127b6eca2493d948ac6f957772caa30542af233b87981bd1c0327df
 DIST v0.4.1.zip 304604 SHA256 63e40a378b4c3a4873f5a1246f423e8b66b9ad51717ccc2f98c54cd1ac3cf8c6 SHA512 43bbd7daf965855982559dc035d2ea5a65f5ee2c165ba8aaa4151fe1ff4d6eabb33e51c323516201a07f793ffb45df8df0379be3cf1070b17784924f1ede487c WHIRLPOOL 841b4efa3d9dabeab32fd08fcc1a4624c92fc8cd09a613c048a1e7283e3a7894de7eb4ce59dceca2af4f1376f0ec1d5998b329d55a8ea20add88f8f324a1bd11
+DIST v0.5.1.zip 305486 SHA256 8604bb53e238e323cb272e740f3ca446c5146876b65dac2be1a92127ed123369 SHA512 db67983486bf14c2bbc4a53bfa34a445d8304807b0158a1eaa243527d4f7e82f99020029aaeca86428f16f6fc0d170b5d700f994144f15320a6e594e2f977ce3 WHIRLPOOL ee99f0fcf6c5834cba270483b391ef397204617b1d4591b976986ce5f223dd9118999f3d8090952b5d487a81b83d6a30593eb15882e49d7448aceb7cead4b957
diff --git a/dev-python/websockify/websockify-0.3.0.ebuild b/dev-python/websockify/websockify-0.3.0.ebuild
index be4da0f22e5b..6b104cb3dca7 100644
--- a/dev-python/websockify/websockify-0.3.0.ebuild
+++ b/dev-python/websockify/websockify-0.3.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/websockify-0.3.0.ebuild,v 1.1 2013/06/09 00:54:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/websockify-0.3.0.ebuild,v 1.2 2013/09/05 18:46:49 mgorny Exp $
 
 #this ebuild is required for >sys-cluster/nova-2013.1 support
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/websockify/websockify-0.4.1.ebuild b/dev-python/websockify/websockify-0.4.1.ebuild
index 49073c60906f..abc14f46c1a7 100644
--- a/dev-python/websockify/websockify-0.4.1.ebuild
+++ b/dev-python/websockify/websockify-0.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/websockify-0.4.1.ebuild,v 1.2 2013/04/26 05:42:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/websockify-0.4.1.ebuild,v 1.3 2013/09/05 18:46:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/websockify/websockify-0.5.1.ebuild b/dev-python/websockify/websockify-0.5.1.ebuild
new file mode 100644
index 000000000000..c9315d36ef58
--- /dev/null
+++ b/dev-python/websockify/websockify-0.5.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/websockify/websockify-0.5.1.ebuild,v 1.1 2013/09/05 20:44:13 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1
+
+SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.zip"
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/kanaka/websockify"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/werkzeug/werkzeug-0.9.1.ebuild b/dev-python/werkzeug/werkzeug-0.9.1.ebuild
index b54bbbc14baf..4b29c3170c2b 100644
--- a/dev-python/werkzeug/werkzeug-0.9.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.1.ebuild,v 1.2 2013/06/27 00:48:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.1.ebuild,v 1.3 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/werkzeug-0.9.2.ebuild b/dev-python/werkzeug/werkzeug-0.9.2.ebuild
index 1195817233b7..900c8e3bc277 100644
--- a/dev-python/werkzeug/werkzeug-0.9.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.9.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.2.ebuild,v 1.1 2013/07/25 05:37:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.2.ebuild,v 1.2 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/werkzeug-0.9.3.ebuild b/dev-python/werkzeug/werkzeug-0.9.3.ebuild
index aef4f4e98fa6..48d48a3bba64 100644
--- a/dev-python/werkzeug/werkzeug-0.9.3.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.9.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.3.ebuild,v 1.3 2013/09/04 09:01:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.3.ebuild,v 1.4 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/werkzeug-0.9.4.ebuild b/dev-python/werkzeug/werkzeug-0.9.4.ebuild
index 16df4cad2c67..79ebbe34cce7 100644
--- a/dev-python/werkzeug/werkzeug-0.9.4.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.9.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.4.ebuild,v 1.1 2013/08/26 12:01:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.4.ebuild,v 1.2 2013/09/05 18:46:22 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/whisper-0.9.10-r1.ebuild b/dev-python/whisper/whisper-0.9.10-r1.ebuild
index b6eda8848670..4457334db7e6 100644
--- a/dev-python/whisper/whisper-0.9.10-r1.ebuild
+++ b/dev-python/whisper/whisper-0.9.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whisper/whisper-0.9.10-r1.ebuild,v 1.1 2013/03/16 11:54:11 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whisper/whisper-0.9.10-r1.ebuild,v 1.2 2013/09/05 18:47:00 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{5,6,7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_{6,7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/whisper-0.9.12.ebuild b/dev-python/whisper/whisper-0.9.12.ebuild
index cf1c48508cc9..0f6e8227bd86 100644
--- a/dev-python/whisper/whisper-0.9.12.ebuild
+++ b/dev-python/whisper/whisper-0.9.12.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whisper/whisper-0.9.12.ebuild,v 1.1 2013/09/02 04:55:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whisper/whisper-0.9.12.ebuild,v 1.2 2013/09/05 18:47:00 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{5,6,7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_{6,7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whoosh/whoosh-2.4.1-r1.ebuild b/dev-python/whoosh/whoosh-2.4.1-r1.ebuild
index 6a861ad3f053..df065dabf766 100644
--- a/dev-python/whoosh/whoosh-2.4.1-r1.ebuild
+++ b/dev-python/whoosh/whoosh-2.4.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.4.1-r1.ebuild,v 1.4 2013/02/04 17:03:35 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.4.1-r1.ebuild,v 1.5 2013/09/05 18:46:41 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 MY_PN="Whoosh"
 
diff --git a/dev-python/workerpool/workerpool-0.9.2-r1.ebuild b/dev-python/workerpool/workerpool-0.9.2-r1.ebuild
index 69aa75abbfff..8f6b76720990 100644
--- a/dev-python/workerpool/workerpool-0.9.2-r1.ebuild
+++ b/dev-python/workerpool/workerpool-0.9.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/workerpool-0.9.2-r1.ebuild,v 1.2 2013/04/19 12:34:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/workerpool-0.9.2-r1.ebuild,v 1.3 2013/09/05 18:47:07 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_{6,7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsgilog/wsgilog-0.3-r1.ebuild b/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
index 9ed5b77c7d1c..425118c1ca60 100644
--- a/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
+++ b/dev-python/wsgilog/wsgilog-0.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgilog/wsgilog-0.3-r1.ebuild,v 1.1 2013/03/16 09:07:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgilog/wsgilog-0.3-r1.ebuild,v 1.2 2013/09/05 18:46:16 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wstools/wstools-0.4-r1.ebuild b/dev-python/wstools/wstools-0.4-r1.ebuild
index 5c52c87f4075..897423bd9143 100644
--- a/dev-python/wstools/wstools-0.4-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wstools/wstools-0.4-r1.ebuild,v 1.1 2013/02/15 22:30:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wstools/wstools-0.4-r1.ebuild,v 1.2 2013/09/05 18:45:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
index a8150009bb88..63ec79bc5394 100644
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ b/dev-python/wstools/wstools-0.4.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wstools/wstools-0.4.3.ebuild,v 1.1 2013/05/02 05:42:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wstools/wstools-0.4.3.ebuild,v 1.2 2013/09/05 18:45:59 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/wtforms/wtforms-1.0.3-r1.ebuild b/dev-python/wtforms/wtforms-1.0.3-r1.ebuild
index fd15f8f6a56a..191bab89421f 100644
--- a/dev-python/wtforms/wtforms-1.0.3-r1.ebuild
+++ b/dev-python/wtforms/wtforms-1.0.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtforms/wtforms-1.0.3-r1.ebuild,v 1.1 2013/03/16 08:46:43 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wtforms/wtforms-1.0.3-r1.ebuild,v 1.2 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wtforms/wtforms-1.0.4.ebuild b/dev-python/wtforms/wtforms-1.0.4.ebuild
index 909c540e3850..e1697806dd63 100644
--- a/dev-python/wtforms/wtforms-1.0.4.ebuild
+++ b/dev-python/wtforms/wtforms-1.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wtforms/wtforms-1.0.4.ebuild,v 1.3 2013/06/25 12:51:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wtforms/wtforms-1.0.4.ebuild,v 1.4 2013/09/05 18:46:09 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlrd/xlrd-0.9.0.ebuild b/dev-python/xlrd/xlrd-0.9.0.ebuild
index f4ec293e7373..51624826c98a 100644
--- a/dev-python/xlrd/xlrd-0.9.0.ebuild
+++ b/dev-python/xlrd/xlrd-0.9.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/xlrd-0.9.0.ebuild,v 1.4 2013/05/20 08:24:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/xlrd-0.9.0.ebuild,v 1.5 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlrd/xlrd-0.9.2.ebuild b/dev-python/xlrd/xlrd-0.9.2.ebuild
index 070be012ff27..cc7047abb84f 100644
--- a/dev-python/xlrd/xlrd-0.9.2.ebuild
+++ b/dev-python/xlrd/xlrd-0.9.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/xlrd-0.9.2.ebuild,v 1.1 2013/05/23 04:12:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/xlrd-0.9.2.ebuild,v 1.2 2013/09/05 18:46:18 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlwt/xlwt-0.7.4-r1.ebuild b/dev-python/xlwt/xlwt-0.7.4-r1.ebuild
index 655c5c0c1e36..825ac5cb0008 100644
--- a/dev-python/xlwt/xlwt-0.7.4-r1.ebuild
+++ b/dev-python/xlwt/xlwt-0.7.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlwt/xlwt-0.7.4-r1.ebuild,v 1.5 2013/05/16 13:23:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlwt/xlwt-0.7.4-r1.ebuild,v 1.6 2013/09/05 18:46:51 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlwt/xlwt-0.7.5.ebuild b/dev-python/xlwt/xlwt-0.7.5.ebuild
index 555f42a527b8..762eebe734e0 100644
--- a/dev-python/xlwt/xlwt-0.7.5.ebuild
+++ b/dev-python/xlwt/xlwt-0.7.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlwt/xlwt-0.7.5.ebuild,v 1.4 2013/05/20 12:44:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlwt/xlwt-0.7.5.ebuild,v 1.5 2013/09/05 18:46:51 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-python/yolk/yolk-0.4.3-r1.ebuild b/dev-python/yolk/yolk-0.4.3-r1.ebuild
index 1a3d9cbe4455..bc828f3f0acf 100644
--- a/dev-python/yolk/yolk-0.4.3-r1.ebuild
+++ b/dev-python/yolk/yolk-0.4.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 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.1 2013/03/14 17:04:09 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/yolk-0.4.3-r1.ebuild,v 1.2 2013/09/05 18:46:05 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
index 943606bf804e..26b91fed735f 100644
--- a/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
+++ b/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild,v 1.7 2013/09/02 11:11:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild,v 1.8 2013/09/05 12:34:47 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend dev-ruby/zentest
diff --git a/dev-ruby/cocaine/Manifest b/dev-ruby/cocaine/Manifest
index 52dae1247c83..c77b7028c67f 100644
--- a/dev-ruby/cocaine/Manifest
+++ b/dev-ruby/cocaine/Manifest
@@ -1,4 +1,2 @@
-DIST cocaine-0.2.1.gem 8704 SHA256 ceda8dae6dc695f36363a8a38b26895e9ace92cc09d4efb7156e48706d984cdf SHA512 92fb56b965dc7578d20e921810eda9db198c32a1bd44d5057c8cf878045566fc361bc0c00cc6520b90bb7e10c25172b3b321a4a996086cd1140aa9839a1f021e WHIRLPOOL 81eab1ab8f4d4522f0bccbcf787e9cacdfa91dc773a0c8b723b5f37d010ab863e5d09c8f9588571a0b3f4e3f3d3afd3cf92ff1ba07aec6a0d5550547d9aeb531
-DIST cocaine-0.4.0.gem 11776 SHA256 81d123d043897c1531f18e956a3308e7b3885a963454e7dff4c6b6d672836b36 SHA512 01bebbcc9241d6ae4b002dea80b482ee40162a1e72e79510ca1217920d179292e6ee5b316392850869d5a77c902c9aff0f3dbccc62fcfe38891c6eda7d05c6a3 WHIRLPOOL 13e4f48a4bde1122c18dfa83f87118f975d991671f3341174c60393fbccb5de2605d7d62cffe39f1e669c8e7c707d564945e4c4fd9f65ed45ac2f05f88c8d0da
 DIST cocaine-0.4.2.gem 12288 SHA256 b1c04ddd688053ef25bfe79f9f980b76f7e8a2b33fef7bd15276a6706f1e4c85 SHA512 13d9ff34f4a82aaa66ce9eda1918d54b062322d39cd73cf18456a3ee0eb431a36ea4120c722c56cf0759a0b44fd8e2f542bea16a4fca4267ef24ec85a966e45d WHIRLPOOL 7616a637109cd9a83f1e1309a4198e107453a586afb9490e43966ea3aa437736bb395e3dba011f66b118ea4c0f887b756b07efc518f65dd0c209f9b3f996a6cc
 DIST cocaine-0.5.1.gem 12800 SHA256 d8cab89e51f261e707de675cb62572454fb124db0ec9eaa40a6698ee35dcfc76 SHA512 92b749f69e1d2c3b5c62ca34030325717f635526fc30f6faabd9eb85d2581d92bca2197e245b0f32ef882878155aeb105014b9dc91ea513dee40c18f20f5f183 WHIRLPOOL 6364bee0338b4d350621427678e47b116a753f065b301a2a155551b72c2c5d3966005e42b8c6911441ad3d8378036957e90463897baefe32368bcd24719054c4
diff --git a/dev-ruby/cocaine/cocaine-0.2.1.ebuild b/dev-ruby/cocaine/cocaine-0.2.1.ebuild
deleted file mode 100644
index 4d09138a42b0..000000000000
--- a/dev-ruby/cocaine/cocaine-0.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cocaine/cocaine-0.2.1.ebuild,v 1.3 2012/10/06 06:29:39 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-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_bdepend "
-	test? (
-		dev-ruby/bourne
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		-e '/dependency.*mocha/s:= 0.10.4:~> 0.10.3:' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	rm Gemfile* || die
-
-	sed -i -e '/bundler/d' Rakefile || die
-}
diff --git a/dev-ruby/cocaine/cocaine-0.4.0.ebuild b/dev-ruby/cocaine/cocaine-0.4.0.ebuild
deleted file mode 100644
index a7b8e9f0db29..000000000000
--- a/dev-ruby/cocaine/cocaine-0.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cocaine/cocaine-0.4.0.ebuild,v 1.1 2012/10/06 06:29:39 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 jruby"
-
-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_bdepend "
-	test? (
-		dev-ruby/bourne
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		-e '/dependency.*mocha/s:= 0.10.4:~> 0.10.3:' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	rm Gemfile* || die
-
-	sed -i -e '/bundler/d' Rakefile || die
-}
diff --git a/dev-ruby/flickr/flickr-1.0.2-r3.ebuild b/dev-ruby/flickr/flickr-1.0.2-r3.ebuild
deleted file mode 100644
index aeefa1e0f935..000000000000
--- a/dev-ruby/flickr/flickr-1.0.2-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/flickr-1.0.2-r3.ebuild,v 1.3 2011/12/14 17:39:35 ago Exp $
-
-EAPI=2
-USE_RUBY="ruby18 jruby"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An insanely easy interface to the Flickr photo-sharing service."
-HOMEPAGE="http://rubyforge.org/projects/flickr/"
-SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
-
-S="${WORKDIR}/${P}-gentoo"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-# Tests fail for now, they don't seem to be designed to work just yet
-RESTRICT="test"
-
-ruby_add_rdepend dev-ruby/xml-simple
-
-all_ruby_prepare() {
-	cd "${S}"/lib
-	epatch "${FILESDIR}/${P}-fix.patch"
-	epatch "${FILESDIR}/${P}-typo.patch"
-}
-
-all_ruby_install() {
-	if use doc; then
-		dohtml -r "${S}"/doc/* || die "dohtml failed"
-	fi
-
-	dohtml "${S}"/index.html || die "dohtml failed"
-}
diff --git a/dev-ruby/flickr/flickr-1.0.2-r5.ebuild b/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
index 7c67a8c7ef46..94a015296371 100644
--- a/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
+++ b/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/flickr-1.0.2-r5.ebuild,v 1.2 2013/02/10 08:47:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/flickr-1.0.2-r5.ebuild,v 1.3 2013/09/05 13:55:25 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 jruby"
@@ -20,7 +20,7 @@ RUBY_S="${P}-gentoo"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/xml-simple"
diff --git a/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild b/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild
index 93c48fdff0ab..1e0273703ff9 100644
--- a/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild
+++ b/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild,v 1.5 2013/01/15 05:11:51 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gem_plugin/gem_plugin-0.2.3-r2.ebuild,v 1.7 2013/09/05 13:56:41 ago Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ruby19 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://mongrel.rubyforge.org/"
 
 LICENSE="mongrel"
 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"
+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=""
 
 each_fakegem_test() {
diff --git a/dev-ruby/httpclient/httpclient-2.2.5.ebuild b/dev-ruby/httpclient/httpclient-2.2.5.ebuild
index e39e6b780af8..d5e63be6512a 100644
--- a/dev-ruby/httpclient/httpclient-2.2.5.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httpclient/httpclient-2.2.5.ebuild,v 1.4 2013/01/15 07:07:45 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httpclient/httpclient-2.2.5.ebuild,v 1.5 2013/09/05 13:56:56 ago Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ RUBY_S="nahi-httpclient-*"
 LICENSE="Ruby"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND}
diff --git a/dev-ruby/json/json-1.8.0.ebuild b/dev-ruby/json/json-1.8.0.ebuild
index 3997d72aed75..1efc4fe3c5e6 100644
--- a/dev-ruby/json/json-1.8.0.ebuild
+++ b/dev-ruby/json/json-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.8.0.ebuild,v 1.4 2013/09/01 14:46:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.8.0.ebuild,v 1.5 2013/09/05 15:47:48 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -17,7 +17,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension."
 HOMEPAGE="http://json.rubyforge.org/"
 LICENSE="|| ( Ruby GPL-2 )"
 
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mocha/mocha-0.11.4.ebuild b/dev-ruby/mocha/mocha-0.11.4.ebuild
index d3b772e3abcf..d72b275e07bb 100644
--- a/dev-ruby/mocha/mocha-0.11.4.ebuild
+++ b/dev-ruby/mocha/mocha-0.11.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.11.4.ebuild,v 1.13 2013/09/04 09:21:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.11.4.ebuild,v 1.14 2013/09/05 13:42:15 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.11"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.12.7.ebuild b/dev-ruby/mocha/mocha-0.12.7.ebuild
index 75abb162e5da..2ef51ab313de 100644
--- a/dev-ruby/mocha/mocha-0.12.7.ebuild
+++ b/dev-ruby/mocha/mocha-0.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.7.ebuild,v 1.10 2013/09/04 09:21:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.7.ebuild,v 1.11 2013/09/05 13:42:15 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.12"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.13.3.ebuild b/dev-ruby/mocha/mocha-0.13.3.ebuild
index 154e4bb2d1f5..9aba66da61f4 100644
--- a/dev-ruby/mocha/mocha-0.13.3.ebuild
+++ b/dev-ruby/mocha/mocha-0.13.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3.ebuild,v 1.8 2013/09/04 09:21:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3.ebuild,v 1.9 2013/09/05 13:42:15 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.13"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/ohai/Manifest b/dev-ruby/ohai/Manifest
index 7fe3bcb15a91..dd317c09add8 100644
--- a/dev-ruby/ohai/Manifest
+++ b/dev-ruby/ohai/Manifest
@@ -1,4 +1,2 @@
-DIST ohai-0.6.12.tgz 97463 SHA256 fc65fcbfb4cdeb186562481ea5a4e73a35db7101f642cbfcdc0a839a607599af SHA512 adeb611af5e7a08c2b1ffaaf4a348535a7d301eb0836b99558298c3eae32d2d2b27e2ea97f243cec49254f888981ba5f6d3cbd5460f34bea425bd2a11bf3d6a6 WHIRLPOOL f670ed10d7c3d31f3e2b04f7b06261a3ff2c7a726091857ff00b7f7242b2ebdd2e70d3948c06b62a980630aced975d7111434015b32115eaa8b8c3fecea17d0f
-DIST ohai-6.14.0.tgz 110618 SHA256 beb8bdee164bdcbc8eb3887c9272dc333a562aa297df760a42d778bf09b740ff SHA512 85eb788680a08cb84349dbbdccf313e24c86c799914ff43296e7d11d022e4fbe3e209afcbd0ca3c333f53b14b4de2696fc6429381a6901d793542bb4d3155704 WHIRLPOOL aaf56edbcb0081d673afc4fb2e221c3e810b55965bd17a049cae13fdae70ea0700d2dabc6dbfa9a390dcfc490abdcb0643fd437f7c47c51d4c2ce750f74add8f
 DIST ohai-6.16.0.tgz 373480 SHA256 fcf2a1fef0d635a12be9826ad74008bce9ba74e7cb87415ba62e62f9c67f36d1 SHA512 1c379e5acf457e1d699148d1e6a355349472de2fb1ecf28af51fef36d4b4b47e75972452032f288010c3d3a92c7f1805923fbbbee715f1a3d4a198aa87f953c3 WHIRLPOOL 91e2dbe86bea382ac981365ec3ea8bb80bc04e0aeec8d66ef1c532df0a0a870c78d1add80dcbe151d02d65a7c7dc9c48981752ad35f72ac853330534bb3ee51e
 DIST ohai-6.18.0.tgz 378870 SHA256 27884e0fdd1efb07077c939030d43c361f64b94784cfb14dc5ad6cc2edf33e09 SHA512 270f84fb69474a1bc2fe5355d1343067af02e0a247fcae27df63e744450d231f517bfd7d576cee00fe6b85afd34bf7dc5ee3c938c2199a98494484d4b92381a5 WHIRLPOOL b8d870308c89b5897fcc803b31294e2bc3503e30063011f2d76ab46b43d8d080cc6ceb0b545e7a890e129f1809380a0abfaf186ea081dd4d3dbbd235c4081a70
diff --git a/dev-ruby/ohai/ohai-0.6.12.ebuild b/dev-ruby/ohai/ohai-0.6.12.ebuild
deleted file mode 100644
index 7de21f977e6f..000000000000
--- a/dev-ruby/ohai/ohai-0.6.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-0.6.12.ebuild,v 1.4 2012/08/14 13:16:05 hollow Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ohai profiles your system and emits JSON"
-HOMEPAGE="http://wiki.opscode.com/display/chef/Ohai"
-SRC_URI="https://github.com/opscode/${PN}/tarball/${PV} -> ${P}.tgz"
-RUBY_S="opscode-${PN}-*"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# specs have issues with multiple ruby versions
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/ipaddress
-	dev-ruby/yajl-ruby
-	dev-ruby/mixlib-cli
-	dev-ruby/mixlib-config
-	dev-ruby/mixlib-log
-	>=dev-ruby/systemu-2.2.0"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	# Be more lenient to work with versions of systemu that we have in
-	# the tree.
-	sed -i -e 's/~> 2.2.0/>= 2.2.0/' ohai.gemspec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman docs/man/man1/ohai.1
-}
diff --git a/dev-ruby/ohai/ohai-6.14.0-r1.ebuild b/dev-ruby/ohai/ohai-6.14.0-r1.ebuild
deleted file mode 100644
index 05e6e03d039a..000000000000
--- a/dev-ruby/ohai/ohai-6.14.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.14.0-r1.ebuild,v 1.2 2012/08/14 13:16:05 hollow Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ohai profiles your system and emits JSON"
-HOMEPAGE="http://wiki.opscode.com/display/chef/Ohai"
-SRC_URI="https://github.com/opscode/${PN}/tarball/${PV} -> ${P}.tgz"
-RUBY_S="opscode-${PN}-*"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# specs have issues with multiple ruby versions
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/ipaddress
-	dev-ruby/yajl-ruby
-	dev-ruby/mixlib-cli
-	dev-ruby/mixlib-config
-	dev-ruby/mixlib-log
-	>=dev-ruby/systemu-2.2.0"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	# Be more lenient to work with versions of systemu that we have in
-	# the tree.
-	sed -i -e 's/~> 2.2.0/>= 2.2.0/' ohai.gemspec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman docs/man/man1/ohai.1
-}
diff --git a/dev-ruby/racc/racc-1.4.9.ebuild b/dev-ruby/racc/racc-1.4.9.ebuild
index 89991c4b0fd7..0213ee28f7bd 100644
--- a/dev-ruby/racc/racc-1.4.9.ebuild
+++ b/dev-ruby/racc/racc-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.9.ebuild,v 1.5 2013/09/01 14:46:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.9.ebuild,v 1.6 2013/09/05 15:46:51 jer Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.loveruby.net/en/racc.html"
 LICENSE="LGPL-2.1"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/dev-ruby/rake/rake-0.9.6.ebuild b/dev-ruby/rake/rake-0.9.6.ebuild
index fe1f9a5056af..15e98f5fe7c5 100644
--- a/dev-ruby/rake/rake-0.9.6.ebuild
+++ b/dev-ruby/rake/rake-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.9.6.ebuild,v 1.4 2013/09/01 14:45:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.9.6.ebuild,v 1.5 2013/09/05 15:46:18 jer Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rake.rubyforge.org/"
 
 LICENSE="MIT"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="${DEPEND} app-arch/gzip"
diff --git a/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild b/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
index a72dc53bdbed..925ac57b0ade 100644
--- a/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild,v 1.3 2013/09/01 14:46:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild,v 1.4 2013/09/05 15:48:17 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 
 LICENSE="Ruby MIT"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 5951900831de..142abbef7b46 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,2 +1 @@
-DIST RMagick-2.13.1.tar.bz2 1185051 SHA256 0b119378c79bae697978b58a543dbffb79418ec15386c01beb847d224762ab8d SHA512 ad6a244426b0574a5c434caa4e25881e627196a623766e430e15ab158d893a623ead0f95670c0ca3485826bebad74e5e45665ac36c2a4b331abfc98a3a330798 WHIRLPOOL b7a4ddbaf4488f9b730313e5f0b2320944b3ecce6d8fa4dcae42f0b6139a897a7a3e7698e98240b0050d4b8b0ffd9c9aba2111f927f19a9321cb1c353a8ebe02
 DIST RMagick-2.13.2.tar.bz2 1208478 SHA256 a8c2df101549f74c66f687eceada6b703183234d7ce67dc84d85d16745a638e3 SHA512 b7e9111b9221467f827e57e1d3113d714dcc5cfd32483a2a3aefc5a59fe7f98efae612145db097c3837ef55c2acd0cdde6638a94ffb595a0fba412edeb469530 WHIRLPOOL 4d89bd1a1fa341b83b539437b8a4893f955d2b196e4469d106acb49b6eac28f6777a82e4120f6a88ffc06e0d2d84e40531f713cd39388584d70ff992422b2a75
diff --git a/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch b/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch
deleted file mode 100644
index d078fcd6319d..000000000000
--- a/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 70dfc29c883588a6bf7d609dd70193f3ce49509d
-Author: Omer Bar-or <omer@bar-or.org>
-Date:   Mon Feb 15 22:53:16 2010 -0800
-
-    Added check for MagickLibAddendum (replaced MagickLibSubversion).
-
-Applied minus a whitespace-only part that did not apply as-is.
-
-diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb
-index 6446d40..78a6260 100644
---- a/ext/RMagick/extconf.rb
-+++ b/ext/RMagick/extconf.rb
-@@ -233,6 +233,7 @@ have_func("snprintf", headers)
-    "LevelColorsImageChannel",        # 6.5.6-4
-    "LevelizeImageChannel",           # 6.4.2
-    "LiquidRescaleImage",             # 6.3.8-2
-+   "MagickLibAddendum",              # 6.5.9-1
-    "OpaquePaintImageChannel",        # 6.3.7-10
-    "QueueAuthenticPixels",           # 6.4.5-6
-    "RemapImage",                     # 6.4.4-0
-diff --git a/ext/RMagick/rmagick.h b/ext/RMagick/rmagick.h
-index e18a678..8aa6f3f 100644
---- a/ext/RMagick/rmagick.h
-+++ b/ext/RMagick/rmagick.h
-@@ -162,6 +162,13 @@
- #define DestroyConstitute(void) ConstituteComponentTerminus(void)
- #endif
- 
-+/** ImageMagick 6.5.9 replaced MagickLibSubversion with
-+ * MagickLibAddendum.
-+ */
-+#if defined(HAVE_MAGICKLIBADDENDUM)
-+#define MagickLibSubversion MagickLibAddendum
-+#endif
-+
- /** IM 6.4.1 replaced AllocateImage with AcquireImage.
-  * Both have the same signature.
-  */
diff --git a/dev-ruby/rmagick/rmagick-2.13.1-r1.ebuild b/dev-ruby/rmagick/rmagick-2.13.1-r1.ebuild
deleted file mode 100644
index f05ca01440b8..000000000000
--- a/dev-ruby/rmagick/rmagick-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.1-r1.ebuild,v 1.1 2013/01/23 18:34:27 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ree18 ruby19"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.html README-Mac-OSX.txt"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="http://rmagick.rubyforge.org/"
-SRC_URI="mirror://rubyforge/rmagick/RMagick-${PV}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-macos"
-IUSE="doc"
-
-# hdri causes extensive changes in the imagemagick internals, and
-# rmagick is not ready to deal with those, see bug 184356.
-RDEPEND=">=media-gfx/imagemagick-6.4.9:=[-hdri]"
-DEPEND="${RDEPEND}"
-
-RUBY_S="RMagick-${PV}"
-
-each_ruby_configure() {
-	pushd ext/RMagick
-	${RUBY} extconf.rb || die "extconf.rb failed"
-	popd
-}
-
-each_ruby_compile() {
-	pushd ext/RMagick
-	emake || die "emake failed"
-	popd
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_newins ext/RMagick/RMagick2$(get_modname) lib/RMagick2$(get_modname)
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die "failed to install examples"
-
-	if use doc ; then
-		dohtml -r doc || die "failed to install documentation"
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-2.13.1.ebuild b/dev-ruby/rmagick/rmagick-2.13.1.ebuild
deleted file mode 100644
index 9463a8d266b1..000000000000
--- a/dev-ruby/rmagick/rmagick-2.13.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.1.ebuild,v 1.10 2012/11/08 10:36:28 blueness Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ree18 ruby19"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.html README-Mac-OSX.txt"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="http://rmagick.rubyforge.org/"
-SRC_URI="mirror://rubyforge/rmagick/RMagick-${PV}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ppc64 x86 ~x86-macos"
-IUSE="doc"
-
-# hdri causes extensive changes in the imagemagick internals, and
-# rmagick is not ready to deal with those, see bug 184356.
-RDEPEND=">=media-gfx/imagemagick-6.4.9[-hdri]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/RMagick-${PV}"
-
-each_ruby_configure() {
-	pushd ext/RMagick
-	${RUBY} extconf.rb || die "extconf.rb failed"
-	popd
-}
-
-each_ruby_compile() {
-	pushd ext/RMagick
-	emake || die "emake failed"
-	popd
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_newins ext/RMagick/RMagick2$(get_modname) lib/RMagick2$(get_modname)
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die "failed to install examples"
-
-	if use doc ; then
-		dohtml -r doc || die "failed to install documentation"
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-2.13.2.ebuild b/dev-ruby/rmagick/rmagick-2.13.2.ebuild
index 71746310b1be..cd4d7eae9005 100644
--- a/dev-ruby/rmagick/rmagick-2.13.2.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.2.ebuild,v 1.5 2013/09/04 09:04:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.2.ebuild,v 1.6 2013/09/05 12:20:32 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ree18 ruby19"
@@ -18,7 +18,7 @@ SRC_URI="mirror://rubyforge/rmagick/RMagick-${PV}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ~ppc64 x86 ~x86-macos"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 x86 ~x86-macos"
 IUSE="doc"
 
 # hdri causes extensive changes in the imagemagick internals, and
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-1.1.8.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-1.1.8.ebuild
index 7a1abd8ee8c7..dcf0d8010969 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-1.1.8.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-glib2/ruby-glib2-1.1.8.ebuild,v 1.4 2013/08/17 10:38:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-glib2/ruby-glib2-1.1.8.ebuild,v 1.5 2013/09/05 12:35:14 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19"
@@ -8,7 +8,7 @@ USE_RUBY="ruby18 ree18 ruby19"
 inherit ruby-ng-gnome2
 
 DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 RDEPEND="${RDEPEND} >=dev-libs/glib-2"
 DEPEND="${DEPEND}
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index f6febf6a67df..59d9d9589028 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-ldap-0.9.12.gem 71680 SHA256 e1530586f9b528d6dd17a8cea49099c1b21d561f96490941cb6d0c9f42cb9798 SHA512 99aedf75fa8922481049a62616443899df7fce85b1b843a4f82b0fc992860f19bb3dba3836c0851e0a74a7c595fca7a044043400d01a064027147ec902b4c84d WHIRLPOOL a0ce15fceb5d42aed69b09b40eb7b0ab9eecfd3432431796a084b54d1eed720f856d5796bb87c68f5f6631c54519e09413b0bdb38ad304f257bc63b3836613f4
 DIST ruby-ldap-0.9.13.gem 63488 SHA256 9e382678b1f2f4cf36c7597889b00e667a5d27589ca5714ab02c106019b625c3 SHA512 637bd182d57b5405340a7dfef1c3a28e4b71037116626a550b9e731f524a253b3a3775673628d8dcc81e017e9ca1c844ed06bd0dfb00b455edc23acef01e2226 WHIRLPOOL c6307c38b3b9bba041aa9db1ba4d883ec5b5230bb04c20ffe2c62142b6cd145e4ea58468ddc9c91fdc77a34555358c9777b37f864b6efb030fa09b944721f74b
+DIST ruby-ldap-0.9.15.gem 65024 SHA256 a93cf09382ea523aa6557acdd1361d6ae3a721c740342c1c747251dce58895d6 SHA512 12b2b285952aa38f3b505c06e9df71f65c3d916b63c56a90858de5b24a8d12923c9f0330e0584ba6461026142f0bd23f58ab7203e73ff8b29636f5f742372ac0 WHIRLPOOL a901c13466e70528e52c97a916275973279e596527e8f87686962252b7ea2704a5ad4ab74514710300f039e9fa2b98368201d4d8cec9d617bb8cc8319101b3cc
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.15.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.15.ebuild
new file mode 100644
index 000000000000..053a507b9252
--- /dev/null
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.15.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-ldap/ruby-ldap-0.9.15.ebuild,v 1.1 2013/09/06 05:42:20 graaff Exp $
+
+EAPI=5
+# jruby: mkmf
+# rbx: require 'ldap' no such file to load
+USE_RUBY="ruby18 ruby19 ruby20"
+
+inherit multilib ruby-fakegem
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
+
+DESCRIPTION="A Ruby interface to some LDAP libraries"
+HOMEPAGE="http://ruby-ldap.sourceforge.net/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+IUSE="ssl"
+DEPEND=">=net-nds/openldap-2
+	dev-libs/cyrus-sasl
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+# Current test set is interactive due to certificate generation and requires
+# running LDAP daemon
+RESTRICT="test"
+
+each_ruby_configure() {
+	local myconf="--with-openldap2"
+	if ! use ssl ; then
+		myconf="${myconf} --without-libcrypto --without-libssl"
+	fi
+	${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
+	sed -i -e 's:-Wl,--no-undefined::' \
+		-e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 || die
+	cp ldap$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-1.3.1-r1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1-r1.ebuild
index 98ced22dde0d..77ea9e981b1a 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-1.3.1-r1.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.1-r1.ebuild,v 1.1 2013/05/31 18:29:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.1-r1.ebuild,v 1.2 2013/09/05 15:58:05 jer Exp $
 
 EAPI=2
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/parsetree-3*
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.0.6.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.0.6.ebuild
index 2a41c8299530..8f4819c891bc 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.0.6.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-2.0.6.ebuild,v 1.1 2013/07/29 02:58:40 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-2.0.6.ebuild,v 1.2 2013/09/05 15:58:05 jer Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild b/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
index 3fa73e144fc9..9e146076d652 100644
--- a/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild,v 1.1 2013/05/31 18:14:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild,v 1.2 2013/09/05 15:55:20 jer Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://parsetree.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Restrict tests because the test case does not load the right version
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild
index 8ca3254d8967..c4409fad281b 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild,v 1.3 2013/05/31 18:14:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild,v 1.4 2013/09/05 15:55:20 jer Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4
diff --git a/dev-ruby/rubygems/rubygems-2.0.3.ebuild b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
index 4b6a17e44983..fdf8b3803ae5 100644
--- a/dev-ruby/rubygems/rubygems-2.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.5 2013/09/01 14:45:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.6 2013/09/05 15:49:15 jer Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~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 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 16f4a1440dff..8cb18b51f789 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,6 +1,3 @@
-DIST sexp_processor-3.0.5.gem 14848 SHA256 8e06c84ed3a0159a0f2e6f7b10bbd056954ac2d33548318ccc3088556c8a8891 SHA512 b81de61a5f47e1832688361c195eddac1bc380828b00300e56a6323a1efd1358498feae396ec3c5858412be4411ce57dfb2c647df64b2ac2cf8865e5e4e6dea5 WHIRLPOOL d5797d9773801e35d04b81fb8ff36e1f2afa3cb895e902b12166020c50ed0440819992f78d95d049e3960c61b5b4b465321688d23cf526d9b7f2628a65c8fefa
 DIST sexp_processor-3.2.0.gem 35328 SHA256 5951f8d33ede2f68686c701142c6cc1004d6f525b0aa8e8279a1bf075542b0f0 SHA512 1a0330dcccf36ededcba07f0dccecb9964277c82541b66c416f3fc6513da3a785597f22115f7434a0a95401a334740620a734e1a6f71b73b4f0152c88b641c2c WHIRLPOOL 47f7256ffa199d862068886493ec95487ebe6003f60f6c66d16f99e7a9659bed7538d5bc2b2c5966dbfd33defd55eba6ccbf723a0cad4bfdf0519599aa1124c8
-DIST sexp_processor-4.0.1.gem 34816 SHA256 efd33857c0f41a413ec3ea20251f43c4826fe8a11b01099335f4a3b6777eb727 SHA512 281716fdc183bc7a7b26ae2ab7ca1cbe99a2437e97dce0346e0c0a37f0d0dedf5acc1097dd44dd241f3136aecff4b7a6ad4b4f7c12736400cfe3d8569b3b739a WHIRLPOOL aa05d13a4678a86ccf05786553ae81d56ccbf5500e09d9343fc71f7aabc75d895bdcca96f09ffd0c011be66adba35256c99106f59d57f8e8d5744eb3d22feedc
-DIST sexp_processor-4.1.3.gem 34816 SHA256 d02f1465c7f012f77a61abdaa841a5273a2277247bc143bfa11cf139a29dbdf8 SHA512 889bf7f5b3b822f96b4a8d432696d0e1e0cf4de8cfdc98b739e9abce2be599b7e157a6b654dc3bff0b7b333fbab9ff82f82326131d051c33346fe3aa65e9dce0 WHIRLPOOL db172ffad3859f68a62f4e0231345b90a61b4b6ce22e4f5476fb4af459c099b2356283a7f1ee404f89a90a339dffd9e6726a3e9277867072110545e8953d1773
 DIST sexp_processor-4.2.1.gem 35328 SHA256 dfc3eef6ef13c5750c3faab782c4db6c74a7bcc5d03e56e4edeec21aab034185 SHA512 9dd079dbd374d33e1bfa0e4002946993e355425281873e612667feeb2f521f8eceab22d6f68b5b2a8063dd94f0661ab2a583f212f22c1322d4dfa1bff063d4a7 WHIRLPOOL 586fe27770a3fd6747c66aad14cfd1311faae83b55ed5f057f285721c7a4a756174fcb3b0db91d17aee351a0c082bb82371d72b3c2d0ca1c0d7926fba6b9ba8c
 DIST sexp_processor-4.3.0.gem 35328 SHA256 7accb37900d1599c6f0f40be92bc62a5db4e5a7eb64f33a858cf83e798dd1ddc SHA512 7327d329a5f9e02869d3438c1ab00212037aaa3ae68a368be1b9b9a37304f17bf727501fc5dec5a340ccc4f8a3f77e3b5d5b1ec78ec5a6d1c786a3f0ea146fa9 WHIRLPOOL 473c33053fb02ba772166f271d2219bf9887b15086eae8a220dc2165eaec8301c3d04ec91802b77828b7dc3f5cc144ff197af00921894aca844583213097d7ef
diff --git a/dev-ruby/sexp_processor/sexp_processor-3.0.5.ebuild b/dev-ruby/sexp_processor/sexp_processor-3.0.5.ebuild
deleted file mode 100644
index 95b3ea0f8fcf..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-3.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-3.0.5.ebuild,v 1.4 2013/01/15 06:00:01 zerochaos Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project."
-HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? (
-		dev-ruby/hoe
-		dev-ruby/hoe-seattlerb
-	)
-	test? (
-		dev-ruby/hoe
-		dev-ruby/hoe-seattlerb
-		dev-ruby/minitest
-	)"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.0.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.0.1.ebuild
deleted file mode 100644
index c08dab4c192c..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-4.0.1.ebuild,v 1.2 2013/01/15 06:00:01 zerochaos Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project."
-HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/hoe
-		dev-ruby/hoe-seattlerb
-		dev-ruby/minitest
-	)"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.1.3.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.1.3.ebuild
deleted file mode 100644
index dd2dea5fe198..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-4.1.3.ebuild,v 1.2 2013/01/15 06:00:01 zerochaos Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project."
-HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/hoe
-		dev-ruby/hoe-seattlerb
-		dev-ruby/minitest
-	)"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.2.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.2.1.ebuild
index 99a3120a244b..ea9d958611df 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.2.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-4.2.1.ebuild,v 1.1 2013/04/19 05:34:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-4.2.1.ebuild,v 1.2 2013/09/05 15:54:50 jer Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/shorturl/shorturl-1.0.0.ebuild b/dev-ruby/shorturl/shorturl-1.0.0.ebuild
index 3b45192923f9..c4e0d51a2129 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0.ebuild,v 1.1 2013/04/19 05:38:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shorturl/shorturl-1.0.0.ebuild,v 1.2 2013/09/05 13:55:11 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://shorturl.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild b/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
index 983a0c187ac8..a41a82e40e86 100644
--- a/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
+++ b/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild,v 1.2 2012/05/01 18:24:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild,v 1.4 2013/09/05 13:56:28 ago Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -16,7 +16,7 @@ HOMEPAGE="http://rubyforge.org/projects/tmail/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 # Tests seem to be broken with the new encoding handling from Ruby,
diff --git a/dev-ruby/uconv/uconv-0.6.1.ebuild b/dev-ruby/uconv/uconv-0.6.1.ebuild
index f21be32a1a5f..4fc6529067b6 100644
--- a/dev-ruby/uconv/uconv-0.6.1.ebuild
+++ b/dev-ruby/uconv/uconv-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uconv/uconv-0.6.1.ebuild,v 1.2 2013/08/26 16:57:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uconv/uconv-0.6.1.ebuild,v 1.3 2013/09/05 12:35:00 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.yoshidam.net/Ruby.html#uconv"
 SRC_URI="http://www.yoshidam.net/${P}.tar.gz"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 IUSE=""
 
 RUBY_S=${PN}
diff --git a/dev-ruby/xml-simple/Manifest b/dev-ruby/xml-simple/Manifest
index c12607bdf834..d5c835fd25a7 100644
--- a/dev-ruby/xml-simple/Manifest
+++ b/dev-ruby/xml-simple/Manifest
@@ -1,2 +1 @@
-DIST xml-simple-1.1.1.gem 10752 SHA256 f1a005b0c5d0f7cd907a2aedd236f4785de59219ef2b7584a885d4bb27fa9c7e SHA512 1b8c49d9b68b45067df132b43a870ee77d6d17810219bfd90b1420c32652a589765bc48cc44a40cf2147bfec08227a084b1ab2473eb595a61054a315aaf0ad55 WHIRLPOOL 16da94f72b8af0bcab64b3286f09b5261ea336c8587687fc739d8e8715c25617b56ed64c75adb85cee19989168249efcb79cc952688b5ff2731e3359c123124d
 DIST xml-simple-1.1.2.gem 10752 SHA256 ab35af3264c9c7e4090dc8302914eec4f7eac3fd526847d82d53d023e762285a SHA512 ad2bb25c8ca938d59529b0f510a68093e358f2b6e6871e0ed4452ef3e20c33656044ad9859b19fe403622f5f1ac0ac5a3ff4e6f2361273f907d69e5c64fb3cdd WHIRLPOOL 8ce226f0930619307f0fe6b5587de9f404736674cf0594e72747af65f645a50c2bb2d1fb17144b8290f8738259692bc26042db11e92d0f6c233e1af15e56e1ee
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.1.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.1.ebuild
deleted file mode 100644
index c2e04ce54200..000000000000
--- a/dev-ruby/xml-simple/xml-simple-1.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/xml-simple/xml-simple-1.1.1.ebuild,v 1.3 2012/09/27 09:27:17 ssuominen Exp $
-
-EAPI=2
-USE_RUBY="ruby18 jruby ree18"
-
-# Gem only contains lib code, and no easily accessible upstream repository.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easy API to maintain XML. It is a Ruby port of Grant McLean's Perl module XML::Simple."
-HOMEPAGE="http://rubyforge.org/projects/xml-simple/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.2.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.2.ebuild
index 0800ee7c7a69..6dffa5b93d7f 100644
--- a/dev-ruby/xml-simple/xml-simple-1.1.2.ebuild
+++ b/dev-ruby/xml-simple/xml-simple-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/xml-simple/xml-simple-1.1.2.ebuild,v 1.1 2012/11/07 06:53:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/xml-simple/xml-simple-1.1.2.ebuild,v 1.2 2013/09/05 13:55:30 ago Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby ree18"
@@ -16,5 +16,5 @@ HOMEPAGE="http://rubyforge.org/projects/xml-simple/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
diff --git a/dev-tcltk/snack/snack-2.2.10-r6.ebuild b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
index 4accaff7d1d5..4f65a74a7986 100644
--- a/dev-tcltk/snack/snack-2.2.10-r6.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r6.ebuild,v 1.1 2013/01/25 08:10:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/snack/snack-2.2.10-r6.ebuild,v 1.2 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit autotools autotools-utils distutils-r1 multilib
 
diff --git a/dev-tex/dot2tex/dot2tex-2.8.7-r1.ebuild b/dev-tex/dot2tex/dot2tex-2.8.7-r1.ebuild
index 3648aa74ceea..dbcaf8f459c1 100644
--- a/dev-tex/dot2tex/dot2tex-2.8.7-r1.ebuild
+++ b/dev-tex/dot2tex/dot2tex-2.8.7-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/dot2tex/dot2tex-2.8.7-r1.ebuild,v 1.1 2013/02/04 14:04:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/dot2tex/dot2tex-2.8.7-r1.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/dev-util/biew/biew-6.1.0-r3.ebuild b/dev-util/biew/biew-6.1.0-r3.ebuild
new file mode 100644
index 000000000000..df7d87f7d6a2
--- /dev/null
+++ b/dev-util/biew/biew-6.1.0-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-6.1.0-r3.ebuild,v 1.1 2013/09/05 16:21:34 xmw Exp $
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs versionator
+
+MY_P=${PN}-$(replace_all_version_separators "")
+
+DESCRIPTION="A portable viewer of binary files, hexadecimal and disassembler modes."
+HOMEPAGE="http://beye.sourceforge.net/"
+SRC_URI="mirror://sourceforge/beye/${PV}/${MY_P}-src.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpm mmx sse"
+REQUIRED_USE="mmx sse"
+
+RDEPEND="gpm? ( sys-libs/gpm )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	append-flags -mmmx -msse #362043
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-610-fix_localedep-1.patch"
+	epatch "${FILESDIR}/${PN}-610-portable_configure-1.patch"
+	epatch "${FILESDIR}/${PN}-610-crash.patch"
+	sed -i -e 's^man/man1/biew.1^share/man/man1/biew.1^' makefile || die "Failed to edit makefile."
+}
+
+src_configure() {
+	if use gpm; then
+		append-cppflags -DHAVE_MOUSE
+	else
+		append-cppflags -UHAVE_MOUSE
+	fi
+	./configure --datadir=/usr/share/${PN} \
+		--prefix=/usr \
+		--cc="$(tc-getCC)" \
+		--ld="$(tc-getCC)" \
+		--ar="$(tc-getAR) -rcu" \
+		--as="$(tc-getAS)" \
+		--ranlib="$(tc-getRANLIB)" || die "configure failed."
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/{biew_en,release,unix}.txt
+}
+
+pkg_postinst() {
+	elog
+	elog "Note: if you are upgrading from <=dev-util/biew-6.1.0 you will need"
+	elog "to change the paths in the setup dialog (F9) from /usr/share/ to"
+	elog "/usr/share/biew/ Alternatively, you can delete ~/.biewrc and it will"
+	elog "automatically determine the correct locations on the next run."
+	elog
+}
diff --git a/dev-util/cdiff/cdiff-0.6.ebuild b/dev-util/cdiff/cdiff-0.6.ebuild
index 01f0df7556fa..2590f0c20435 100644
--- a/dev-util/cdiff/cdiff-0.6.ebuild
+++ b/dev-util/cdiff/cdiff-0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.6.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.6.ebuild,v 1.3 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
diff --git a/dev-util/cdiff/cdiff-0.7.1.ebuild b/dev-util/cdiff/cdiff-0.7.1.ebuild
index caa4533954d4..76dbfc14c45a 100644
--- a/dev-util/cdiff/cdiff-0.7.1.ebuild
+++ b/dev-util/cdiff/cdiff-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.1.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.1.ebuild,v 1.3 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
diff --git a/dev-util/cdiff/cdiff-0.7.ebuild b/dev-util/cdiff/cdiff-0.7.ebuild
index 526c024f9f26..4c8b10fb9e29 100644
--- a/dev-util/cdiff/cdiff-0.7.ebuild
+++ b/dev-util/cdiff/cdiff-0.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.7.ebuild,v 1.3 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
diff --git a/dev-util/cdiff/cdiff-0.8.ebuild b/dev-util/cdiff/cdiff-0.8.ebuild
index 65e0205e22aa..aae9ab13337c 100644
--- a/dev-util/cdiff/cdiff-0.8.ebuild
+++ b/dev-util/cdiff/cdiff-0.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.8.ebuild,v 1.2 2013/05/16 16:45:05 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.8.ebuild,v 1.3 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
diff --git a/dev-util/cdiff/cdiff-0.9.1.ebuild b/dev-util/cdiff/cdiff-0.9.1.ebuild
index 9b9fb1d30093..114e4b67fbb8 100644
--- a/dev-util/cdiff/cdiff-0.9.1.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.1.ebuild,v 1.3 2013/06/25 12:51:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.1.ebuild,v 1.4 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
diff --git a/dev-util/cdiff/cdiff-0.9.2.ebuild b/dev-util/cdiff/cdiff-0.9.2.ebuild
index a6b6e885ae47..a231a2b623be 100644
--- a/dev-util/cdiff/cdiff-0.9.2.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.2.ebuild,v 1.4 2013/08/28 11:13:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.2.ebuild,v 1.5 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
diff --git a/dev-util/cdiff/cdiff-0.9.ebuild b/dev-util/cdiff/cdiff-0.9.ebuild
index 9c86d08bcfdf..5daca76dccde 100644
--- a/dev-util/cdiff/cdiff-0.9.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.ebuild,v 1.4 2013/05/16 16:45:05 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.ebuild,v 1.5 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
diff --git a/dev-util/coccigrep/coccigrep-1.12.ebuild b/dev-util/coccigrep/coccigrep-1.12.ebuild
index 8cc7b5a56717..b38c692ff08d 100644
--- a/dev-util/coccigrep/coccigrep-1.12.ebuild
+++ b/dev-util/coccigrep/coccigrep-1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/coccigrep/coccigrep-1.12.ebuild,v 1.1 2012/12/23 04:49:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccigrep/coccigrep-1.12.ebuild,v 1.2 2013/09/05 18:40:35 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 elisp-common vcs-snapshot
 
diff --git a/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild b/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild
index 7ed44051fdac..25d656dffc06 100644
--- a/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild,v 1.3 2013/08/19 14:05:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc17.ebuild,v 1.4 2013/09/05 18:40:37 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common autotools
 
diff --git a/dev-util/cppcheck/cppcheck-1.59-r1.ebuild b/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
index 993aa1878256..759a753879d8 100644
--- a/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.59-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.59-r1.ebuild,v 1.2 2013/05/28 21:49:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.59-r1.ebuild,v 1.3 2013/09/05 18:40:37 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
diff --git a/dev-util/cppcheck/cppcheck-1.60.1.ebuild b/dev-util/cppcheck/cppcheck-1.60.1.ebuild
index cd7f45cb1939..ad53eead2a98 100644
--- a/dev-util/cppcheck/cppcheck-1.60.1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.60.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.60.1.ebuild,v 1.1 2013/06/13 13:14:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.60.1.ebuild,v 1.2 2013/09/05 18:40:37 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 eutils qt4-r2 toolchain-funcs
 
diff --git a/dev-util/dwarves/dwarves-1.10-r1.ebuild b/dev-util/dwarves/dwarves-1.10-r1.ebuild
index c640afaa23f1..63c0ca1ea67d 100644
--- a/dev-util/dwarves/dwarves-1.10-r1.ebuild
+++ b/dev-util/dwarves/dwarves-1.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.10-r1.ebuild,v 1.1 2013/03/03 15:12:43 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwarves/dwarves-1.10-r1.ebuild,v 1.2 2013/09/05 18:40:36 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit multilib cmake-utils python-single-r1
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
diff --git a/dev-util/fatrace/fatrace-0.5.ebuild b/dev-util/fatrace/fatrace-0.5.ebuild
index b436042e0afc..e9f3ce5a9da3 100644
--- a/dev-util/fatrace/fatrace-0.5.ebuild
+++ b/dev-util/fatrace/fatrace-0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fatrace/fatrace-0.5.ebuild,v 1.1 2013/04/21 07:44:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fatrace/fatrace-0.5.ebuild,v 1.2 2013/09/05 18:40:35 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
 
 inherit linux-info python-single-r1 toolchain-funcs
 
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild
index aced766b48d1..5f79609874f9 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild,v 1.10 2013/09/02 11:13:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild,v 1.11 2013/09/05 18:39:23 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome.org distutils-r1
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r2.ebuild
index 93530f674fb6..3c7d7b3f9c2c 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r2.ebuild,v 1.1 2013/09/01 21:56:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r2.ebuild,v 1.2 2013/09/05 18:39:23 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome.org distutils-r1
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
index 667959bd0de2..7437f45999a8 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild,v 1.10 2012/10/14 14:50:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4.ebuild,v 1.11 2013/09/05 18:39:23 mgorny Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT="python2_5 python2_6 python2_7 python3_1 python3_2"
+PYTHON_COMPAT="python2_6 python2_7 python3_2"
 PYTHON_USE="xml"
 
 inherit eutils gnome.org python-distutils-ng
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.34.3-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.34.3-r1.ebuild
index 7ef3f3b4c7ff..f930fcf32c0e 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.34.3-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.34.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.34.3-r1.ebuild,v 1.1 2013/09/01 21:56:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.34.3-r1.ebuild,v 1.2 2013/09/05 18:39:23 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome.org distutils-r1
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.34.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.34.3.ebuild
index b06d7729231f..373ba64ed63b 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.34.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.34.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.34.3.ebuild,v 1.5 2013/08/15 09:54:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.34.3.ebuild,v 1.6 2013/09/05 18:39:23 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome.org distutils-r1
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.36.4-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.36.4-r1.ebuild
index a7e6b796e1cd..59368844142c 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.36.4-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.36.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.36.4-r1.ebuild,v 1.1 2013/09/01 21:56:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.36.4-r1.ebuild,v 1.2 2013/09/05 18:39:23 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome.org distutils-r1
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.36.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.36.4.ebuild
index 433c1dfb1e37..aff1e0e7caca 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.36.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.36.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.36.4.ebuild,v 1.1 2013/08/16 10:42:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.36.4.ebuild,v 1.2 2013/09/05 18:39:23 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome.org distutils-r1
diff --git a/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
index fee581bf5d84..c47037f5750f 100644
--- a/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild,v 1.2 2013/06/16 13:29:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild,v 1.3 2013/09/05 18:40:36 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='xml'
 
 inherit eutils python-r1 python-utils-r1
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.16.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.16.ebuild
index a839b21e44d4..2de445a5dde5 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.16.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.16.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.16.ebuild,v 1.13 2013/06/30 15:14:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.16.ebuild,v 1.14 2013/09/05 18:40:35 mgorny Exp $
 
 EAPI="5"
 
 GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome.org python-single-r1
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.19.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.19.ebuild
index 44d1feee42bc..49650cee56d9 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.19.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.19.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.19.ebuild,v 1.2 2013/06/30 15:14:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.19.ebuild,v 1.3 2013/09/05 18:40:35 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome.org python-single-r1
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.20.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.20.ebuild
index cab68c7a00b4..f912ee85a422 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.20.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.20.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.20.ebuild,v 1.1 2013/07/07 13:04:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.20.ebuild,v 1.2 2013/09/05 18:40:35 mgorny Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome.org python-single-r1
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.19.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.19.ebuild
index 0ac4794059e8..2111f2252e11 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.19.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.19.ebuild,v 1.9 2013/09/04 09:00:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc-am/gtk-doc-am-1.19.ebuild,v 1.10 2013/09/05 13:25:21 ago Exp $
 
 EAPI=5
 GNOME_ORG_MODULE="gtk-doc"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6"
diff --git a/dev-util/gtk-doc/gtk-doc-1.19.ebuild b/dev-util/gtk-doc/gtk-doc-1.19.ebuild
index 423a7808de7c..3e29c8fe1365 100644
--- a/dev-util/gtk-doc/gtk-doc-1.19.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.19.ebuild,v 1.8 2013/09/04 08:59:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.19.ebuild,v 1.9 2013/09/05 13:25:13 ago Exp $
 
 EAPI=5
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug doc emacs highlight vim test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/rbtools/rbtools-0.5.1.ebuild b/dev-util/rbtools/rbtools-0.5.1.ebuild
index cfb2d64f0d89..67ae5768cab4 100644
--- a/dev-util/rbtools/rbtools-0.5.1.ebuild
+++ b/dev-util/rbtools/rbtools-0.5.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.5.1.ebuild,v 1.3 2013/08/07 13:20:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.5.1.ebuild,v 1.4 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-util/scons/scons-2.2.0-r1.ebuild b/dev-util/scons/scons-2.2.0-r1.ebuild
index 4156191daacc..b12fc042ba74 100644
--- a/dev-util/scons/scons-2.2.0-r1.ebuild
+++ b/dev-util/scons/scons-2.2.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.2.0-r1.ebuild,v 1.3 2013/02/21 03:14:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.2.0-r1.ebuild,v 1.4 2013/09/05 18:40:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-util/synopsis/synopsis-0.13.ebuild b/dev-util/synopsis/synopsis-0.13.ebuild
index 2b80b38ec062..2d3e8ea80f1c 100644
--- a/dev-util/synopsis/synopsis-0.13.ebuild
+++ b/dev-util/synopsis/synopsis-0.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/synopsis-0.13.ebuild,v 1.3 2012/12/17 19:53:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/synopsis-0.13.ebuild,v 1.4 2013/09/05 18:40:36 mgorny Exp $
 
 EAPI=5
 DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1 multilib toolchain-funcs
 
diff --git a/dev-util/umockdev/umockdev-0.3.2.ebuild b/dev-util/umockdev/umockdev-0.3.2.ebuild
index 439233a67fb6..4f1fe5558f8b 100644
--- a/dev-util/umockdev/umockdev-0.3.2.ebuild
+++ b/dev-util/umockdev/umockdev-0.3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/umockdev/umockdev-0.3.2.ebuild,v 1.1 2013/07/21 09:19:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/umockdev/umockdev-0.3.2.ebuild,v 1.2 2013/09/05 18:40:36 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-any-r1 autotools-utils
 
diff --git a/dev-util/umockdev/umockdev-0.4.1.ebuild b/dev-util/umockdev/umockdev-0.4.1.ebuild
index 93fbd92e0253..44966538905e 100644
--- a/dev-util/umockdev/umockdev-0.4.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/umockdev/umockdev-0.4.1.ebuild,v 1.1 2013/07/31 05:54:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/umockdev/umockdev-0.4.1.ebuild,v 1.2 2013/09/05 18:40:36 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-any-r1 autotools-utils
 
diff --git a/dev-util/umockdev/umockdev-0.4.3.ebuild b/dev-util/umockdev/umockdev-0.4.3.ebuild
index 49f40f9a2fde..fb2a892283f0 100644
--- a/dev-util/umockdev/umockdev-0.4.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.4.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/umockdev/umockdev-0.4.3.ebuild,v 1.1 2013/08/27 07:10:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/umockdev/umockdev-0.4.3.ebuild,v 1.2 2013/09/05 18:40:36 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-any-r1 autotools-utils
 
diff --git a/dev-vcs/git-bz/git-bz-0.12.12.15.ebuild b/dev-vcs/git-bz/git-bz-0.12.12.15.ebuild
index bd04bdfd81fb..c721a4684c50 100644
--- a/dev-vcs/git-bz/git-bz-0.12.12.15.ebuild
+++ b/dev-vcs/git-bz/git-bz-0.12.12.15.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-bz/git-bz-0.12.12.15.ebuild,v 1.4 2013/08/07 11:38:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-bz/git-bz-0.12.12.15.ebuild,v 1.5 2013/09/05 18:42:26 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit python-r1
 
diff --git a/dev-vcs/git-bz/git-bz-9999.ebuild b/dev-vcs/git-bz/git-bz-9999.ebuild
index 2973d4e057cb..8941b92a2840 100644
--- a/dev-vcs/git-bz/git-bz-9999.ebuild
+++ b/dev-vcs/git-bz/git-bz-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-bz/git-bz-9999.ebuild,v 1.5 2013/08/07 11:38:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-bz/git-bz-9999.ebuild,v 1.6 2013/09/05 18:42:26 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit python-r1
 
diff --git a/dev-vcs/mercurial/mercurial-2.5.4.ebuild b/dev-vcs/mercurial/mercurial-2.5.4.ebuild
index 0f650701bc55..33b05836942a 100644
--- a/dev-vcs/mercurial/mercurial-2.5.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.5.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.4.ebuild,v 1.2 2013/07/26 10:54:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.4.ebuild,v 1.3 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
diff --git a/dev-vcs/mercurial/mercurial-2.6.3.ebuild b/dev-vcs/mercurial/mercurial-2.6.3.ebuild
index 489cd0bb58b6..5c7edcc24b5b 100644
--- a/dev-vcs/mercurial/mercurial-2.6.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.6.3.ebuild,v 1.2 2013/07/26 10:54:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.6.3.ebuild,v 1.3 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
diff --git a/dev-vcs/mercurial/mercurial-2.7.ebuild b/dev-vcs/mercurial/mercurial-2.7.ebuild
index 4a106f775457..75e12223d74e 100644
--- a/dev-vcs/mercurial/mercurial-2.7.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.7.ebuild,v 1.1 2013/08/11 21:34:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.7.ebuild,v 1.2 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 57f3063e2a4d..5e7b1de0f4ed 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.20 2013/07/26 10:54:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.21 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic
diff --git a/dev-vcs/subversion/subversion-1.7.11.ebuild b/dev-vcs/subversion/subversion-1.7.11.ebuild
index 412557178792..30424c26568c 100644
--- a/dev-vcs/subversion/subversion-1.7.11.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.11.ebuild,v 1.10 2013/08/18 20:52:45 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.11.ebuild,v 1.11 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 MY_P="${P/_/-}"
diff --git a/dev-vcs/subversion/subversion-1.7.13.ebuild b/dev-vcs/subversion/subversion-1.7.13.ebuild
index 032f9a46527a..86b2f8ba5a33 100644
--- a/dev-vcs/subversion/subversion-1.7.13.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.13.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.13.ebuild,v 1.5 2013/09/05 10:43:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.13.ebuild,v 1.6 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 MY_P="${P/_/-}"
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.7.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.7.2.ebuild
index 108eb6d6e8a8..1dd4d7432856 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.7.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.7.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.7.2.ebuild,v 1.1 2013/05/03 07:46:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.7.2.ebuild,v 1.2 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild
index e1c71b68b0b3..77ecbf53eb40 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild,v 1.1 2013/07/15 06:54:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.8.2.ebuild,v 1.2 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.9.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.9.ebuild
index 8c4135a11c3f..9b3401dbe653 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.9.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.9.ebuild,v 1.1 2013/08/11 21:35:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.9.ebuild,v 1.2 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 1ecc12fa8426..55e85b1bcbed 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.21 2013/05/23 13:48:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.22 2013/09/05 18:42:25 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 eutils
 
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index be6862fbe610..121875033710 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.30 2013/01/09 17:26:55 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.31 2013/09/05 20:39:41 mgorny Exp $
 
 # @ECLASS: git-2.eclass
 # @MAINTAINER:
@@ -11,6 +11,16 @@
 # Eclass for easing maitenance of live ebuilds using git as remote repository.
 # Eclass support working with git submodules and branching.
 
+# @ECLASS-VARIABLE: EGIT_USE_GIT_R3
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Use git-r3 backend instead of classic git-2 behavior. This is intended
+# for early testing of git-r3 and is to be set in make.conf.
+
+if [[ ${EGIT_USE_GIT_R3} ]]; then
+	inherit git-r3
+fi
+
 # This eclass support all EAPIs
 EXPORT_FUNCTIONS src_unpack
 
@@ -572,23 +582,66 @@ git-2_cleanup() {
 	unset EGIT_LOCAL_NONBARE
 }
 
+git-2_r3_wrapper() {
+	ewarn "Using git-r3 backend in git-2. Not everything is supported."
+	ewarn "Expect random failures and have fun testing."
+
+	if [[ ${EGIT_SOURCEDIR} ]]; then
+		EGIT_CHECKOUT_DIR=${EGIT_SOURCEDIR}
+		unset EGIT_SOURCEDIR
+	fi
+
+	if [[ ${EGIT_MASTER} ]]; then
+		: ${EGIT_BRANCH:=${EGIT_MASTER}}
+		unset EGIT_MASTER
+	fi
+
+	if [[ ${EGIT_HAS_SUBMODULES} ]]; then
+		unset EGIT_HAS_SUBMODULES
+	fi
+
+	if [[ ${EGIT_PROJECT} ]]; then
+		unset EGIT_PROJECT
+	fi
+
+	local boots unp
+	if [[ ${EGIT_NOUNPACK} ]]; then
+		unp=1
+		unset EGIT_NOUNPACK
+	fi
+
+	if [[ ${EGIT_BOOTSTRAP} ]]; then
+		boots=1
+		unset EGIT_BOOTSTRAP
+	fi
+
+	git-r3_src_unpack
+
+	[[ ${boots} ]] && EGIT_BOOTSTRAP=${boots} git-2_bootstrap
+	[[ ${unp} ]] && EGIT_NOUNPACK=1
+}
+
 # @FUNCTION: git-2_src_unpack
 # @DESCRIPTION:
 # Default git src_unpack function.
 git-2_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	git-2_init_variables
-	git-2_prepare_storedir
-	git-2_migrate_repository
-	git-2_fetch "$@"
-	git-2_gc
-	git-2_submodules
-	git-2_move_source
-	git-2_branch
-	git-2_bootstrap
-	git-2_cleanup
-	echo ">>> Unpacked to ${EGIT_SOURCEDIR}"
+	if [[ ${EGIT_USE_GIT_R3} ]]; then
+		git-2_r3_wrapper
+	else
+		git-2_init_variables
+		git-2_prepare_storedir
+		git-2_migrate_repository
+		git-2_fetch "$@"
+		git-2_gc
+		git-2_submodules
+		git-2_move_source
+		git-2_branch
+		git-2_bootstrap
+		git-2_cleanup
+		echo ">>> Unpacked to ${EGIT_SOURCEDIR}"
+	fi
 
 	# Users can specify some SRC_URI and we should
 	# unpack the files too.
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
new file mode 100644
index 000000000000..85852522ec57
--- /dev/null
+++ b/eclass/git-r3.eclass
@@ -0,0 +1,590 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.2 2013/09/05 22:40:12 mgorny Exp $
+
+# @ECLASS: git-r3.eclass
+# @MAINTAINER:
+# Michał Górny <mgorny@gentoo.org>
+# @BLURB: Eclass for fetching and unpacking git repositories.
+# @DESCRIPTION:
+# Third generation eclass for easing maitenance of live ebuilds using
+# git as remote repository. The eclass supports lightweight (shallow)
+# clones and bare clones of submodules.
+
+case "${EAPI:-0}" in
+	0|1|2|3|4|5)
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
+esac
+
+if [[ ! ${_GIT_R3} ]]; then
+
+inherit eutils
+
+fi
+
+EXPORT_FUNCTIONS src_unpack
+
+if [[ ! ${_GIT_R3} ]]; then
+
+# @ECLASS-VARIABLE: EGIT3_STORE_DIR
+# @DESCRIPTION:
+# Storage directory for git sources.
+#
+# EGIT3_STORE_DIR=${DISTDIR}/git3-src
+
+# @ECLASS-VARIABLE: EGIT_REPO_URI
+# @REQUIRED
+# @DESCRIPTION:
+# URIs to the repository, e.g. git://foo, https://foo. If multiple URIs
+# are provided, the eclass will consider them as fallback URIs to try
+# if the first URI does not work.
+#
+# It can be overriden via env using ${PN}_LIVE_REPO variable.
+#
+# Example:
+# @CODE
+# EGIT_REPO_URI="git://a/b.git https://c/d.git"
+# @CODE
+
+# @ECLASS-VARIABLE: EVCS_OFFLINE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If non-empty, this variable prevents any online operations.
+
+# @ECLASS-VARIABLE: EGIT_BRANCH
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The branch name to check out. If unset, the upstream default (HEAD)
+# will be used.
+#
+# It can be overriden via env using ${PN}_LIVE_BRANCH variable.
+
+# @ECLASS-VARIABLE: EGIT_COMMIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The tag name or commit identifier to check out. If unset, newest
+# commit from the branch will be used. If set, EGIT_BRANCH will
+# be ignored.
+#
+# It can be overriden via env using ${PN}_LIVE_COMMIT variable.
+
+# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
+# @DESCRIPTION:
+# The directory to check the git sources out to.
+#
+# EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+
+# @ECLASS-VARIABLE: EGIT_NONSHALLOW
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Disable performing shallow fetches/clones. Shallow clones have
+# a fair number of limitations. Therefore, if you'd like the eclass to
+# perform complete clones instead, set this to a non-null value.
+#
+# This variable is to be set in make.conf. Ebuilds are not allowed
+# to set it.
+
+# @FUNCTION: _git-r3_env_setup
+# @INTERNAL
+# @DESCRIPTION:
+# Set the eclass variables as necessary for operation. This can involve
+# setting EGIT_* to defaults or ${PN}_LIVE_* variables.
+_git-r3_env_setup() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local esc_pn livevar
+	esc_pn=${PN//[-+]/_}
+
+	livevar=${esc_pn}_LIVE_REPO
+	EGIT_REPO_URI=${!livevar:-${EGIT_REPO_URI}}
+	[[ ${!livevar} ]] \
+		&& ewarn "Using ${livevar}, no support will be provided"
+
+	livevar=${esc_pn}_LIVE_BRANCH
+	EGIT_BRANCH=${!livevar:-${EGIT_BRANCH}}
+	[[ ${!livevar} ]] \
+		&& ewarn "Using ${livevar}, no support will be provided"
+
+	livevar=${esc_pn}_LIVE_COMMIT
+	EGIT_COMMIT=${!livevar:-${EGIT_COMMIT}}
+	[[ ${!livevar} ]] \
+		&& ewarn "Using ${livevar}, no support will be provided"
+
+	# Migration helpers. Remove them when git-2 is removed.
+
+	if [[ ${EGIT_SOURCEDIR} ]]; then
+		eerror "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR. While updating"
+		eerror "your ebuild, please check whether the variable is necessary at all"
+		eerror "since the default has been changed from \${S} to \${WORKDIR}/\${P}."
+		eerror "Therefore, proper setting of S may be sufficient."
+		die "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR."
+	fi
+
+	if [[ ${EGIT_MASTER} ]]; then
+		eerror "EGIT_MASTER has been removed. Instead, the upstream default (HEAD)"
+		eerror "is used by the eclass. Please remove the assignment or use EGIT_BRANCH"
+		eerror "as necessary."
+		die "EGIT_MASTER has been removed."
+	fi
+
+	if [[ ${EGIT_HAS_SUBMODULES} ]]; then
+		eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs"
+		eerror "to switch the clone type in order to support submodules and therefore"
+		eerror "submodules are detected and fetched automatically."
+		die "EGIT_HAS_SUBMODULES is no longer necessary."
+	fi
+
+	if [[ ${EGIT_PROJECT} ]]; then
+		eerror "EGIT_PROJECT has been removed. Instead, the eclass determines"
+		eerror "the local clone path using path in canonical EGIT_REPO_URI."
+		eerror "If the current algorithm causes issues for you, please report a bug."
+		die "EGIT_PROJECT is no longer necessary."
+	fi
+
+	if [[ ${EGIT_BOOTSTRAP} ]]; then
+		eerror "EGIT_BOOTSTRAP has been removed. Please create proper src_prepare()"
+		eerror "instead."
+		die "EGIT_BOOTSTRAP has been removed."
+	fi
+
+	if [[ ${EGIT_NOUNPACK} ]]; then
+		eerror "EGIT_NOUNPACK has been removed. The eclass no longer calls default"
+		eerror "unpack function. If necessary, please declare proper src_unpack()."
+		die "EGIT_NOUNPACK has been removed."
+	fi
+}
+
+# @FUNCTION: _git-r3_set_gitdir
+# @USAGE: <repo-uri>
+# @INTERNAL
+# @DESCRIPTION:
+# Obtain the local repository path and set it as GIT_DIR. Creates
+# a new repository if necessary.
+#
+# <repo-uri> may be used to compose the path. It should therefore be
+# a canonical URI to the repository.
+_git-r3_set_gitdir() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local repo_name=${1#*://*/}
+
+	# strip common prefixes to make paths more likely to match
+	# e.g. git://X/Y.git vs https://X/git/Y.git
+	# (but just one of the prefixes)
+	case "${repo_name}" in
+		# cgit can proxy requests to git
+		cgit/*) repo_name=${repo_name#cgit/};;
+		# pretty common
+		git/*) repo_name=${repo_name#git/};;
+		# gentoo.org
+		gitroot/*) repo_name=${repo_name#gitroot/};;
+		# google code, sourceforge
+		p/*) repo_name=${repo_name#p/};;
+		# kernel.org
+		pub/scm/*) repo_name=${repo_name#pub/scm/};;
+	esac
+	# ensure a .git suffix, same reason
+	repo_name=${repo_name%.git}.git
+	# now replace all the slashes
+	repo_name=${repo_name//\//_}
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+	: ${EGIT3_STORE_DIR:=${distdir}/git3-src}
+
+	GIT_DIR=${EGIT3_STORE_DIR}/${repo_name}
+
+	if [[ ! -d ${EGIT3_STORE_DIR} ]]; then
+		(
+			addwrite /
+			mkdir -m0755 -p "${EGIT3_STORE_DIR}"
+		) || die "Unable to create ${EGIT3_STORE_DIR}"
+	fi
+
+	addwrite "${EGIT3_STORE_DIR}"
+	if [[ ! -d ${GIT_DIR} ]]; then
+		mkdir "${GIT_DIR}" || die
+		git init --bare || die
+
+		# avoid auto-unshallow :)
+		touch "${GIT_DIR}"/shallow || die
+	fi
+}
+
+# @FUNCTION: _git-r3_set_submodules
+# @USAGE: <file-contents>
+# @INTERNAL
+# @DESCRIPTION:
+# Parse .gitmodules contents passed as <file-contents>
+# as in "$(cat .gitmodules)"). Composes a 'submodules' array that
+# contains in order (name, URL, path) for each submodule.
+_git-r3_set_submodules() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local data=${1}
+
+	# ( name url path ... )
+	submodules=()
+
+	local l
+	while read l; do
+		# submodule.<path>.path=<path>
+		# submodule.<path>.url=<url>
+		[[ ${l} == submodule.*.url=* ]] || continue
+
+		l=${l#submodule.}
+		local subname=${l%%.url=*}
+
+		submodules+=(
+			"${subname}"
+			"$(echo "${data}" | git config -f /dev/fd/0 \
+				submodule."${subname}".url)"
+			"$(echo "${data}" | git config -f /dev/fd/0 \
+				submodule."${subname}".path)"
+		)
+	done < <(echo "${data}" | git config -f /dev/fd/0 -l)
+}
+
+# @FUNCTION: git-r3_fetch
+# @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]]
+# @DESCRIPTION:
+# Fetch new commits to the local clone of repository.
+#
+# <repo-uri> specifies the repository URIs to fetch from, as a space-
+# -separated list. The first URI will be used as repository group
+# identifier and therefore must be used consistently. When not
+# specified, defaults to ${EGIT_REPO_URI}.
+#
+# <remote-ref> specifies the remote ref or commit id to fetch.
+# It is preferred to use 'refs/heads/<branch-name>' for branches
+# and 'refs/tags/<tag-name>' for tags. Other options are 'HEAD'
+# for upstream default branch and hexadecimal commit SHA1. Defaults
+# to the first of EGIT_COMMIT, EGIT_BRANCH or literal 'HEAD' that
+# is set to a non-null value.
+#
+# <local-id> specifies the local branch identifier that will be used to
+# locally store the fetch result. It should be unique to multiple
+# fetches within the repository that can be performed at the same time
+# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT}.
+# This default should be fine unless you are fetching multiple trees
+# from the same repository in the same ebuild.
+#
+# The fetch operation will affect the EGIT_STORE only. It will not touch
+# the working copy, nor export any environment variables.
+# If the repository contains submodules, they will be fetched
+# recursively.
+git-r3_fetch() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local repos=( ${1:-${EGIT_REPO_URI}} )
+	local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
+	local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
+	local local_id=${3:-${CATEGORY}/${PN}/${SLOT}}
+	local local_ref=refs/heads/${local_id}/__main__
+
+	[[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
+
+	local -x GIT_DIR
+	_git-r3_set_gitdir ${repos[0]}
+
+	# try to fetch from the remote
+	local r success
+	for r in ${repos[@]}; do
+		einfo "Fetching ${remote_ref} from ${r} ..."
+
+		local is_branch lookup_ref
+		if [[ ${remote_ref} == refs/heads/* || ${remote_ref} == HEAD ]]
+		then
+			is_branch=1
+			lookup_ref=${remote_ref}
+		else
+			# ls-remote by commit is going to fail anyway,
+			# so we may as well pass refs/tags/ABCDEF...
+			lookup_ref=refs/tags/${remote_ref}
+		fi
+
+		# first, try ls-remote to see if ${remote_ref} is a real ref
+		# and not a commit id. if it succeeds, we can pass ${remote_ref}
+		# to 'fetch'. otherwise, we will just fetch everything
+
+		# split on whitespace
+		local ref=(
+			$(git ls-remote "${r}" "${lookup_ref}")
+		)
+
+		local ref_param=()
+		if [[ ! ${ref[0]} ]]; then
+			local EGIT_NONSHALLOW=1
+		fi
+
+		# 1. if we need a non-shallow clone and we have a shallow one,
+		#    we need to unshallow it explicitly.
+		# 2. if we want a shallow clone, we just pass '--depth 1'
+		#    to the first fetch in the repo. passing '--depth'
+		#    to further requests usually results in more data being
+		#    downloaded than without it.
+		# 3. in any other case, we just do plain 'git fetch' and let
+		#    git to do its best (on top of shallow or non-shallow repo).
+
+		if [[ ${EGIT_NONSHALLOW} ]]; then
+			if [[ -f ${GIT_DIR}/shallow ]]; then
+				ref_param+=( --unshallow )
+			fi
+		else
+			# 'git show-ref --heads' returns 1 when there are no branches
+			if ! git show-ref --heads -q; then
+				ref_param+=( --depth 1 )
+			fi
+		fi
+
+		# now, another important thing. we may only fetch a remote
+		# branch directly to a local branch. Otherwise, we need to fetch
+		# the commit and re-create the branch on top of it.
+
+		if [[ ${ref[0]} ]]; then
+			if [[ ${is_branch} ]]; then
+				ref_param+=( -f "${remote_ref}:${local_id}/__main__" )
+			else
+				ref_param+=( "refs/tags/${remote_ref}" )
+			fi
+		fi
+
+		# if ${remote_ref} is branch or tag, ${ref[@]} will contain
+		# the respective commit id. otherwise, it will be an empty
+		# array, so the following won't evaluate to a parameter.
+		set -- git fetch --no-tags "${r}" "${ref_param[@]}"
+		echo "${@}" >&2
+		if "${@}"; then
+			if [[ ! ${is_branch} ]]; then
+				set -- git branch -f "${local_id}/__main__" \
+					"${ref[0]:-${remote_ref}}"
+				echo "${@}" >&2
+				if ! "${@}"; then
+					die "Creating branch for ${remote_ref} failed (wrong ref?)."
+				fi
+			fi
+
+			success=1
+			break
+		fi
+	done
+	[[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI"
+
+	# recursively fetch submodules
+	if git cat-file -e "${local_ref}":.gitmodules &>/dev/null; then
+		local submodules
+		_git-r3_set_submodules \
+			"$(git cat-file -p "${local_ref}":.gitmodules || die)"
+
+		while [[ ${submodules[@]} ]]; do
+			local subname=${submodules[0]}
+			local url=${submodules[1]}
+			local path=${submodules[2]}
+			local commit=$(git rev-parse "${local_ref}:${path}")
+
+			if [[ ! ${commit} ]]; then
+				die "Unable to get commit id for submodule ${subname}"
+			fi
+
+			git-r3_fetch "${url}" "${commit}" "${local_id}/${subname}"
+
+			submodules=( "${submodules[@]:3}" ) # shift
+		done
+	fi
+}
+
+# @FUNCTION: git-r3_checkout
+# @USAGE: [<repo-uri> [<checkout-path> [<local-id>]]]
+# @DESCRIPTION:
+# Check the previously fetched tree to the working copy.
+#
+# <repo-uri> specifies the repository URIs, as a space-separated list.
+# The first URI will be used as repository group identifier
+# and therefore must be used consistently with git-r3_fetch.
+# The remaining URIs are not used and therefore may be omitted.
+# When not specified, defaults to ${EGIT_REPO_URI}.
+#
+# <checkout-path> specifies the path to place the checkout. It defaults
+# to ${EGIT_CHECKOUT_DIR} if set, otherwise to ${WORKDIR}/${P}.
+#
+# <local-id> needs to specify the local identifier that was used
+# for respective git-r3_fetch.
+#
+# The checkout operation will write to the working copy, and export
+# the repository state into the environment. If the repository contains
+# submodules, they will be checked out recursively.
+git-r3_checkout() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local repos=( ${1:-${EGIT_REPO_URI}} )
+	local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}}
+	local local_id=${3:-${CATEGORY}/${PN}/${SLOT}}
+
+	local -x GIT_DIR GIT_WORK_TREE
+	_git-r3_set_gitdir ${repos[0]}
+	GIT_WORK_TREE=${out_dir}
+	mkdir -p "${GIT_WORK_TREE}"
+
+	einfo "Checking out ${repos[0]} to ${out_dir} ..."
+
+	if ! git cat-file -e refs/heads/"${local_id}"/__main__
+	then
+		if [[ ${EVCS_OFFLINE} ]]; then
+			die "No local clone of ${repos[0]}. Unable to work with EVCS_OFFLINE."
+		else
+			die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?"
+		fi
+	fi
+
+	set -- git checkout -f "${local_id}"/__main__ .
+	echo "${@}" >&2
+	"${@}" || die "git checkout ${local_id}/__main__ failed"
+
+	# diff against previous revision (if any)
+	local new_commit_id=$(git rev-parse --verify "${local_id}"/__main__)
+	local old_commit_id=$(
+		git rev-parse --verify "${local_id}"/__old__ 2>/dev/null
+	)
+
+	if [[ ! ${old_commit_id} ]]; then
+		echo "GIT NEW branch -->"
+		echo "   repository:               ${repos[0]}"
+		echo "   at the commit:            ${new_commit_id}"
+	else
+		echo "GIT update -->"
+		echo "   repository:               ${repos[0]}"
+		# write out message based on the revisions
+		if [[ "${old_commit_id}" != "${new_commit_id}" ]]; then
+			echo "   updating from commit:     ${old_commit_id}"
+			echo "   to commit:                ${new_commit_id}"
+
+			git --no-pager diff --stat \
+				${old_commit_id}..${new_commit_id}
+		else
+			echo "   at the commit:            ${new_commit_id}"
+		fi
+	fi
+	git branch -f "${local_id}"/{__old__,__main__} || die
+
+	# recursively checkout submodules
+	if [[ -f ${GIT_WORK_TREE}/.gitmodules ]]; then
+		local submodules
+		_git-r3_set_submodules \
+			"$(<"${GIT_WORK_TREE}"/.gitmodules)"
+
+		while [[ ${submodules[@]} ]]; do
+			local subname=${submodules[0]}
+			local url=${submodules[1]}
+			local path=${submodules[2]}
+
+			git-r3_checkout "${url}" "${GIT_WORK_TREE}/${path}" \
+				"${local_id}/${subname}"
+
+			submodules=( "${submodules[@]:3}" ) # shift
+		done
+	fi
+
+	# keep this *after* submodules
+	export EGIT_DIR=${GIT_DIR}
+	export EGIT_VERSION=${new_commit_id}
+}
+
+# @FUNCTION: git-r3_peek_remote_ref
+# @USAGE: [<repo-uri> [<remote-ref>]]
+# @DESCRIPTION:
+# Peek the reference in the remote repository and print the matching
+# (newest) commit SHA1.
+#
+# <repo-uri> specifies the repository URIs to fetch from, as a space-
+# -separated list. When not specified, defaults to ${EGIT_REPO_URI}.
+#
+# <remote-ref> specifies the remote ref to peek.  It is preferred to use
+# 'refs/heads/<branch-name>' for branches and 'refs/tags/<tag-name>'
+# for tags. Alternatively, 'HEAD' may be used for upstream default
+# branch. Defaults to the first of EGIT_COMMIT, EGIT_BRANCH or literal
+# 'HEAD' that is set to a non-null value.
+#
+# The operation will be done purely on the remote, without using local
+# storage. If commit SHA1 is provided as <remote-ref>, the function will
+# fail due to limitations of git protocol.
+#
+# On success, the function returns 0 and writes hexadecimal commit SHA1
+# to stdout. On failure, the function returns 1.
+git-r3_peek_remote_ref() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local repos=( ${1:-${EGIT_REPO_URI}} )
+	local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
+	local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
+
+	[[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
+
+	local r success
+	for r in ${repos[@]}; do
+		einfo "Peeking ${remote_ref} on ${r} ..." >&2
+
+		local is_branch lookup_ref
+		if [[ ${remote_ref} == refs/heads/* || ${remote_ref} == HEAD ]]
+		then
+			is_branch=1
+			lookup_ref=${remote_ref}
+		else
+			# ls-remote by commit is going to fail anyway,
+			# so we may as well pass refs/tags/ABCDEF...
+			lookup_ref=refs/tags/${remote_ref}
+		fi
+
+		# split on whitespace
+		local ref=(
+			$(git ls-remote "${r}" "${lookup_ref}")
+		)
+
+		if [[ ${ref[0]} ]]; then
+			echo "${ref[0]}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+git-r3_src_fetch() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ ${EVCS_OFFLINE} ]] && return
+
+	if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then
+		ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider"
+		ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use"
+		ewarn "a different directory than EGIT_STORE_DIR to ease removing old clones"
+		ewarn "when git-2 eclass becomes deprecated."
+	fi
+
+	_git-r3_env_setup
+	git-r3_fetch
+}
+
+git-r3_src_unpack() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	_git-r3_env_setup
+	git-r3_src_fetch
+	git-r3_checkout
+}
+
+# https://bugs.gentoo.org/show_bug.cgi?id=482666
+git-r3_pkg_outofdate() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local new_commit_id=$(git-r3_peek_remote_ref)
+	ewarn "old: ${EGIT_VERSION}"
+	ewarn "new: ${new_commit_id}"
+	[[ ${new_commit_id} && ${old_commit_id} ]] || return 2
+
+	[[ ${EGIT_VERSION} != ${new_commit_id} ]]
+}
+
+_GIT_R3=1
+fi
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 21032f8c85f8..ceac512f6c44 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.287 2013/07/31 21:25:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.288 2013/09/05 17:04:26 tomwij Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -40,7 +40,13 @@
 # K_DEFCONFIG			- Allow specifying a different defconfig target.
 #						  If length zero, defaults to "defconfig".
 # K_WANT_GENPATCHES		- Apply genpatches to kernel source. Provide any
-# 						  combination of "base" and "extras"
+# 						  combination of "base", "extras" or "experimental".
+# K_EXP_GENPATCHES_PULL	- If set, we pull "experimental" regardless of the USE FLAG
+#						  but expect the ebuild maintainer to use K_EXP_GENPATCHES_LIST.
+# K_EXP_GENPATCHES_NOUSE	- If set, no USE flag will be provided for "experimental";
+# 						  as a result the user cannot choose to apply those patches.
+# K_EXP_GENPATCHES_LIST	- A list of patches to pick from "experimental" to apply when
+# 						  the USE flag is unset and K_EXP_GENPATCHES_PULL is set.
 # K_GENPATCHES_VER		- The version of the genpatches tarball(s) to apply.
 #						  A value of "5" would apply genpatches-2.6.12-5 to
 #						  my-sources-2.6.12.ebuild
@@ -130,18 +136,32 @@ handle_genpatches() {
 	# respectively.  Handle this.
 
 	for i in ${K_WANT_GENPATCHES} ; do
-	if [[ ${KV_MAJOR} -ge 3 ]]; then
-		if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
-			tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz"
+		if [[ ${KV_MAJOR} -ge 3 ]]; then
+			if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
+				tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz"
+			else
+				tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.xz"
+			fi
 		else
-			tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.xz"
+			tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.xz"
 		fi
-	else
-		tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.xz"
-	fi
-	debug-print "genpatches tarball: $tarball"
-	GENPATCHES_URI="${GENPATCHES_URI} mirror://gentoo/${tarball}"
-	UNIPATCH_LIST_GENPATCHES="${UNIPATCH_LIST_GENPATCHES} ${DISTDIR}/${tarball}"
+
+		local use_cond_start="" use_cond_end=""
+
+		if [[ "${i}" == "experimental" && -z ${K_EXP_GENPATCHES_PULL} && -z ${K_EXP_GENPATCHES_NOUSE} ]] ; then
+			use_cond_start="experimental? ( "
+			use_cond_end=" )"
+
+			if use experimental ; then
+				UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
+				debug-print "genpatches tarball: $tarball"
+			fi
+		else
+			UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
+			debug-print "genpatches tarball: $tarball"
+		fi
+
+		GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}"
 	done
 }
 
@@ -955,6 +975,20 @@ unipatch() {
 				fi
 			fi
 		fi
+
+		# If experimental was not chosen by the user, drop experimental patches not in K_EXP_GENPATCHES_LIST.
+		if [[ "${i}" == *"genpatches-"*".experimental."* && -n ${K_EXP_GENPATCHES_PULL} ]] ; then
+			if [[ -z ${K_EXP_GENPATCHES_NOUSE} ]] && use experimental; then
+				continue
+			fi
+
+			local j
+			for j in ${KPATCH_DIR}/*/50*_*.patch*; do
+				if [[ ! "${K_EXP_GENPATCHES_LIST}" == *"$(basename ${j})"* ]] ; then
+					UNIPATCH_DROP+=" $(basename ${j})"
+				fi
+			done
+		fi
 	done
 
 	#populate KPATCH_DIRS so we know where to look to remove the excludes
diff --git a/games-action/chromium-bsu/chromium-bsu-0.9.15.1.ebuild b/games-action/chromium-bsu/chromium-bsu-0.9.15.1.ebuild
index 5f36b83e607b..0f19cc8114c3 100644
--- a/games-action/chromium-bsu/chromium-bsu-0.9.15.1.ebuild
+++ b/games-action/chromium-bsu/chromium-bsu-0.9.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chromium-bsu/chromium-bsu-0.9.15.1.ebuild,v 1.3 2013/09/04 09:03:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chromium-bsu/chromium-bsu-0.9.15.1.ebuild,v 1.4 2013/09/05 19:22:39 ago Exp $
 
 EAPI=5
 inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/chromium-bsu/${P}.tar.gz"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="mixer nls +sdl"
 
 RDEPEND="media-fonts/dejavu
diff --git a/games-action/openclonk/openclonk-5.3.3.ebuild b/games-action/openclonk/openclonk-5.3.3.ebuild
index 81b14cd70d60..b22fcbf3de61 100644
--- a/games-action/openclonk/openclonk-5.3.3.ebuild
+++ b/games-action/openclonk/openclonk-5.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.3.3.ebuild,v 1.4 2013/07/06 16:10:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/openclonk/openclonk-5.3.3.ebuild,v 1.5 2013/09/05 19:44:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit autotools eutils flag-o-matic gnome2-utils python-any-r1 toolchain-funcs games
 
 MY_P=${PN}-release-${PV}-src
diff --git a/games-action/slune/slune-1.0.15-r1.ebuild b/games-action/slune/slune-1.0.15-r1.ebuild
index 6e9a10969058..8c43dabd063d 100644
--- a/games-action/slune/slune-1.0.15-r1.ebuild
+++ b/games-action/slune/slune-1.0.15-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/slune/slune-1.0.15-r1.ebuild,v 1.5 2013/02/17 17:37:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/slune/slune-1.0.15-r1.ebuild,v 1.6 2013/09/05 19:44:55 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit gnome2-utils python-utils-r1 distutils-r1 games
 
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 3db81068ea40..29bdec5a58f6 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1 +1,2 @@
-DIST teeworlds-0.6.1-source.tar.gz 8599538 SHA256 6328d48fb98d451af8e1dba0999190496e851842c84e4594d413b79aca67b908
+DIST teeworlds-0.6.1-source.tar.gz 8599538 SHA256 6328d48fb98d451af8e1dba0999190496e851842c84e4594d413b79aca67b908 SHA512 861df9b148571960d99140196d1bd5175a5d28c0c96cf44371aab79d1c4febfc0a79fe2b3791958b54b07d8e8d0cde051eed21d47ee53fb7446a99511f16bc08 WHIRLPOOL 189b86adbeaae0323b0f9e9ec23a130a1ec612869f23f95492d4733d2529b4bf587f0b44cc37ee639b11fcb40145187473be197080a4423749d17fc2b9a38295
+DIST teeworlds-0.6.2-source.tar.gz 9179568 SHA256 00061b30377597a61810eda3dc5de0caad439ca851cb8eebbe4152e4f861e2af SHA512 e08db7a8eabe2f04c543ecf1abc2f51b513a06812581cf8c396fc8bd7e038ce09c46f73bfea80e295affded96c511ef74d47a14dd03fd0aac05487a46f380839 WHIRLPOOL 4656378b51d3b06b268f228370d0ef8db03920a476652ebab6af37839636c91380c40c7ffc721fcdb2519b14b76ee848e40add01fb016cdd399bcd50d9e6bbf4
diff --git a/games-action/teeworlds/files/0.6.2/01-use-system-wavpack.patch b/games-action/teeworlds/files/0.6.2/01-use-system-wavpack.patch
new file mode 100644
index 000000000000..4a11a866511d
--- /dev/null
+++ b/games-action/teeworlds/files/0.6.2/01-use-system-wavpack.patch
@@ -0,0 +1,101 @@
+commit 7202b142891ee10771af9f1f3063664d75a38bbc
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 5 12:28:30 2013 +0200
+
+    Use system wavpack. Based on patch from Gentoo Bugzilla
+    
+    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=363395
+
+diff --git a/bam.lua b/bam.lua
+index 11ac7b9..35c1d8d 100644
+--- a/bam.lua
++++ b/bam.lua
+@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p
+ config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
+ config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
+ config:Add(OptLibrary("zlib", "zlib.h", false))
++config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
+ config:Add(SDL.OptFind("sdl", true))
+ config:Add(FreeType.OptFind("freetype", true))
+ config:Finalize("config.lua")
+@@ -187,7 +188,7 @@ function build(settings)
+ 	end
+ 
+ 	-- compile zlib if needed
+-	if config.zlib.value == 1 then
++	if config.zlib.value == true then
+ 		settings.link.libs:Add("z")
+ 		if config.zlib.include_path then
+ 			settings.cc.includes:Add(config.zlib.include_path)
+@@ -198,8 +199,18 @@ function build(settings)
+ 		settings.cc.includes:Add("src/engine/external/zlib")
+ 	end
+ 
++	if config.wavpack.value == true then
++		settings.link.libs:Add("wavpack")
++		if config.wavpack.include_path then
++			settings.cc.includes:Add(config.wavpack.include_path)
++		end
++		wavpack = {}
++	else
++		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
++		settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
++	end
++
+ 	-- build the small libraries
+-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+ 	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+ 
+ 	-- build game components
+diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
+index 343fa2e..e32cac9 100644
+--- a/src/engine/client/sound.cpp
++++ b/src/engine/client/sound.cpp
+@@ -13,7 +13,7 @@
+ #include "sound.h"
+ 
+ extern "C" { // wavpack
+-	#include <engine/external/wavpack/wavpack.h>
++	#include <wavpack/wavpack.h>
+ }
+ #include <math.h>
+ 
+@@ -351,19 +351,25 @@ int CSound::LoadWV(const char *pFilename)
+ 	if(!m_pStorage)
+ 		return -1;
+ 
++	#ifndef WAVPACK_H
+ 	ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
+ 	if(!ms_File)
+ 	{
+ 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
+ 		return -1;
+ 	}
++	#endif
+ 
+ 	SampleID = AllocID();
+ 	if(SampleID < 0)
+ 		return -1;
+ 	pSample = &m_aSamples[SampleID];
+ 
++	#ifndef WAVPACK_H
+ 	pContext = WavpackOpenFileInput(ReadData, aError);
++	#else
++	pContext = WavpackOpenFileInput(pFilename, aError, 0, 0);
++	#endif
+ 	if (pContext)
+ 	{
+ 		int m_aSamples = WavpackGetNumSamples(pContext);
+@@ -419,8 +425,10 @@ int CSound::LoadWV(const char *pFilename)
+ 		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
+ 	}
+ 
++	#ifndef WAVPACK_H
+ 	io_close(ms_File);
+ 	ms_File = NULL;
++	#endif
+ 
+ 	if(g_Config.m_Debug)
+ 		dbg_msg("sound/wv", "loaded %s", pFilename);
diff --git a/games-action/teeworlds/files/0.6.2/02-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6.2/02-fixed-wavpack-sound-loading.patch
new file mode 100644
index 000000000000..e207a4a354bf
--- /dev/null
+++ b/games-action/teeworlds/files/0.6.2/02-fixed-wavpack-sound-loading.patch
@@ -0,0 +1,109 @@
+commit b96981f5f23b4269108afb465f29a23abbd32ae2
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 5 12:31:19 2013 +0200
+
+    Fixing wavpack sound loading. Based on Gentoo Bugzilla
+    
+    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=363395
+
+diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
+index e32cac9..2a4c653 100644
+--- a/src/engine/client/sound.cpp
++++ b/src/engine/client/sound.cpp
+@@ -51,6 +51,55 @@ struct CVoice
+ 	int m_X, m_Y;
+ } ;
+ 
++#ifdef WAVPACK_H
++static int32_t ReadBytes(void *pFile, void *pBuffer, int32_t Size)
++{
++	return (int32_t)io_read((IOHANDLE)pFile, pBuffer, Size);
++}
++static uint32_t GetPos(void *pFile)
++{
++	return (uint32_t)io_tell((IOHANDLE)pFile);
++}
++static int SetPosAbs(void *pFile, uint32_t Offset)
++{
++	return io_seek((IOHANDLE)pFile, Offset, IOSEEK_START);
++}
++static int SetPosRel(void *pFile, int32_t Offset, int Mode)
++{
++	switch(Mode)
++	{
++	case SEEK_SET:
++		Mode = IOSEEK_START;
++		break;
++	case SEEK_CUR:
++		Mode = IOSEEK_CUR;
++		break;
++	case SEEK_END:
++		Mode = IOSEEK_END;
++	}
++	return io_seek((IOHANDLE)pFile, Offset, Mode);
++}
++
++//TODO: Fix if 'real' functionality is needed by the wavpack header
++static int PushBackByte(void *pFile, int Char)
++{
++	return io_seek((IOHANDLE)pFile, -1, IOSEEK_CUR);
++}
++static uint32_t GetLength(void *pFile)
++{
++	return (uint32_t)io_length((IOHANDLE)pFile);
++}
++// Essentially assuming this to always be true, should fix if this isn't the case
++static int CanSeek(void *pFile)
++{
++	return pFile != NULL;
++}
++static WavpackStreamReader CWavpackReader  = {
++    ReadBytes, GetPos, SetPosAbs, SetPosRel, PushBackByte, GetLength, CanSeek, 0
++};
++#endif
++
++
+ static CSample m_aSamples[NUM_SAMPLES] = { {0} };
+ static CVoice m_aVoices[NUM_VOICES] = { {0} };
+ static CChannel m_aChannels[NUM_CHANNELS] = { {255, 0} };
+@@ -351,14 +400,12 @@ int CSound::LoadWV(const char *pFilename)
+ 	if(!m_pStorage)
+ 		return -1;
+ 
+-	#ifndef WAVPACK_H
+ 	ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
+ 	if(!ms_File)
+ 	{
+ 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
+ 		return -1;
+ 	}
+-	#endif
+ 
+ 	SampleID = AllocID();
+ 	if(SampleID < 0)
+@@ -368,7 +415,7 @@ int CSound::LoadWV(const char *pFilename)
+ 	#ifndef WAVPACK_H
+ 	pContext = WavpackOpenFileInput(ReadData, aError);
+ 	#else
+-	pContext = WavpackOpenFileInput(pFilename, aError, 0, 0);
++	pContext = WavpackOpenFileInputEx(&CWavpackReader, ms_File, 0, aError, 0, 0);
+ 	#endif
+ 	if (pContext)
+ 	{
+@@ -422,13 +469,11 @@ int CSound::LoadWV(const char *pFilename)
+ 	}
+ 	else
+ 	{
+-		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
++		dbg_msg("sound/wv", "failed to open '%s': %s", pFilename, aError);
+ 	}
+ 
+-	#ifndef WAVPACK_H
+ 	io_close(ms_File);
+ 	ms_File = NULL;
+-	#endif
+ 
+ 	if(g_Config.m_Debug)
+ 		dbg_msg("sound/wv", "loaded %s", pFilename);
diff --git a/games-action/teeworlds/files/0.6.2/03-use-system-pnglite.patch b/games-action/teeworlds/files/0.6.2/03-use-system-pnglite.patch
new file mode 100644
index 000000000000..81c3d915316b
--- /dev/null
+++ b/games-action/teeworlds/files/0.6.2/03-use-system-pnglite.patch
@@ -0,0 +1,160 @@
+commit 291a375000ac8d9cd5548a863ea6b49c46cfb1bb
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 5 12:36:53 2013 +0200
+
+    Use system pnglite. Based on Gentoo Bugzilla
+    
+    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=363395
+
+diff --git a/bam.lua b/bam.lua
+index 35c1d8d..7902a2c 100644
+--- a/bam.lua
++++ b/bam.lua
+@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p
+ config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
+ config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
+ config:Add(OptLibrary("zlib", "zlib.h", false))
++config:Add(OptLibrary("pnglite", "pnglite.h", false))
+ config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
+ config:Add(SDL.OptFind("sdl", true))
+ config:Add(FreeType.OptFind("freetype", true))
+@@ -199,26 +200,34 @@ function build(settings)
+ 		settings.cc.includes:Add("src/engine/external/zlib")
+ 	end
+ 
++	-- build game components
++	engine_settings = settings:Copy()
++	server_settings = engine_settings:Copy()
++	client_settings = engine_settings:Copy()
++	launcher_settings = engine_settings:Copy()
++
++	if config.pnglite.value == true then
++		client_settings.link.libs:Add("pnglite")
++		if config.pnglite.include_path then
++			client_settings.cc.includes:Add(config.pnglite.include_path)
++		end
++		pnglite = {}
++	else
++		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
++		client_settings.cc.includes:Add("src/engine/external/pnglite")
++	end
++
+ 	if config.wavpack.value == true then
+-		settings.link.libs:Add("wavpack")
++		client_settings.link.libs:Add("wavpack")
+ 		if config.wavpack.include_path then
+-			settings.cc.includes:Add(config.wavpack.include_path)
++			client_settings.cc.includes:Add(config.wavpack.include_path)
+ 		end
+ 		wavpack = {}
+ 	else
+ 		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+-		settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
++		client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
+ 	end
+ 
+-	-- build the small libraries
+-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+-
+-	-- build game components
+-	engine_settings = settings:Copy()
+-	server_settings = engine_settings:Copy()
+-	client_settings = engine_settings:Copy()
+-	launcher_settings = engine_settings:Copy()
+-
+ 	if family == "unix" then
+ 		if platform == "macosx" then
+ 			client_settings.link.frameworks:Add("OpenGL")
+diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp
+index 2e8a855..97e4fd7 100644
+--- a/src/engine/client/graphics.cpp
++++ b/src/engine/client/graphics.cpp
+@@ -9,7 +9,7 @@
+ #include "SDL_opengl.h"
+ 
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ #include <engine/shared/config.h>
+ #include <engine/graphics.h>
+diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp
+index e34b725..60246d1 100644
+--- a/src/engine/client/graphics_threaded.cpp
++++ b/src/engine/client/graphics_threaded.cpp
+@@ -6,7 +6,7 @@
+ #include <base/tl/threading.h>
+ 
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ #include <engine/shared/config.h>
+ #include <engine/graphics.h>
+diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp
+index 55094a5..42a5b83 100644
+--- a/src/tools/dilate.cpp
++++ b/src/tools/dilate.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/system.h>
+ #include <base/math.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderadd.cpp b/src/tools/tileset_borderadd.cpp
+index 25e2fa5..88f760a 100644
+--- a/src/tools/tileset_borderadd.cpp
++++ b/src/tools/tileset_borderadd.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp
+index 0facb9a..ab36292 100644
+--- a/src/tools/tileset_borderfix.cpp
++++ b/src/tools/tileset_borderfix.cpp
+@@ -1,7 +1,7 @@
+ /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderrem.cpp b/src/tools/tileset_borderrem.cpp
+index d604ecb..8673e41 100644
+--- a/src/tools/tileset_borderrem.cpp
++++ b/src/tools/tileset_borderrem.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderset.cpp b/src/tools/tileset_borderset.cpp
+index 8b3e299..c762ee2 100644
+--- a/src/tools/tileset_borderset.cpp
++++ b/src/tools/tileset_borderset.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
diff --git a/games-action/teeworlds/teeworlds-0.6.2.ebuild b/games-action/teeworlds/teeworlds-0.6.2.ebuild
new file mode 100644
index 000000000000..cf415f1b7768
--- /dev/null
+++ b/games-action/teeworlds/teeworlds-0.6.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.2.ebuild,v 1.1 2013/09/05 18:37:31 hasufell Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multiprocessing python-any-r1 toolchain-funcs games
+
+REVISION="b177-r50edfd37"
+
+DESCRIPTION="Online multi-player platform 2D shooter"
+HOMEPAGE="http://www.teeworlds.com/"
+SRC_URI="http://www.teeworlds.com/files/${P}-source.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated"
+
+RDEPEND="
+	!dedicated? ( media-libs/pnglite
+		media-libs/libsdl[X,audio,opengl,video]
+		media-sound/wavpack
+		virtual/opengl
+		app-arch/bzip2
+		media-libs/freetype
+		virtual/glu
+		x11-libs/libX11 )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	~dev-util/bam-0.4.0"
+
+S=${WORKDIR}/${P}-source
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	rm -r src/engine/external/* || die
+
+	# 01 & 02 from pull request: https://github.com/oy/teeworlds/pull/493
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+		epatch
+
+	cat <<- __EOF__ > "${S}/gentoo.lua"
+		function addSettings(settings)
+			print("Adding Gentoo settings")
+			settings.optimize = 0
+			settings.cc.exe_c = "$(tc-getCC)"
+			settings.cc.exe_cxx = "$(tc-getCXX)"
+			settings.cc.flags_c:Add("${CFLAGS}")
+			settings.cc.flags_cxx:Add("${CXXFLAGS}")
+			settings.link.exe = "$(tc-getCXX)"
+			settings.link.flags:Add("${LDFLAGS}")
+		end
+	__EOF__
+
+	sed -i \
+		-e '/^function build(settings)/a dofile("gentoo.lua") addSettings(settings)' \
+		bam.lua || die
+}
+
+src_configure() {
+	bam config || die
+}
+
+src_compile() {
+	local myopt
+
+	if use debug; then
+		myopt=" server_debug"
+	else
+		myopt=" server_release"
+	fi
+	if ! use dedicated; then
+		if use debug; then
+			myopt+=" client_debug"
+		else
+			myopt+=" client_release"
+		fi
+	fi
+
+	bam -a -j $(makeopts_jobs) ${myopt} || die
+}
+
+src_install() {
+	if use debug; then
+		newgamesbin ${PN}_srv_d ${PN}_srv
+	else
+		dogamesbin ${PN}_srv
+	fi
+	if ! use dedicated; then
+		if use debug; then
+			newgamesbin ${PN}_d ${PN}
+		else
+			dogamesbin ${PN}
+		fi
+
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry ${PN} Teeworlds
+
+		insinto "${GAMES_DATADIR}"/${PN}/data
+		doins -r data/*
+	else
+		insinto "${GAMES_DATADIR}"/${PN}/data/maps
+		doins -r data/maps/*
+	fi
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	insinto "/etc/${PN}"
+	doins "${FILESDIR}"/teeworlds_srv.cfg
+
+	dodoc readme.txt
+
+	prepgamesdirs
+}
diff --git a/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild b/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild
index 70d79d3f9180..5a82e89844fb 100644
--- a/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild,v 1.2 2013/06/09 09:15:05 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild,v 1.3 2013/09/05 19:44:55 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit eutils gnome2-utils python-single-r1 games
 
 DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
diff --git a/games-board/gnubg/gnubg-20130203.ebuild b/games-board/gnubg/gnubg-20130203.ebuild
index 18aafaeb8870..986a4f51ce90 100644
--- a/games-board/gnubg/gnubg-20130203.ebuild
+++ b/games-board/gnubg/gnubg-20130203.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-20130203.ebuild,v 1.1 2013/02/07 17:45:32 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-20130203.ebuild,v 1.2 2013/09/05 19:44:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit autotools eutils python-single-r1 gnome2-utils games
 
 DESCRIPTION="GNU BackGammon"
diff --git a/games-fps/doomsday/doomsday-1.9.8-r1.ebuild b/games-fps/doomsday/doomsday-1.9.8-r1.ebuild
index 67e83a1d59a9..ffd7c2ed60f1 100644
--- a/games-fps/doomsday/doomsday-1.9.8-r1.ebuild
+++ b/games-fps/doomsday/doomsday-1.9.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8-r1.ebuild,v 1.2 2013/03/02 21:15:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8-r1.ebuild,v 1.3 2013/09/05 19:44:51 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit python-r1 confutils eutils qt4-r2 games
 
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
diff --git a/games-mud/lyntin/lyntin-4.2-r1.ebuild b/games-mud/lyntin/lyntin-4.2-r1.ebuild
index e9255b94b1d8..07a7ebcde28c 100644
--- a/games-mud/lyntin/lyntin-4.2-r1.ebuild
+++ b/games-mud/lyntin/lyntin-4.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/lyntin/lyntin-4.2-r1.ebuild,v 1.4 2013/02/24 11:30:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/lyntin/lyntin-4.2-r1.ebuild,v 1.5 2013/09/05 19:44:52 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 PYTHON_REQ_USE="tk?"
 
 inherit distutils-r1 games
diff --git a/games-mud/wxmud/wxmud-9999.ebuild b/games-mud/wxmud/wxmud-9999.ebuild
index 75db7fbaccee..1250dc9e48cd 100644
--- a/games-mud/wxmud/wxmud-9999.ebuild
+++ b/games-mud/wxmud/wxmud-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/wxmud/wxmud-9999.ebuild,v 1.6 2013/04/01 14:34:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/wxmud/wxmud-9999.ebuild,v 1.7 2013/09/05 19:44:54 mgorny Exp $
 
 EAPI=5
 
 WX_GTK_VER=2.8
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 inherit flag-o-matic subversion wxwidgets autotools python-single-r1 games
 
 DESCRIPTION="Cross-platform MUD client"
diff --git a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
index f679893b50bc..368a88fd7880 100644
--- a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild,v 1.1 2013/02/06 18:32:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild,v 1.2 2013/09/05 19:44:50 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit eutils gnome2-utils python-r1 games
 
 DESCRIPTION="Short-term-memory training N-Back game"
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
index c7c78a7974b7..7c1508000553 100644
--- a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/pathological-1.1.3-r3.ebuild,v 1.6 2013/08/04 11:47:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/pathological-1.1.3-r3.ebuild,v 1.7 2013/09/05 19:44:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit eutils python-single-r1 games
 
 DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
diff --git a/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild b/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
index d3e0f61eb0d4..6fc5db585795 100644
--- a/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
+++ b/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild,v 1.1 2013/06/14 23:08:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild,v 1.2 2013/09/05 19:44:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit eutils python-single-r1 games
 
 MY_P="Dragon_Hunt-${PV}"
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild
index bdeb5ee0f78b..246e79077273 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild,v 1.3 2013/02/01 00:03:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild,v 1.4 2013/09/05 19:44:48 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit eutils gnome2-utils python-any-r1 games
 
 DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
diff --git a/games-simulation/singularity/singularity-0.30c-r1.ebuild b/games-simulation/singularity/singularity-0.30c-r1.ebuild
index ee31ee5ea01e..915fed866c9d 100644
--- a/games-simulation/singularity/singularity-0.30c-r1.ebuild
+++ b/games-simulation/singularity/singularity-0.30c-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30c-r1.ebuild,v 1.2 2013/06/29 17:00:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30c-r1.ebuild,v 1.3 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit eutils python-single-r1 games
 
 MUSIC=endgame-${PN}-music-006
diff --git a/games-util/nml/nml-0.2.4-r1.ebuild b/games-util/nml/nml-0.2.4-r1.ebuild
index dbd66ace5c22..738b5cb3401d 100644
--- a/games-util/nml/nml-0.2.4-r1.ebuild
+++ b/games-util/nml/nml-0.2.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r1.ebuild,v 1.4 2013/07/20 16:09:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r1.ebuild,v 1.5 2013/09/05 19:44:51 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit eutils distutils-r1
 
diff --git a/games-util/nml/nml-0.2.4-r2.ebuild b/games-util/nml/nml-0.2.4-r2.ebuild
index 9ab0d5463fa8..0f8626d78f41 100644
--- a/games-util/nml/nml-0.2.4-r2.ebuild
+++ b/games-util/nml/nml-0.2.4-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r2.ebuild,v 1.3 2013/08/18 13:24:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.2.4-r2.ebuild,v 1.4 2013/09/05 19:44:51 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 
 inherit distutils-r1
 
diff --git a/gnome-base/gconf/gconf-3.2.6-r1.ebuild b/gnome-base/gconf/gconf-3.2.6-r1.ebuild
index 24a8fadd928d..c532ab685730 100644
--- a/gnome-base/gconf/gconf-3.2.6-r1.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r1.ebuild,v 1.2 2013/06/02 00:09:34 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r1.ebuild,v 1.3 2013/09/05 19:44:55 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME_ORG_MODULE="GConf"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome2 python-r1
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
index 3a22e8e30349..987b76a4e70c 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild,v 1.2 2013/03/29 19:36:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild,v 1.3 2013/09/05 19:44:54 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit gnome2 python-any-r1 vala
 
diff --git a/gnome-base/orbit/orbit-2.14.19-r3.ebuild b/gnome-base/orbit/orbit-2.14.19-r3.ebuild
index b26ef1fd30dd..50a1049ab0bd 100644
--- a/gnome-base/orbit/orbit-2.14.19-r3.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r3.ebuild,v 1.5 2013/09/04 09:21:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r3.ebuild,v 1.7 2013/09/05 19:23:39 ago Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/ORBit2/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="pic static-libs test"
 REQUIRED_USE="test? ( debug )"
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild
index ea5065636585..a1547f3e5253 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild,v 1.1 2013/03/31 10:08:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.6.4.ebuild,v 1.2 2013/09/05 19:44:41 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit db-use eutils flag-o-matic gnome2 python-any-r1 vala virtualx
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild
index 9327985a35c0..71f3705df1e6 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild,v 1.1 2013/08/09 17:36:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.8.4-r1.ebuild,v 1.2 2013/09/05 19:44:41 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 # python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild
index 2db6849bad2b..f54d409c761e 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild,v 1.4 2013/07/29 22:03:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.8.4.ebuild,v 1.5 2013/09/05 19:44:41 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 # python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild
index 78c5b5d6077b..2e116fde754e 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild,v 1.1 2013/08/25 18:38:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.8.5.ebuild,v 1.2 2013/09/05 19:44:41 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 # python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python2_7 pypy2_0 )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild
index 16b19272e5a0..691c4bed2ca1 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild,v 1.2 2013/03/30 21:52:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.1-r1.ebuild,v 1.3 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{5,6,7} python3_{1,2} )
+PYTHON_COMPAT=( python2_{6,7} python3_2 )
 
 inherit eutils gnome2 python-r1 virtualx
 
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.2.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.2.ebuild
index 2c72815c12bf..0ec7a20a5337 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.2.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.2.ebuild,v 1.1 2013/03/30 21:52:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.6.2.ebuild,v 1.2 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{5,6,7} python3_{1,2} )
+PYTHON_COMPAT=( python2_{6,7} python3_2 )
 
 inherit eutils gnome2 python-r1 virtualx
 
diff --git a/kde-base/kate/kate-4.10.5.ebuild b/kde-base/kate/kate-4.10.5.ebuild
index 16ab5fe32fce..a68e7a08c667 100644
--- a/kde-base/kate/kate-4.10.5.ebuild
+++ b/kde-base/kate/kate-4.10.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.10.5.ebuild,v 1.7 2013/08/02 14:30:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-4.10.5.ebuild,v 1.8 2013/09/05 18:44:05 mgorny Exp $
 
 EAPI=5
 KDE_HANDBOOK="optional"
 KMNAME="kate"
-PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 inherit python-single-r1 kde4-meta
 
diff --git a/kde-base/krosspython/krosspython-4.10.5.ebuild b/kde-base/krosspython/krosspython-4.10.5.ebuild
index 1dd276324603..4366c4952d00 100644
--- a/kde-base/krosspython/krosspython-4.10.5.ebuild
+++ b/kde-base/krosspython/krosspython-4.10.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.10.5.ebuild,v 1.5 2013/08/02 14:29:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krosspython/krosspython-4.10.5.ebuild,v 1.6 2013/09/05 18:44:04 mgorny Exp $
 
 EAPI=5
 
 KMNAME="kross-interpreters"
 KMMODULE="python"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit python-single-r1 kde4-meta
 
 DESCRIPTION="Kross scripting framework: Python interpreter"
diff --git a/kde-base/lokalize/lokalize-4.10.5.ebuild b/kde-base/lokalize/lokalize-4.10.5.ebuild
index dec67bff367d..ae1b00c6a288 100644
--- a/kde-base/lokalize/lokalize-4.10.5.ebuild
+++ b/kde-base/lokalize/lokalize-4.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.10.5.ebuild,v 1.6 2013/08/02 14:29:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.10.5.ebuild,v 1.7 2013/09/05 18:44:05 mgorny Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ else
 	eclass="kde4-meta"
 	KMNAME="kdesdk"
 fi
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit python-single-r1 ${eclass}
 
 DESCRIPTION="KDE4 translation tool"
diff --git a/kde-base/pykde4/pykde4-4.10.5.ebuild b/kde-base/pykde4/pykde4-4.10.5.ebuild
index 2e39b3b9cd16..6e01eced1155 100644
--- a/kde-base/pykde4/pykde4-4.10.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.10.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.5.ebuild,v 1.6 2013/08/02 14:29:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.5.ebuild,v 1.7 2013/09/05 18:44:04 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE="threads"
 OPENGL_REQUIRED="always"
 
diff --git a/kde-base/superkaramba/superkaramba-4.10.5.ebuild b/kde-base/superkaramba/superkaramba-4.10.5.ebuild
index aa0c866d5280..0726115d5362 100644
--- a/kde-base/superkaramba/superkaramba-4.10.5.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.10.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.10.5.ebuild,v 1.7 2013/08/02 14:29:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.10.5.ebuild,v 1.8 2013/09/05 18:44:05 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit python-single-r1 kde4-base
 
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
diff --git a/kde-misc/kanyremote/kanyremote-6.2.ebuild b/kde-misc/kanyremote/kanyremote-6.2.ebuild
index 8367d6861e82..ae4087f6547e 100644
--- a/kde-misc/kanyremote/kanyremote-6.2.ebuild
+++ b/kde-misc/kanyremote/kanyremote-6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.2.ebuild,v 1.1 2013/07/25 01:42:15 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.2.ebuild,v 1.2 2013/09/05 18:45:03 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit autotools python-single-r1 base
 
 DESCRIPTION="KDE frontend to Anyremote"
diff --git a/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild b/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
index ab0d5e49dbf4..8001eb829175 100644
--- a/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
+++ b/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild,v 1.2 2013/07/22 12:25:07 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild,v 1.3 2013/09/05 18:45:04 mgorny Exp $
 
 EAPI=5
 
 KDE_DOC_DIRS="docs/%lingua"
 KDE_HANDBOOK="optional"
 KDE_LINGUAS="es fr lt"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit python-r1 kde4-base multilib
 
 MY_P="${P/-/_}"
diff --git a/kde-misc/wicd-client-kde/wicd-client-kde-0.3.1-r1.ebuild b/kde-misc/wicd-client-kde/wicd-client-kde-0.3.1-r1.ebuild
index 261390e0c953..84584616e6ed 100644
--- a/kde-misc/wicd-client-kde/wicd-client-kde-0.3.1-r1.ebuild
+++ b/kde-misc/wicd-client-kde/wicd-client-kde-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/wicd-client-kde/wicd-client-kde-0.3.1-r1.ebuild,v 1.3 2013/07/29 07:50:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/wicd-client-kde/wicd-client-kde-0.3.1-r1.ebuild,v 1.4 2013/09/05 18:45:04 mgorny Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ EAPI=5
 # uk zh_CN zh_TW"
 EGIT_REPONAME="wicd-kde"
 MY_P=${P/-client/}
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit python-single-r1 kde4-base
 
 DESCRIPTION="Wicd client built on the KDE Development Platform"
diff --git a/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
index b5ca7a420bca..7fcdb4f7cb9d 100644
--- a/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild,v 1.2 2013/08/30 22:44:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild,v 1.3 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils multilib gnome2-utils eutils python-single-r1
diff --git a/mail-client/claws-mail/claws-mail-3.9.1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
index 8335374745cc..18d153828a84 100644
--- a/mail-client/claws-mail/claws-mail-3.9.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1.ebuild,v 1.11 2013/08/30 22:44:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1.ebuild,v 1.12 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils multilib gnome2-utils eutils python-single-r1
diff --git a/mail-client/claws-mail/claws-mail-3.9.2.ebuild b/mail-client/claws-mail/claws-mail-3.9.2.ebuild
index b62dd155727c..d802043cbd82 100644
--- a/mail-client/claws-mail/claws-mail-3.9.2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.2.ebuild,v 1.2 2013/08/30 22:44:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.2.ebuild,v 1.3 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils multilib gnome2-utils eutils python-single-r1
diff --git a/media-gfx/cptutils/cptutils-1.47.ebuild b/media-gfx/cptutils/cptutils-1.47.ebuild
index afeb462e3d03..519381e1df12 100644
--- a/media-gfx/cptutils/cptutils-1.47.ebuild
+++ b/media-gfx/cptutils/cptutils-1.47.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/cptutils/cptutils-1.47.ebuild,v 1.1 2013/07/11 03:08:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/cptutils/cptutils-1.47.ebuild,v 1.2 2013/09/05 18:54:13 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit python-single-r1
 
diff --git a/media-gfx/graphite2/graphite2-1.2.1.ebuild b/media-gfx/graphite2/graphite2-1.2.1.ebuild
index 13c047858153..841b664212b8 100644
--- a/media-gfx/graphite2/graphite2-1.2.1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.1.ebuild,v 1.12 2013/07/06 17:08:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.2.1.ebuild,v 1.13 2013/09/05 18:54:13 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 GENTOO_DEPEND_ON_PERL="no"
 inherit base eutils cmake-utils perl-module python-any-r1
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index ee25b78892b5..969d70110999 100644
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.28.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.20 2013/08/15 09:50:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.21 2013/09/05 18:54:13 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools eutils flag-o-matic multilib python-single-r1
 
diff --git a/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
index a448ac3d841b..cad1855f8f39 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild,v 1.9 2013/09/02 11:14:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild,v 1.11 2013/09/05 12:44:18 jer Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs versionator libtool flag-o-matic eutils
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/pydot/pydot-1.0.28-r1.ebuild b/media-gfx/pydot/pydot-1.0.28-r1.ebuild
index 567bf5ba7997..7812ccc1b406 100644
--- a/media-gfx/pydot/pydot-1.0.28-r1.ebuild
+++ b/media-gfx/pydot/pydot-1.0.28-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r1.ebuild,v 1.12 2013/06/02 08:46:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r1.ebuild,v 1.13 2013/09/05 18:54:12 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index a12385102797..255107470556 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/svg2rlg/svg2rlg-0.3.ebuild,v 1.1 2013/05/08 04:56:14 yac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/svg2rlg/svg2rlg-0.3.ebuild,v 1.2 2013/09/05 18:54:12 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/uniconvertor/uniconvertor-1.1.5-r1.ebuild b/media-gfx/uniconvertor/uniconvertor-1.1.5-r1.ebuild
index e1c975e51f1d..bf4cf8b58da9 100644
--- a/media-gfx/uniconvertor/uniconvertor-1.1.5-r1.ebuild
+++ b/media-gfx/uniconvertor/uniconvertor-1.1.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/uniconvertor/uniconvertor-1.1.5-r1.ebuild,v 1.1 2013/05/06 09:14:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/uniconvertor/uniconvertor-1.1.5-r1.ebuild,v 1.2 2013/09/05 18:54:13 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/media-libs/clutter-gst/clutter-gst-2.0.2.ebuild b/media-libs/clutter-gst/clutter-gst-2.0.2.ebuild
index 79829d56c394..6a3e5a98167a 100644
--- a/media-libs/clutter-gst/clutter-gst-2.0.2.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-2.0.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.2.ebuild,v 1.1 2013/03/30 18:55:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.2.ebuild,v 1.2 2013/09/05 18:55:06 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 CLUTTER_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 # inherit clutter after gnome2 so that defaults aren't overriden
 # inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
diff --git a/media-libs/clutter-gst/clutter-gst-2.0.6.ebuild b/media-libs/clutter-gst/clutter-gst-2.0.6.ebuild
index cb7ccdcfdefb..d8f9ce57bb05 100644
--- a/media-libs/clutter-gst/clutter-gst-2.0.6.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-2.0.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.6.ebuild,v 1.1 2013/07/23 19:29:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.6.ebuild,v 1.2 2013/09/05 18:55:06 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 CLUTTER_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 # inherit clutter after gnome2 so that defaults aren't overriden
 # inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
diff --git a/media-libs/fontconfig/fontconfig-2.10.92.ebuild b/media-libs/fontconfig/fontconfig-2.10.92.ebuild
index 013f960864d2..358e7656d731 100644
--- a/media-libs/fontconfig/fontconfig-2.10.92.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.10.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.92.ebuild,v 1.10 2013/09/02 11:13:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.92.ebuild,v 1.11 2013/09/05 12:19:10 ago Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=yes
@@ -13,7 +13,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/gexiv2/gexiv2-0.6.1.ebuild b/media-libs/gexiv2/gexiv2-0.6.1.ebuild
index a5e7899053bf..54187181cbd5 100644
--- a/media-libs/gexiv2/gexiv2-0.6.1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gexiv2/gexiv2-0.6.1.ebuild,v 1.6 2013/09/03 11:53:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gexiv2/gexiv2-0.6.1.ebuild,v 1.8 2013/09/05 19:22:15 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/lib${PN}_${PV}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 IUSE="introspection static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/lcms/lcms-1.19-r1.ebuild b/media-libs/lcms/lcms-1.19-r1.ebuild
index 589a2e5518a3..ccd6c22b755f 100644
--- a/media-libs/lcms/lcms-1.19-r1.ebuild
+++ b/media-libs/lcms/lcms-1.19-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r1.ebuild,v 1.2 2013/08/27 15:46:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r1.ebuild,v 1.3 2013/09/05 18:55:06 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 # autoreconf needs to update python macros for py3 support.
 AUTOTOOLS_AUTORECONF=1
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch b/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
new file mode 100644
index 000000000000..48c3dadda475
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.0-threads.patch
@@ -0,0 +1,64 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken@libsdl.org>
+# Date 1378390526 25200
+# Node ID e928464b98ec679471ea80d0d5fefe8b3406eef1
+# Parent  384d5ba7ee44f4c90ecb5b581113918a66b8371e
+Fixed bug 2076 - OpenGL doesn't work with --disable-threads
+
+stepik-777
+
+Thread local storage is used to store current window and current opengl context. OpenGL worked before this changeset: 7596 (45e5c263c096)
+
+diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_systhread.h
+--- a/src/thread/SDL_systhread.h	Thu Sep 05 07:02:27 2013 -0700
++++ b/src/thread/SDL_systhread.h	Thu Sep 05 07:15:26 2013 -0700
+@@ -26,6 +26,7 @@
+ #define _SDL_systhread_h
+ 
+ #include "SDL_thread.h"
++#include "SDL_thread_c.h"
+ 
+ /* This function creates a thread, passing args to SDL_RunThread(),
+    saves a system-dependent thread id in thread->id, and returns 0
+diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread.c
+--- a/src/thread/SDL_thread.c	Thu Sep 05 07:02:27 2013 -0700
++++ b/src/thread/SDL_thread.c	Thu Sep 05 07:15:26 2013 -0700
+@@ -125,6 +125,7 @@
+     SDL_TLSEntry *entry;
+     SDL_TLSData *storage = NULL;
+ 
++#if !SDL_THREADS_DISABLED
+     if (!SDL_generic_TLS_mutex) {
+         static SDL_SpinLock tls_lock;
+         SDL_AtomicLock(&tls_lock);
+@@ -139,6 +140,7 @@
+         }
+         SDL_AtomicUnlock(&tls_lock);
+     }
++#endif /* SDL_THREADS_DISABLED */
+ 
+     SDL_MemoryBarrierAcquire();
+     SDL_LockMutex(SDL_generic_TLS_mutex);
+@@ -148,7 +150,9 @@
+             break;
+         }
+     }
++#if !SDL_THREADS_DISABLED
+     SDL_UnlockMutex(SDL_generic_TLS_mutex);
++#endif
+ 
+     return storage;
+ }
+diff -r 384d5ba7ee44 -r e928464b98ec src/thread/SDL_thread_c.h
+--- a/src/thread/SDL_thread_c.h	Thu Sep 05 07:02:27 2013 -0700
++++ b/src/thread/SDL_thread_c.h	Thu Sep 05 07:15:26 2013 -0700
+@@ -23,6 +23,8 @@
+ #ifndef _SDL_thread_c_h
+ #define _SDL_thread_c_h
+ 
++#include "SDL_thread.h"
++
+ /* Need the definitions of SYS_ThreadHandle */
+ #if SDL_THREADS_DISABLED
+ #include "generic/SDL_systhread_c.h"
diff --git a/media-libs/libsdl2/libsdl2-2.0.0.ebuild b/media-libs/libsdl2/libsdl2-2.0.0.ebuild
index 7e17443eb508..496a8a42cb23 100644
--- a/media-libs/libsdl2/libsdl2-2.0.0.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.0.ebuild,v 1.2 2013/08/31 14:34:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.0.ebuild,v 1.3 2013/09/05 18:46:48 hasufell Exp $
 
 EAPI=5
 inherit autotools flag-o-matic toolchain-funcs eutils
@@ -14,7 +14,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs tslib udev +video X xinerama xscreensaver"
+IUSE="3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( audio )
 	fusionsound? ( audio )
@@ -58,7 +58,8 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
-	epatch "${FILESDIR}"/${P}-static-libs.patch
+	epatch "${FILESDIR}"/${P}-static-libs.patch \
+		"${FILESDIR}"/${P}-threads.patch
 	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
 }
 
@@ -77,9 +78,6 @@ src_configure() {
 	fi
 
 	# sorted by `./configure --help`
-	#
-	# --disable-threads broken
-	# https://bugzilla.libsdl.org/show_bug.cgi?id=2070
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable audio) \
@@ -89,7 +87,7 @@ src_configure() {
 		$(use_enable joystick) \
 		$(use_enable haptic) \
 		--enable-power \
-		--enable-threads \
+		$(use_enable threads) \
 		--enable-timers \
 		--enable-file \
 		--disable-loadso \
diff --git a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
index c12dc419e012..2785a64f2657 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.3 2013/08/07 21:05:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild,v 1.4 2013/09/05 18:55:07 mgorny Exp $
 
 EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 inherit autotools-multilib flag-o-matic python-any-r1
 
 MY_P=${P/_pre/pre}
diff --git a/media-libs/sk1libs/sk1libs-0.9.1-r2.ebuild b/media-libs/sk1libs/sk1libs-0.9.1-r2.ebuild
index 721d64c55833..aa1d99d7ea64 100644
--- a/media-libs/sk1libs/sk1libs-0.9.1-r2.ebuild
+++ b/media-libs/sk1libs/sk1libs-0.9.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r2.ebuild,v 1.2 2013/08/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r2.ebuild,v 1.3 2013/09/05 18:55:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 python-r1
 
diff --git a/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild b/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild
index e9d394f3ebe1..2d6862e0006a 100644
--- a/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild
+++ b/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild,v 1.2 2013/05/06 09:42:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild,v 1.3 2013/09/05 18:55:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1 python-r1
 
diff --git a/media-radio/tlf/tlf-1.1.6.ebuild b/media-radio/tlf/tlf-1.1.6.ebuild
index d2dfa4afec6a..f24d0b5e4390 100644
--- a/media-radio/tlf/tlf-1.1.6.ebuild
+++ b/media-radio/tlf/tlf-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tlf/tlf-1.1.6.ebuild,v 1.2 2013/08/31 09:44:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tlf/tlf-1.1.6.ebuild,v 1.3 2013/09/05 19:24:04 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.hs-mittweida.de/tb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses
diff --git a/media-sound/csound/csound-5.19.01.ebuild b/media-sound/csound/csound-5.19.01.ebuild
index 2ccf77bc587e..1d290cf0d54e 100644
--- a/media-sound/csound/csound-5.19.01.ebuild
+++ b/media-sound/csound/csound-5.19.01.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.19.01.ebuild,v 1.3 2013/01/08 06:12:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.19.01.ebuild,v 1.4 2013/09/05 18:57:17 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1
 
diff --git a/media-sound/flacon/flacon-0.8.0.ebuild b/media-sound/flacon/flacon-0.8.0.ebuild
index 53669c763716..515ebab6e2af 100644
--- a/media-sound/flacon/flacon-0.8.0.ebuild
+++ b/media-sound/flacon/flacon-0.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/flacon-0.8.0.ebuild,v 1.2 2013/05/29 13:12:57 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/flacon-0.8.0.ebuild,v 1.3 2013/09/05 18:57:17 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PLOCALES="cs_CZ es_MX fr gl it pl_PL pt_BR ro_RO ru si_LK uk zh_CN zh_TW"
 
 inherit python-single-r1 l10n
diff --git a/media-sound/lilypond/lilypond-2.16.2.ebuild b/media-sound/lilypond/lilypond-2.16.2.ebuild
index a3ba09ee6fd2..c527a3f09219 100644
--- a/media-sound/lilypond/lilypond-2.16.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.16.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild,v 1.4 2013/09/02 08:12:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild,v 1.5 2013/09/05 18:57:17 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit elisp-common autotools eutils python-single-r1
 
diff --git a/media-sound/lilypond/lilypond-2.17.23.ebuild b/media-sound/lilypond/lilypond-2.17.23.ebuild
index 7fc573a52975..83440fc80515 100644
--- a/media-sound/lilypond/lilypond-2.17.23.ebuild
+++ b/media-sound/lilypond/lilypond-2.17.23.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.23.ebuild,v 1.1 2013/07/30 06:18:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.23.ebuild,v 1.2 2013/09/05 18:57:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit elisp-common autotools eutils python-single-r1
 
diff --git a/media-sound/lilypond/lilypond-2.17.24.ebuild b/media-sound/lilypond/lilypond-2.17.24.ebuild
index 7bf339bbfd99..ca3afa708561 100644
--- a/media-sound/lilypond/lilypond-2.17.24.ebuild
+++ b/media-sound/lilypond/lilypond-2.17.24.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.24.ebuild,v 1.1 2013/08/16 04:04:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.17.24.ebuild,v 1.2 2013/09/05 18:57:17 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit elisp-common autotools eutils python-single-r1
 
diff --git a/media-sound/volti/volti-0.2.3-r1.ebuild b/media-sound/volti/volti-0.2.3-r1.ebuild
index daf9f91013ac..024ad9b22f80 100644
--- a/media-sound/volti/volti-0.2.3-r1.ebuild
+++ b/media-sound/volti/volti-0.2.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/volti/volti-0.2.3-r1.ebuild,v 1.2 2013/05/20 01:19:40 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/volti/volti-0.2.3-r1.ebuild,v 1.3 2013/09/05 18:57:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.9.9.ebuild
index 8ababcb2c7db..bfa41ed18bf4 100644
--- a/media-video/handbrake/handbrake-0.9.9.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.9 2013/08/12 07:51:08 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.10 2013/09/05 18:58:06 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit autotools eutils gnome2-utils python-any-r1
 
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 1d20994c6667..7f5f341d7637 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.11 2013/08/12 07:51:08 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.12 2013/09/05 18:58:06 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit autotools eutils gnome2-utils python-any-r1
 
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
index cd6d4a13140b..5ee19dd2c262 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.2 2013/08/11 22:54:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.3 2013/09/05 18:58:07 mgorny Exp $
 
 EAPI=5
 
 # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
-PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
 
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 9aec56d275fc..ec458ec3cb25 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.61 2013/08/11 22:54:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.62 2013/09/05 18:58:07 mgorny Exp $
 
 EAPI=5
 
 # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
-PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
 
diff --git a/media-video/pitivi/pitivi-0.15.2.ebuild b/media-video/pitivi/pitivi-0.15.2.ebuild
index a7d2ec9559bc..7094cb1fa426 100644
--- a/media-video/pitivi/pitivi-0.15.2.ebuild
+++ b/media-video/pitivi/pitivi-0.15.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.15.2.ebuild,v 1.1 2013/02/05 19:50:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.15.2.ebuild,v 1.2 2013/09/05 18:58:06 mgorny Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-single-r1 eutils virtualx multilib
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 784af61eeb3d..8d9acf42b7fc 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Sep 2013 12:06:56 +0000
+Fri, 06 Sep 2013 06:36:56 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 784af61eeb3d..8d9acf42b7fc 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Sep 2013 12:06:56 +0000
+Fri, 06 Sep 2013 06:36:56 +0000
diff --git a/metadata/md5-cache/app-accessibility/espeakup-9999 b/metadata/md5-cache/app-accessibility/espeakup-9999
index a7e48cc4ed75..2497980eb6e9 100644
--- a/metadata/md5-cache/app-accessibility/espeakup-9999
+++ b/metadata/md5-cache/app-accessibility/espeakup-9999
@@ -5,5 +5,5 @@ HOMEPAGE=http://www.github.com/williamh/espeakup
 LICENSE=GPL-3
 RDEPEND=app-accessibility/espeak
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8a5d5f01774fab00235db096950d0995
diff --git a/metadata/md5-cache/app-accessibility/speakup-9999 b/metadata/md5-cache/app-accessibility/speakup-9999
index 97fe25ea2a0c..29d5ef0ee3ad 100644
--- a/metadata/md5-cache/app-accessibility/speakup-9999
+++ b/metadata/md5-cache/app-accessibility/speakup-9999
@@ -7,5 +7,5 @@ IUSE=modules kernel_linux
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a076d77b660d1f2041eedd12c7b2c76
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2
index 70ab727fe87b..6f25d4e19708 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.7.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.7.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5e8cbda3ee8c5aa09af3d1ca0f47e752
+_md5_=e725b0db4c07c2ca00b049b56cf2dced
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 50bf0fd87103..65d35b664a16 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/jinja dev-python/pyyaml dev-python/paramiko net-misc/sshpass virtual/ssh python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e2e9527c7b5bbb133de3e102f54ccb52
diff --git a/metadata/md5-cache/app-admin/clustershell-1.6 b/metadata/md5-cache/app-admin/clustershell-1.6
index 5476c9b9152b..f19ade747d83 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.6
+++ b/metadata/md5-cache/app-admin/clustershell-1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.6.tar.gz -> clustershell-1.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ea2c6f986f5f6d9f0f30c4a8e66c6cee
+_md5_=ae387dc19d60d1ea25c04fff09a232c2
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.3.2 b/metadata/md5-cache/app-admin/eclean-kernel-0.3.2
deleted file mode 100644
index 1095807fb93b..000000000000
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Remove outdated built kernels
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/eclean-kernel/
-IUSE=python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://bitbucket/mgorny/eclean-kernel/downloads/eclean-kernel-0.3.2.tar.bz2
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b07fcb1c62f73047313b29a5dc18d927
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.3.3 b/metadata/md5-cache/app-admin/eclean-kernel-0.3.3
deleted file mode 100644
index 029261eb4cde..000000000000
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Remove outdated built kernels
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/eclean-kernel/
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://bitbucket/mgorny/eclean-kernel/downloads/eclean-kernel-0.3.3.tar.bz2
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b6afc97008118d6b2a8662da7f6110b
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4 b/metadata/md5-cache/app-admin/eclean-kernel-0.4
index dc162c53b692..f0615769f035 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/eclean-kernel/downloads/eclean-kernel-0.4.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e0771f962ff76836a084bdcfb368784
+_md5_=852ae3d7d779df1afb9899ca3d5745fc
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-9999 b/metadata/md5-cache/app-admin/eclean-kernel-9999
index b3c9a927eb15..f9e858ef2e50 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-9999
+++ b/metadata/md5-cache/app-admin/eclean-kernel-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1f1e63eb10a9fa94d9c0e769c7bf2dac
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=705ad992d4a4ab902781dba268a27ad5
diff --git a/metadata/md5-cache/app-admin/eselect-1.3.6 b/metadata/md5-cache/app-admin/eselect-1.3.6
index d50e0c64746c..0577044369b0 100644
--- a/metadata/md5-cache/app-admin/eselect-1.3.6
+++ b/metadata/md5-cache/app-admin/eselect-1.3.6
@@ -3,11 +3,12 @@ DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/rea
 DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=4
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Eselect
-IUSE=doc
-KEYWORDS=alpha amd64 arm 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=doc emacs vim-syntax
+KEYWORDS=alpha amd64 arm 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-2+
+PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-1.3.6.tar.xz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5e43cd75759a33bc8b4cbfd477758a16
+_md5_=2975147fa10529c632853b2b12066215
diff --git a/metadata/md5-cache/app-admin/eselect-9999 b/metadata/md5-cache/app-admin/eselect-9999
index c955ef9ae667..fc55be3c369b 100644
--- a/metadata/md5-cache/app-admin/eselect-9999
+++ b/metadata/md5-cache/app-admin/eselect-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=fe2713cb4ad53cbbd8666c1cb2241e26
diff --git a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999 b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999
index 9c914bef5e91..4d405923d4dc 100644
--- a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999
+++ b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/eselect-lib-bin-symlink/
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e0b007fd1926041acb637c688414c1d
diff --git a/metadata/md5-cache/app-admin/eselect-postgresql-1.2.0 b/metadata/md5-cache/app-admin/eselect-postgresql-1.2.0
index c324dafdd848..ae05cf7c01e7 100644
--- a/metadata/md5-cache/app-admin/eselect-postgresql-1.2.0
+++ b/metadata/md5-cache/app-admin/eselect-postgresql-1.2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~titanofold/eselect-postgresql-1.2.0.tbz2
-_md5_=a3667cda4cfb179a1b9ad73ad1dc1055
+_md5_=57116347bcce28543ce65c8b3bf61eb3
diff --git a/metadata/md5-cache/app-admin/eselect-python-99999999 b/metadata/md5-cache/app-admin/eselect-python-99999999
index 546b9834c976..f589f7b02e1a 100644
--- a/metadata/md5-cache/app-admin/eselect-python-99999999
+++ b/metadata/md5-cache/app-admin/eselect-python-99999999
@@ -5,5 +5,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=336b8f196174eec5248e9f489f47f4a1
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
index b9e93b07cd81..1fd2cf459a36 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Single process stack of various system monitors
 EAPI=4
 HOMEPAGE=http://www.gkrellm.net/
 IUSE=hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gtk+:2 )
 SLOT=2
 SRC_URI=http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.5.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1ccb4a44538016dcd6cc2c9d36dd19bd
+_md5_=a7d7543e7150dd9460dd37aed702afe9
diff --git a/metadata/md5-cache/app-admin/glance-2013.1.9999 b/metadata/md5-cache/app-admin/glance-2013.1.9999
index f8bdf0533d7c..4c4b9c0e756b 100644
--- a/metadata/md5-cache/app-admin/glance-2013.1.9999
+++ b/metadata/md5-cache/app-admin/glance-2013.1.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/boto dev-python/anyjson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/iso8601[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-1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/kombu[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[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/pycrypto >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-glanceclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/routes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] swift? ( >=dev-python/python-swiftclient-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite] <=dev-python/sqlalchemy-0.8[sqlite] ) mysql? ( >=dev-python/sqlalchemy-0.7[mysql] <=dev-python/sqlalchemy-0.8[mysql] ) postgres? ( >=dev-python/sqlalchemy-0.7[postgres] <=dev-python/sqlalchemy-0.8[postgres] ) ldap? ( dev-python/python-ldap ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( ldap mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2fe74bbf0602d24b46af797fd272b40f
diff --git a/metadata/md5-cache/app-admin/glance-9999 b/metadata/md5-cache/app-admin/glance-9999
index 0f1918d917f0..429fe3b01176 100644
--- a/metadata/md5-cache/app-admin/glance-9999
+++ b/metadata/md5-cache/app-admin/glance-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/boto dev-python/anyjson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/iso8601[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-1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/kombu[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[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/pycrypto >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-glanceclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/routes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] swift? ( >=dev-python/python-swiftclient-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite] <=dev-python/sqlalchemy-0.8[sqlite] ) mysql? ( >=dev-python/sqlalchemy-0.7[mysql] <=dev-python/sqlalchemy-0.8[mysql] ) postgres? ( >=dev-python/sqlalchemy-0.7[postgres] <=dev-python/sqlalchemy-0.8[postgres] ) ldap? ( dev-python/python-ldap ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( ldap mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b45fcb1b861d775b880de1b4ce5cf64
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index defda8fe30fa..525c65dc8557 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -7,5 +7,5 @@ IUSE=+git X zsh-completion fish-completion
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg app-admin/pwgen app-text/tree git? ( dev-vcs/git ) X? ( x11-misc/xclip ) zsh-completion? ( app-shells/zsh ) fish-completion? ( app-shells/fish )
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=1b6656f0b40d3ba3d8c855bc9ab7285c
diff --git a/metadata/md5-cache/app-admin/python-updater-9999 b/metadata/md5-cache/app-admin/python-updater-9999
index 6a2606c48ffe..47e9fcbedcc9 100644
--- a/metadata/md5-cache/app-admin/python-updater-9999
+++ b/metadata/md5-cache/app-admin/python-updater-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/Python/
 LICENSE=GPL-2
 RDEPEND=dev-lang/python || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=896823caac8adab193f35adfd3540f09
diff --git a/metadata/md5-cache/app-admin/rex-0.42.4 b/metadata/md5-cache/app-admin/rex-0.42.4
new file mode 100644
index 000000000000..58474c6b4d7b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rex-0.42.4
@@ -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-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=(R)?ex is a small script to ease the execution of remote commands.
+EAPI=4
+HOMEPAGE=http://search.cpan.org/dist/rex/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/Net-SSH2 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/J/JF/JFRIED/Rex-0.42.4.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e953749ebf22955e29e06e8e89138965
diff --git a/metadata/md5-cache/app-admin/sagan-rules-99999999 b/metadata/md5-cache/app-admin/sagan-rules-99999999
index fb9307800a4c..6c6450d7c5a5 100644
--- a/metadata/md5-cache/app-admin/sagan-rules-99999999
+++ b/metadata/md5-cache/app-admin/sagan-rules-99999999
@@ -7,5 +7,5 @@ IUSE=+lognorm
 LICENSE=BSD
 PDEPEND=app-admin/sagan
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=c380bc247c23a8a2c97d5e84d8e11806
diff --git a/metadata/md5-cache/app-admin/salt-9999 b/metadata/md5-cache/app-admin/salt-9999
index 9695cd40036c..37f149a8d02c 100644
--- a/metadata/md5-cache/app-admin/salt-9999
+++ b/metadata/md5-cache/app-admin/salt-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pyzmq-2.1.9[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/msgpack[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sys-apps/pciutils mako? ( dev-python/mako[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) openssl? ( dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) libvirt? ( app-emulation/libvirt[python] ) mongodb? ( dev-python/pymongo[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e13d4cc8f2a09b3615b4c10d8e38d61a
diff --git a/metadata/md5-cache/app-admin/supervisor-3.0 b/metadata/md5-cache/app-admin/supervisor-3.0
index 15477a72f91f..fa749a7226e3 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.0
+++ b/metadata/md5-cache/app-admin/supervisor-3.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0b52cd7d911634637819f3cd09e4380d
+_md5_=7d27fac82a89568a2e12637d5909c8d8
diff --git a/metadata/md5-cache/app-admin/supervisor-3.0_beta2-r1 b/metadata/md5-cache/app-admin/supervisor-3.0_beta2-r1
index 184b9d2b6ef2..4158dad619a3 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.0_beta2-r1
+++ b/metadata/md5-cache/app-admin/supervisor-3.0_beta2-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.0b2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=65214c8b30074ccc087f69d62ca1a1b3
+_md5_=4c7fa960562371bde22132dd42074217
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.50.19-r1 b/metadata/md5-cache/app-admin/webapp-config-1.50.19-r1
index e47aa6215a43..f56f34690b6f 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.50.19-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.50.19-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/webapp-config/webapp-config-1.50.19.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=875de7f252291d07ab03504565d49dfe
+_md5_=15bf15c33233fd8249b948b832ef4aa7
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.51-r1 b/metadata/md5-cache/app-admin/webapp-config-1.51-r1
index 7cde286eefa1..7bd378948279 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.51-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.51-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/webapp-config/webapp-config-1.51.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fb46de7686e12b5522929db1e7e844c5
+_md5_=72464e75d0164c0c70e2c233d134b874
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index 1e8a2cbe15f3..6b123ac38ccc 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=portage? ( sys-apps/portage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a08357e4d66c525a1d7b50fa90c6dd1
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=09c903b09cd12ac4d962471121993a0b
diff --git a/metadata/md5-cache/app-arch/pixz-9999 b/metadata/md5-cache/app-arch/pixz-9999
index 747389b86d36..dce2230850e3 100644
--- a/metadata/md5-cache/app-arch/pixz-9999
+++ b/metadata/md5-cache/app-arch/pixz-9999
@@ -7,5 +7,5 @@ IUSE=static
 LICENSE=BSD-2
 RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1db4c9439525bc12b498428b9585a6f0
diff --git a/metadata/md5-cache/app-arch/pxz-9999 b/metadata/md5-cache/app-arch/pxz-9999
index 0270a7ba3504..c7c5cdebf319 100644
--- a/metadata/md5-cache/app-arch/pxz-9999
+++ b/metadata/md5-cache/app-arch/pxz-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
 LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils sys-devel/gcc[openmp]
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e2a77d91cf47ecf423dac4dfece9cdd
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 1f0fbe3bf5cf..89ccbd86a85e 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -7,5 +7,5 @@ IUSE=nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_x86_32 abi_x
 LICENSE=LGPL-2.1
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=145c63213ac155a9448743cbba76612e
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.3 b/metadata/md5-cache/app-backup/amanda-3.3.3
index e4f647ed03f3..ed1e502a2ca4 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.3
+++ b/metadata/md5-cache/app-backup/amanda-3.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=3
 HOMEPAGE=http://www.amanda.org/
 IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
-KEYWORDS=amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b0c9fc3bcd7445d44b25eb173123f347
+_md5_=01e6d787afcf869fb5cd01671510f9b2
diff --git a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.5-r1 b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.5-r1
index 240989237c14..d4d82e88d2fe 100644
--- a/metadata/md5-cache/app-benchmarks/bootchart2-0.14.5-r1
+++ b/metadata/md5-cache/app-benchmarks/bootchart2-0.14.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=X? ( || ( python_targets_python2_6 python_targets_python2_7 python_
 SLOT=0
 SRC_URI=mirror://github/mmeeks/bootchart/bootchart2-0.14.5.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e66ad5159bd63e12a45eef5171300bcb
+_md5_=9bcdd9a544b3c0ed801f0385f54d6c4c
diff --git a/metadata/md5-cache/app-benchmarks/os-autoinst-9999 b/metadata/md5-cache/app-benchmarks/os-autoinst-9999
index 49351bc66879..476a04197aa0 100644
--- a/metadata/md5-cache/app-benchmarks/os-autoinst-9999
+++ b/metadata/md5-cache/app-benchmarks/os-autoinst-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://os-autoinst.org/
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opencv-2.4 dev-lang/perl[ithreads] dev-perl/JSON app-emulation/qemu app-text/gocr media-gfx/imagemagick media-video/ffmpeg2theora
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=41fa55493ca551fd1e4a6016499c7b9f
diff --git a/metadata/md5-cache/app-cdr/mirage2iso-9999 b/metadata/md5-cache/app-cdr/mirage2iso-9999
index e10dfb5fc63f..eb6d1820b249 100644
--- a/metadata/md5-cache/app-cdr/mirage2iso-9999
+++ b/metadata/md5-cache/app-cdr/mirage2iso-9999
@@ -7,5 +7,5 @@ IUSE=pinentry test
 LICENSE=BSD
 RDEPEND=>=dev-libs/libmirage-2.0.0 dev-libs/glib:2 pinentry? ( dev-libs/libassuan ) pinentry? ( app-crypt/pinentry )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1ed2f1acae1e150a0208cc803ab4eae
diff --git a/metadata/md5-cache/app-crypt/heimdal-1.5.3-r1 b/metadata/md5-cache/app-crypt/heimdal-1.5.3-r1
index 7c78462530ef..e7b7578cbafc 100644
--- a/metadata/md5-cache/app-crypt/heimdal-1.5.3-r1
+++ b/metadata/md5-cache/app-crypt/heimdal-1.5.3-r1
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gd
 SLOT=0
 SRC_URI=http://www.h5l.org/dist/src/heimdal-1.5.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=460c401960fbe33ef95bcc391fba7fe0
+_md5_=488439aada17c70160532e9540aeed68
diff --git a/metadata/md5-cache/app-crypt/ima-evm-utils-9999 b/metadata/md5-cache/app-crypt/ima-evm-utils-9999
index fb0b37b6d0ca..eeb32e922924 100644
--- a/metadata/md5-cache/app-crypt/ima-evm-utils-9999
+++ b/metadata/md5-cache/app-crypt/ima-evm-utils-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://linux-ima.sourceforge.net
 LICENSE=GPL-2
 RDEPEND=sys-apps/keyutils
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c84c983df901f880e1bb03f603fda1e
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.11.1 b/metadata/md5-cache/app-crypt/mit-krb5-1.11.1
index 74f7924ffb28..b671b5661fa4 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.11.1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.11.1
@@ -10,4 +10,4 @@ RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libve
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.1-signed.tar
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e627180ceba81e340d1fca0de71ba9fa
+_md5_=3b01e41e964675019e1bb31bbd6f9899
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.11.2 b/metadata/md5-cache/app-crypt/mit-krb5-1.11.2
index 75f196dff863..2d87cd844fca 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.11.2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.11.2
@@ -10,4 +10,4 @@ RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libve
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.2-signed.tar
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a9bad910daecc7707bf5562565a5c16d
+_md5_=0d681d526f85b4d7802df947abff9ee1
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.11.2-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.11.2-r1
index 043481fef58b..b356d965d870 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.11.2-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.11.2-r1
@@ -10,4 +10,4 @@ RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libve
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.2-signed.tar
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6db7b9348a1f201656a1b1a78ec423af
+_md5_=ea0dca33a370d508b842a888c4925323
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.11.3 b/metadata/md5-cache/app-crypt/mit-krb5-1.11.3
index 71cf7c3ff6e6..e8e4635a3668 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.11.3
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.11.3
@@ -10,4 +10,4 @@ RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libve
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.3-signed.tar
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f74825aa45a07ea2a3ec2b66dca206e6
+_md5_=8aed5472e3e9ed4619d344d26bb42678
diff --git a/metadata/md5-cache/app-doc/devmanual-9999 b/metadata/md5-cache/app-doc/devmanual-9999
index 41249011014a..7dc29006e7ff 100644
--- a/metadata/md5-cache/app-doc/devmanual-9999
+++ b/metadata/md5-cache/app-doc/devmanual-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://devmanual.gentoo.org/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=CC-BY-SA-2.0
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=714cfb165125744ce17fca48599f72c5
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.3.1 b/metadata/md5-cache/app-doc/doxygen-1.8.3.1
index 51e14fc6cbcd..f9cc380b8907 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.3.1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.3.1
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.3.1.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6f8de298d723f7ed4cd13a814b66adf1
+_md5_=fc8b125b0e2563deba99f7b82c532cf0
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.4-r2 b/metadata/md5-cache/app-doc/doxygen-1.8.4-r2
index 6fafc46583a1..184cd280893e 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.4-r2
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.4-r2
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.4.src.tar.gz http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=960706df22427f5db5dce8b34d576e87
+_md5_=91f00e8d0de82a54dd69a95680508709
diff --git a/metadata/md5-cache/app-doc/pms-9999 b/metadata/md5-cache/app-doc/pms-9999
index 51a3de246559..7444824402bb 100644
--- a/metadata/md5-cache/app-doc/pms-9999
+++ b/metadata/md5-cache/app-doc/pms-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/qa/pms.xml
 IUSE=html
 LICENSE=CC-BY-SA-3.0
 SLOT=live
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=7398cfee26ede64ea25df774e1f8fbc4
diff --git a/metadata/md5-cache/app-editors/gvim-7.3.1214 b/metadata/md5-cache/app-editors/gvim-7.3.1214
index b55e8c8b4430..aae7c477146e 100644
--- a/metadata/md5-cache/app-editors/gvim-7.3.1214
+++ b/metadata/md5-cache/app-editors/gvim-7.3.1214
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.3.1214.patch.bz2
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	0672fce36e8067fa486443678d40f43b	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=81c30e887ac5998dbb135e35ffa64b0c
+_md5_=878c84bf8de9545ff9819c3267c3c190
diff --git a/metadata/md5-cache/app-editors/hteditor-2.0.22 b/metadata/md5-cache/app-editors/hteditor-2.0.22
index 3a3d8de94391..99882bf98288 100644
--- a/metadata/md5-cache/app-editors/hteditor-2.0.22
+++ b/metadata/md5-cache/app-editors/hteditor-2.0.22
@@ -4,10 +4,10 @@ DESCRIPTION=A file viewer, editor and analyzer for text, binary, and executable
 EAPI=5
 HOMEPAGE=http://hte.sourceforge.net/
 IUSE=X
-KEYWORDS=amd64 ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hte/ht-2.0.22.tar.bz2
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=4b1abf4300bb71812db9d1a53a525e4c
+_md5_=049677215fae01adea2383afbe442acf
diff --git a/metadata/md5-cache/app-editors/retext-4.0.1-r2 b/metadata/md5-cache/app-editors/retext-4.0.1-r2
index 348e45da82d9..97980b863d9e 100644
--- a/metadata/md5-cache/app-editors/retext-4.0.1-r2
+++ b/metadata/md5-cache/app-editors/retext-4.0.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Qt-based text editor for Markdown and reStructuredText
 EAPI=5
 HOMEPAGE=http://sourceforge.net/p/retext/home/ReText/
 IUSE=+spell python_targets_python2_7 python_targets_python3_2 linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_es linguas_et linguas_eu linguas_fr linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/markups[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/PyQt4[webkit,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] spell? ( dev-python/pyenchant ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/retext/ReText-4.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7c70f0f2efefa851f4fa78de041d1fb
+_md5_=2dd955556a8ba3102d620a262c0bd0e7
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index ad60eae73c4d..71271f7a5393 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/markups[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/PyQt4[webkit,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] spell? ( dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed35bc5fb63877d0a0fe97735bf3b5f8
diff --git a/metadata/md5-cache/app-editors/vim-7.3.1214 b/metadata/md5-cache/app-editors/vim-7.3.1214
index 0015efbe0ee5..a3b63009e8ee 100644
--- a/metadata/md5-cache/app-editors/vim-7.3.1214
+++ b/metadata/md5-cache/app-editors/vim-7.3.1214
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.3.1214.patch.bz2
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim	0672fce36e8067fa486443678d40f43b	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=29258346bcdcc310d0b0108cb1f0ff5e
+_md5_=c7a984079e0fcd2d1b59de40a34d4d03
diff --git a/metadata/md5-cache/app-editors/vim-7.4.22 b/metadata/md5-cache/app-editors/vim-7.4.22
new file mode 100644
index 000000000000..66dedb5df886
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-7.4.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.22 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) python_single_target_python3_2? ( dev-lang/python:3.2[threads] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt ) >=app-admin/eselect-vi-1.1 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext )
+DESCRIPTION=vim and gvim shared files
+EAPI=5
+HOMEPAGE=http://www.vim.org/
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python ruby vim-pager python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
+KEYWORDS=~alpha ~amd64 ~arm ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.22 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_6? ( dev-lang/python:2.6[threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[threads] ) python_single_target_python3_2? ( dev-lang/python:3.2[threads] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt )
+REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_2? ( python_targets_python3_2 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3 ) )
+SLOT=0
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.22.patch.bz2
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_md5_=ab9adcd9d13f40e1d54fa19aee5ec01c
diff --git a/metadata/md5-cache/app-editors/vim-core-7.4.22 b/metadata/md5-cache/app-editors/vim-core-7.4.22
new file mode 100644
index 000000000000..9a964a08aa49
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-core-7.4.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=5
+HOMEPAGE=http://www.vim.org/
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.22.patch.bz2
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_md5_=932ddf6650961524e46ae3ad94842fb1
diff --git a/metadata/md5-cache/app-editors/vim-qt-20130201 b/metadata/md5-cache/app-editors/vim-qt-20130201
index 3f9bc659c5a0..27692d8833c1 100644
--- a/metadata/md5-cache/app-editors/vim-qt-20130201
+++ b/metadata/md5-cache/app-editors/vim-qt-20130201
@@ -10,4 +10,4 @@ RDEPEND=app-admin/eselect-vi >=app-editors/vim-core-7.3.762[acl?] sys-libs/ncurs
 SLOT=0
 SRC_URI=https://github.com/equalsraf/vim-qt/archive/package-20130201.tar.gz -> vim-qt-20130201.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=203aadf43090417b91347c14f91fd44b
+_md5_=6feb5bf787fdfc10ac2981d9fc279af4
diff --git a/metadata/md5-cache/app-editors/vim-qt-20130220 b/metadata/md5-cache/app-editors/vim-qt-20130220
index e7ad00ef8747..a9a519204031 100644
--- a/metadata/md5-cache/app-editors/vim-qt-20130220
+++ b/metadata/md5-cache/app-editors/vim-qt-20130220
@@ -10,4 +10,4 @@ RDEPEND=app-admin/eselect-vi >=app-editors/vim-core-7.3.762[acl?] sys-libs/ncurs
 SLOT=0
 SRC_URI=https://github.com/equalsraf/vim-qt/archive/package-20130220.tar.gz -> vim-qt-20130220.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=941d74318c120d213d1b1ac953487cad
+_md5_=cd111c32fad3233de7faade4f5fe935b
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.3.8 b/metadata/md5-cache/app-emacs/eselect-mode-1.3.8
index 446550da56c2..24fb43fd99c4 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.3.8
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.3.8
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-21
 DESCRIPTION=Emacs major mode for editing eselect files
 EAPI=5
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Eselect
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-1.3.8.tar.xz
 _eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=66554ce2a9a4d4f15857899b22185f3d
+_md5_=3b555c8a6970456ef8802d913c241573
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-9999 b/metadata/md5-cache/app-emacs/eselect-mode-9999
index c560e3c10358..381d76ebd8bb 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-9999
+++ b/metadata/md5-cache/app-emacs/eselect-mode-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Eselect
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-21
 SLOT=0
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eba12b63d2c4af8aa6804b9d0ae05fc4
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.25-r1 b/metadata/md5-cache/app-emacs/pymacs-0.25-r1
index 4c40bf9e4aef..213a84760461 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.25-r1
+++ b/metadata/md5-cache/app-emacs/pymacs-0.25-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/pinard/Pymacs/tarball/v0.25 -> pymacs-0.25.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=b747d15e54d690e99bf53a9b24cdcbc5
+_md5_=a805343d1c378a01a4125922af86f32a
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index 78e67177669f..157fd2f1def1 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-9999
+++ b/metadata/md5-cache/app-emacs/twittering-mode-9999
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg >=virtual/emacs-21
 SLOT=0
-_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=935180d9cc34474acfb3de75188bd155
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3
index a6af52c12c6e..a153416be986 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=compile configure install prepare
 DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-proto/xf86dgaproto ) >=sys-devel/autoconf-2.57
 DESCRIPTION=DOS Emulator
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXex
 SLOT=0
 SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz http://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-15cfb41ff20a052769d753c3262c57ecb050ad71.zip -> dosemu-1.4.1_pre20130107.zip
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bfba6b6dd3b927ead79cafb20030b781
+_md5_=c2153861cd3ed05075940f110b5f2920
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.1.1-r1 b/metadata/md5-cache/app-emulation/libvirt-1.1.1-r1
index 1c04c56d93fd..d967c144a986 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.1.1-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-1.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.1.1.tar.gz ftp://libvirt.org/libvirt/libvirt-1.1.1.tar.gz http://dev.gentoo.org/~cardoe/distfiles/libvirt-1.1.1-864bcb0e.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=14e00250d5b964105ac7844cdec889f5
+_md5_=972e789bfd0fb47f5a209c229628e6ef
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.1.1-r5 b/metadata/md5-cache/app-emulation/libvirt-1.1.1-r5
index 02edd77b7ae1..4bde75768d0b 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.1.1-r5
+++ b/metadata/md5-cache/app-emulation/libvirt-1.1.1-r5
@@ -11,4 +11,4 @@ REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.1.1.tar.gz ftp://libvirt.org/libvirt/libvirt-1.1.1.tar.gz http://dev.gentoo.org/~cardoe/distfiles/libvirt-1.1.1-dfae2d62.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=90d5f663d48fcb56c2e3d6ee2e2c8434
+_md5_=56154b65ba6ceb581e4c5be50a1e0ee9
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.1.2 b/metadata/md5-cache/app-emulation/libvirt-1.1.2
index 6d81437e4fe8..01521361945b 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.1.2
+++ b/metadata/md5-cache/app-emulation/libvirt-1.1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.1.2.tar.gz ftp://libvirt.org/libvirt/libvirt-1.1.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3577857665839ede0c4e3cefd4c8b281
+_md5_=69e7b23d29aac874f3447cac5e7cb623
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 4fe6fb923b8e..4442c21a6d7c 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=262bf12bfbfd300300dd0d309b85f06d
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c84be6498be17091f3e765bfd6314258
diff --git a/metadata/md5-cache/app-emulation/qemu-1.4.2 b/metadata/md5-cache/app-emulation/qemu-1.4.2
index 7adfbb7ef37a..8fae50f426f7 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.4.2
+++ b/metadata/md5-cache/app-emulation/qemu-1.4.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_sof
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.4.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.4.2-6b5934f9.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=136ab1ceca4d5daf5a05d2077b99e690
+_md5_=4240b4d2dc902a8981f54e390f5ddb6c
diff --git a/metadata/md5-cache/app-emulation/qemu-1.5.2-r1 b/metadata/md5-cache/app-emulation/qemu-1.5.2-r1
index ce0b985be0e5..9fd8e0be6af7 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.5.2-r1
+++ b/metadata/md5-cache/app-emulation/qemu-1.5.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_sof
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.5.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.5.2-e26b4ba6.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b1c80e518f61f603c458c3d250f5781b
+_md5_=8e624f48caf1a7a5a2caff7fc19e7ea6
diff --git a/metadata/md5-cache/app-emulation/qemu-1.5.2-r2 b/metadata/md5-cache/app-emulation/qemu-1.5.2-r2
index 1416aa0e21e0..d194aea122f0 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.5.2-r2
+++ b/metadata/md5-cache/app-emulation/qemu-1.5.2-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_sof
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.5.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.5.2-fd9f079c.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=92147ddf1b7bed667e7d596e5fa9d622
+_md5_=415f323dbe23e1e6be52e0be829c302e
diff --git a/metadata/md5-cache/app-emulation/qemu-1.5.3 b/metadata/md5-cache/app-emulation/qemu-1.5.3
index c40f964408ef..1f60f8b80f99 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.5.3
+++ b/metadata/md5-cache/app-emulation/qemu-1.5.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_sof
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.5.3.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.5.3-25d93791.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=693ead20ce20b7fdb263910dc846a811
+_md5_=a41f581b8992d703f52094bde8f6eb7d
diff --git a/metadata/md5-cache/app-emulation/qemu-1.6.0 b/metadata/md5-cache/app-emulation/qemu-1.6.0
index 39bff0358212..0a308f6edad7 100644
--- a/metadata/md5-cache/app-emulation/qemu-1.6.0
+++ b/metadata/md5-cache/app-emulation/qemu-1.6.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_sof
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.6.0.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.6.0-49bdd50f.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a3d382e3afed0a04e67078f998aea846
+_md5_=04370a12c40a748e3da951a0393c0b92
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index dc944916a013..fa9e66e38a1c 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
 REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus ) python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) virtfs? ( xattr )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c7e677ddf005dd023d5ba15ac974480b
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=52fbffbe407b344fb841bd976b75b46c
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-1.5.2-r1 b/metadata/md5-cache/app-emulation/qemu-guest-agent-1.5.2-r1
index 8a499a8703ae..94d8382a604d 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-1.5.2-r1
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-1.5.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.5.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.5.2-e26b4ba6.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=919d72e54afaf13585da0608723bde29
+_md5_=7ef956165027029262acc17f1a073f74
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-1.6.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-1.6.0
index b65de939f618..6d4b3cd60170 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-1.6.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-1.6.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.22 !<app-emulation/qemu-1.1.1-r1
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-1.6.0.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.6.0-49bdd50f.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f829edec4a66bdfe5c78501cd0f9c2cc
+_md5_=51d9cc768e30997a763495c8d35ad3d3
diff --git a/metadata/md5-cache/app-emulation/qemu-user-9999 b/metadata/md5-cache/app-emulation/qemu-user-9999
index 2f551f81b6f9..0b431e6a150f 100644
--- a/metadata/md5-cache/app-emulation/qemu-user-9999
+++ b/metadata/md5-cache/app-emulation/qemu-user-9999
@@ -7,5 +7,5 @@ IUSE=+qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha
 LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6ff5b23312e3988b38fb16dee590a7de
diff --git a/metadata/md5-cache/app-emulation/spice-0.12.3-r1 b/metadata/md5-cache/app-emulation/spice-0.12.3-r1
index b6f9d380cac5..c4fcd1b06ec9 100644
--- a/metadata/md5-cache/app-emulation/spice-0.12.3-r1
+++ b/metadata/md5-cache/app-emulation/spice-0.12.3-r1
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/pixman-0.17.7 >=dev-libs/glib-2.22:2 media-libs/alsa-lib >=me
 SLOT=0
 SRC_URI=http://spice-space.org/download/releases/spice-0.12.3.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=21086197a0961afc19ae013ab9b516db
+_md5_=0a2e409089dccee3eff8c5fbd1bf6966
diff --git a/metadata/md5-cache/app-emulation/spice-0.12.4 b/metadata/md5-cache/app-emulation/spice-0.12.4
index e2ea9ed3504c..d1cc3d840ca2 100644
--- a/metadata/md5-cache/app-emulation/spice-0.12.4
+++ b/metadata/md5-cache/app-emulation/spice-0.12.4
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/pixman-0.17.7 >=dev-libs/glib-2.22:2 media-libs/alsa-lib >=me
 SLOT=0
 SRC_URI=http://spice-space.org/download/releases/spice-0.12.4.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f40c20326b7abf9d8b8fda1ef858873b
+_md5_=9def92570353d19d8d28c2d08c9dfec3
diff --git a/metadata/md5-cache/app-emulation/virt-manager-0.10.0 b/metadata/md5-cache/app-emulation/virt-manager-0.10.0
index d41fb31d3c5f..9080ea9369bc 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-0.10.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-0.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=5
 HOMEPAGE=http://virt-manager.org
 IUSE=gnome-keyring policykit sasl debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!app-emulation/virtinst x11-libs/gtk+:3[introspection] >=app-emulation/libvirt-0.7.0[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=app-emulation/libvirt-glib-0.0.9[introspection,python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/urlgrabber[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] net-misc/spice-gtk[gtk3,introspection,python,sasl?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] x11-libs/vte:2.90[introspection] gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit[introspection] ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-0.10.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0714d5298d5fc017751dd0d719c893b4
+_md5_=d668819b7c52610e0c45bcc92ebf3242
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index dfdbf15b1cdb..2d685b731c9b 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!app-emulation/virtinst x11-libs/gtk+:3[introspection] >=app-emulation/libvirt-0.7.0[python] >=app-emulation/libvirt-glib-0.0.9 python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/urlgrabber[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] x11-libs/vte:2.90[introspection] gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( net-misc/spice-gtk[gtk3,introspection,python,sasl?] ) vnc? ( >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29c18e3bad7938df9244e94a35601c74
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index 640213ff2457..5f19b0a0a1b6 100644
--- a/metadata/md5-cache/app-emulation/wine-9999
+++ b/metadata/md5-cache/app-emulation/wine-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.0.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=bb0b5106b3e2b1859ed7d20f8691849d
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.2 b/metadata/md5-cache/app-i18n/ibus-1.5.2
index 4a841b32c5fa..7d3046a364dd 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.2
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.5.2.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8e7e454ab35ed5e5160c922771bc3c15
+_md5_=7d5ad3e91b217d330fac1f211cae7844
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.3 b/metadata/md5-cache/app-i18n/ibus-1.5.3
index f612e02bc6bf..e33d4293fda2 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.3
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.5.3.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e6acd9699dfde35576f2deede9edd37e
+_md5_=8da24d19ebe80d77d3b5fc4ba78dbcb1
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0
index 115a1a475278..30df7ef7c85c 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.0
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_ta
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-anthy-1.5.0.tar.gz https://raw.github.com/ibus/ibus-anthy/1.5.0/engine/anthy.i
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e59340e6322c63315d656c952847b764
+_md5_=ce59c482e13671ebde786fc14b3604eb
diff --git a/metadata/md5-cache/app-i18n/kde-l10n-scripts-9999 b/metadata/md5-cache/app-i18n/kde-l10n-scripts-9999
index 9627b901a675..ea82bd4861e2 100644
--- a/metadata/md5-cache/app-i18n/kde-l10n-scripts-9999
+++ b/metadata/md5-cache/app-i18n/kde-l10n-scripts-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/vpelcak/kde-scripts
 LICENSE=LGPL-3
 RDEPEND=app-crypt/md5deep app-i18n/pology app-shells/bash dev-vcs/subversion kde-base/kdesdk-misc[extras]
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=76313b818c244c6c0b9500d4efebe68d
diff --git a/metadata/md5-cache/app-i18n/rskkserv-2.95.4 b/metadata/md5-cache/app-i18n/rskkserv-2.95.4
deleted file mode 100644
index def912af5aee..000000000000
--- a/metadata/md5-cache/app-i18n/rskkserv-2.95.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=dev-ruby/ruby-tcpwrap =dev-lang/ruby-1.8*
-DESCRIPTION=rskkserv is an alternative version of skkserv implemented by Ruby
-HOMEPAGE=http://raa.ruby-lang.org/list.rhtml?name=rskkserv
-KEYWORDS=~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-ruby/ruby-tcpwrap app-i18n/skk-jisyo =dev-lang/ruby-1.8*
-SLOT=0
-SRC_URI=http://www.unixuser.org/~ysjj/rskkserv/rskkserv-2.95.4.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=edc066c4ae647a6903896078fbd57412
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.9.2 b/metadata/md5-cache/app-i18n/transifex-client-0.9.2
index bf534ed81e1b..eb15c55fadd1 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.9.2
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/transifex/transifex-client/archive/0.9.2.tar.gz -> transifex-client-0.9.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f811aeacfe5eb68543ded1d21da70854
+_md5_=bdd536c8e8a7e79f8b9972e367eaf3ae
diff --git a/metadata/md5-cache/app-laptop/tpacpi-bat-9999 b/metadata/md5-cache/app-laptop/tpacpi-bat-9999
index 38688506b77e..7d0d6675d1b5 100644
--- a/metadata/md5-cache/app-laptop/tpacpi-bat-9999
+++ b/metadata/md5-cache/app-laptop/tpacpi-bat-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
 LICENSE=GPL-3
 RDEPEND=sys-power/acpi_call dev-lang/perl
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5c64c230403351619277eb0e5473974
diff --git a/metadata/md5-cache/app-leechcraft/laretz-9999 b/metadata/md5-cache/app-leechcraft/laretz-9999
index 56e9bf7fcaa6..7a096614ef06 100644
--- a/metadata/md5-cache/app-leechcraft/laretz-9999
+++ b/metadata/md5-cache/app-leechcraft/laretz-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost ~app-leechcraft/liblaretz-9999 dev-db/mongodb
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec6ad8cd56150ecb1daaed79d1838771
diff --git a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999 b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
index 106e6989d692..3233603aa054 100644
--- a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df6e2f26f9bbe84d60fa471396c70cfa
diff --git a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999 b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
index 99bcbfa08464..278b3bd4205a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?,sqlite?] dev-qt/qtwebkit:4 virtual/leechcraft-downloader-http
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8215d5e1401879c566a298ac1156e21e
diff --git a/metadata/md5-cache/app-leechcraft/lc-anhero-9999 b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
index bc7142e6cccd..af885760cf84 100644
--- a/metadata/md5-cache/app-leechcraft/lc-anhero-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 sys-devel/gdb
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3dee9b06458a511968aecb3c49a27e44
diff --git a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999 b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
index 11001fef6cd3..5ce4e8233017 100644
--- a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9a1c6dcb2d9500d37bdfbe97c81d5dcf
diff --git a/metadata/md5-cache/app-leechcraft/lc-azoth-9999 b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
index 9e2b3b376581..8e1b097724f4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-azoth-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwebkit:4 dev-qt/qtmultimedia:4 autoidler? ( x11-libs/libXScrnSaver ) astrality? ( net-libs/telepathy-qt ) otroid? ( net-libs/libotr ) media? ( dev-qt/qtmultimedia:4 ) msn? ( net-libs/libmsn ) spell? ( app-text/hunspell ) xmpp? ( =net-libs/qxmpp-9999 media-libs/speex ) xtazy? ( app-leechcraft/lc-xtazy dev-qt/qtdbus:4 ) crypt? ( app-crypt/qca app-crypt/qca-gnupg ) astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base )
 REQUIRED_USE=|| ( standardstyles adiumstyles )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f5003e11eedcdba5e0b8d89fb661c987
diff --git a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999 b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
index 6bf5b3f06a71..5833564f87fb 100644
--- a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
@@ -7,5 +7,5 @@ IUSE=debug geoip
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 net-libs/rb_libtorrent virtual/leechcraft-task-show geoip? ( dev-libs/geoip )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=22e599f90a2d0ef74ef47e43e4c4111d
diff --git a/metadata/md5-cache/app-leechcraft/lc-blasq-9999 b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
index 3960abd30208..843566d86a03 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blasq-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
@@ -7,5 +7,5 @@ IUSE=debug +deathnote +rappor +spegnersi +vangog
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 deathnote? ( dev-qt/qtxmlpatterns:4 ) spegnersi? ( dev-libs/kqoauth ) vangog? ( dev-libs/qjson )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=92f0e155b02b99481eddce3ff648ad6b
diff --git a/metadata/md5-cache/app-leechcraft/lc-blogique-9999 b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
index 253780da4b73..eef2c46a3028 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blogique-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
@@ -7,5 +7,5 @@ IUSE=debug +metida +hestia
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtsql:4[sqlite] metida? ( dev-qt/qtxmlpatterns:4 ) virtual/leechcraft-wysiwyg-editor
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4b42c4d6a1921eac76f9048682d87256
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-9999 b/metadata/md5-cache/app-leechcraft/lc-core-9999
index a0c370e2e57f..827fbcbad826 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-core-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=>=dev-libs/boost-1.46 dev-qt/qtcore:4 dev-qt/qtdeclarative:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsql:4[postgres?,sqlite?] dev-qt/qtwebkit:4 dev-qt/qtsvg:4 || ( kde-base/oxygen-icons x11-themes/kfaenza )
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cfc1d8c3a918eb97307430bb02746a1e
diff --git a/metadata/md5-cache/app-leechcraft/lc-cstp-9999 b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
index a01349377ca3..ff36e04b8230 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cstp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-task-show
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4de918c723959e03fa21799b7f0dc42
diff --git a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
index 17bd522d910f..be6524852718 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3c0f48ca490cf6a95455887009cda747
diff --git a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999 b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
index b2a384fa57e5..8b41066f7f08 100644
--- a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=89209228977bcd64747e3f2eb812a201
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-9999 b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
index cc563933acaa..d948db20a744 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/udev
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fac041043bc5f7ab83896809c3cebd97
diff --git a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999 b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
index 9ac488ea7585..e0a1e6152b6b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=66a86fcb7b454f0b906f0284063e42ce
diff --git a/metadata/md5-cache/app-leechcraft/lc-fenet-9999 b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
index 8f60fc5d0659..d40fd9a0964b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-fenet-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=652b181c7845d33b24314caf0cef65d6
diff --git a/metadata/md5-cache/app-leechcraft/lc-gacts-9999 b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
index c1230c045fee..311618d2f9ea 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gacts-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/libqxt
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=60a1ae2896971c9bb6b0a9dd76731083
diff --git a/metadata/md5-cache/app-leechcraft/lc-glance-9999 b/metadata/md5-cache/app-leechcraft/lc-glance-9999
index d563101b7bfc..8abe83835863 100644
--- a/metadata/md5-cache/app-leechcraft/lc-glance-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-glance-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a0d725a078df4e5c6354f19a5057b6e3
diff --git a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999 b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
index a87b1c364cb1..f86b5a9c502f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
@@ -7,5 +7,5 @@ IUSE=debug notify quark
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 quark? ( ~virtual/leechcraft-quark-sideprovider-9999 ) notify? ( ~virtual/leechcraft-notifier-9999 )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3b713ee97199e2626c9a0aa4c78f3129
diff --git a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999 b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
index c3791b2b3ae9..cc70b45ffee1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-search-show
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c392c1f4f51e14d996cca62d9fa0c09c
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
index 912628c192cf..bf3eb4265f3c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=~app-leechcraft/lc-core-9999 ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtdeclarative:4 x11-libs/qwt:6 sys-apps/lm_sensors
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1594f87d206cb3e4b8534929a9bfb71f
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
index 1b583363d5ce..f6dc93e39b02 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qjson
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98b2be58bfbe12c770477f77abba9b7d
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999 b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
index aee7666d963b..43ef5cae1aa1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0e8ce893b444c22783d19dd489a355f1
diff --git a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999 b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
index e6ae1e756b3d..f4d08302e28c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-apps/setxkbmap
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2bc8e722fb1b18ad1a74edc7e47401de
diff --git a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999 b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
index b3534f620c65..4e75eb53cdb6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-qt/qtwebkit-4.6:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=49f9dc879f712ebda2b11829c663b383
diff --git a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999 b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
index 162ab86a10ce..439cb621395f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b2965004977bfc5a4b8d6bb7d0bbd9ba
diff --git a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999 b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
index b1f29b356a35..5371f9a49d50 100644
--- a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4f0f28855d56da78ab4f75935094f434
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-9999 b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
index 20ea4dd06449..38104fc747a0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b22310ac652abdf9658bb158f90f431
diff --git a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999 b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
index 4fbc46d13eba..3c35332f033e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 media-libs/liblastfm
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=97076afe5dbb16798ebab7b0b3f08d84
diff --git a/metadata/md5-cache/app-leechcraft/lc-laughty-9999 b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
index 74609dfa5473..3c30252dc352 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laughty-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4 virtual/leechcraft-notifier
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f3fb60eb08df12c030187d868be0f3a
diff --git a/metadata/md5-cache/app-leechcraft/lc-launchy-9999 b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
index a08064ab3412..802c43b0e5d9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-launchy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 ~virtual/leechcraft-trayarea-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=11e156d09a3387a36d13562b8858fd17
diff --git a/metadata/md5-cache/app-leechcraft/lc-laure-9999 b/metadata/md5-cache/app-leechcraft/lc-laure-9999
index da92b61c2c66..09fc56edcc31 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laure-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-laure-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 sys-apps/file >=media-video/vlc-2.0.0
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0f42d87b4227dba5c8cf1a287338c783
diff --git a/metadata/md5-cache/app-leechcraft/lc-lemon-9999 b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
index cf359d74488c..bfbb1e480c95 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lemon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtbearer:4 dev-qt/qtdeclarative:4 dev-libs/libnl:3 x11-libs/qwt:6
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5490cc268d2859c0ab874ee1b5325107
diff --git a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999 b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
index 2a663205bde7..18708ade8e2e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 app-text/htmltidy dev-qt/qtwebkit:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=aa51cea0cda585fa726247d951f7a6d4
diff --git a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999 b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
index 5ff3d4e28ecc..f9e9f679fc08 100644
--- a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 sys-power/upower x11-libs/qwt:6 dev-qt/qtdbus:4 virtual/leechcraft-trayarea
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=85dd63ef712a142c2a7791b16604ea8f
diff --git a/metadata/md5-cache/app-leechcraft/lc-lmp-9999 b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
index bb77e8cc0b40..c80bfeb7f775 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lmp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
@@ -7,5 +7,5 @@ IUSE=debug +graffiti +mpris +mp3tunes
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 graffiti? ( media-libs/flac ) media-libs/gstreamer:0.10 media-libs/taglib mpris? ( dev-qt/qtdbus:4 ) dev-qt/qtdeclarative:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=894e0e2a989430d57c1dd407eb445313
diff --git a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999 b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
index 328eae9b8f1e..dad1f6fa6d25 100644
--- a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 x11-libs/libXdamage x11-libs/libXrender ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=678948387dbb519eaa91fc715f2490b8
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-9999 b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
index a5cf11c8b83c..2d96052eac7d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
@@ -7,5 +7,5 @@ IUSE=debug +djvu doc +fb2 +pdf +spectre
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 pdf? ( app-text/poppler[qt4] ) djvu? ( app-text/djvu ) spectre? ( app-text/libspectre )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3ec15bcf3f405091b6ff397c4b48482b
diff --git a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999 b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
index f98edfc28d4e..9e85db365b4a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
@@ -7,5 +7,5 @@ IUSE=debug acoustid
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 acoustid? ( media-libs/chromaprint )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b091110aa7e7b0f6bbf26035b8438a54
diff --git a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999 b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
index e7580e319150..72fbb9fc2c76 100644
--- a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6e1721079f2341d072dd91b378590a20
diff --git a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999 b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
index 2c30ba5c5459..a02b84389ece 100644
--- a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
@@ -7,5 +7,5 @@ IUSE=+googledrive +yandexdisk
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 googledrive? ( dev-libs/qjson sys-apps/file )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dd485a1192cffabb970bddf7644e0b27
diff --git a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999 b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
index 02c4f53e7e8c..1f3433e8d21c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9eb87f55f0a2d90ef515412895dc3452
diff --git a/metadata/md5-cache/app-leechcraft/lc-newlife-9999 b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
index c81e6b5ea71e..61063a847e3a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-newlife-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9009dbaabf3375f6e4c54e59ed555f32
diff --git a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999 b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
index 480990face5c..be40e648f523 100644
--- a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 ~app-leechcraft/liblaretz-9999 >=dev-qt/qtgui-4.8:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d63a0ca1c3d5933ab0940ecd809d23ee
diff --git a/metadata/md5-cache/app-leechcraft/lc-pintab-9999 b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
index 9f0dcb61673f..8645eb168dba 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pintab-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dff95e08eda5b02aba5cd042129d5cdd
diff --git a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999 b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
index 21e256f81233..fdeabfd42421 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org/
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3e907f97dcc33cabcca264d5a17df6e8
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-9999 b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
index 4b8224f99837..429d87183df6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=084c6c6908b494252eb66fd4325aaef1
diff --git a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999 b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
index 39dd00206d1e..31e4aaa254d3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?,sqlite?] dev-qt/qtwebkit:4 idn? ( net-dns/libidn ) onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 ) pcre? ( >=dev-libs/libpcre-8.12 ) virtual/leechcraft-downloader-http
 REQUIRED_USE=pcre? ( cleanweb )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5aaad0302619f3f75e34bdc3050cea62
diff --git a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999 b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
index 9585961ccea7..6aab70f5d902 100644
--- a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qjson dev-libs/qrosscore
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b00491d50aa98000cbb054885fe46118
diff --git a/metadata/md5-cache/app-leechcraft/lc-sb2-9999 b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
index a846e174504f..052af8a31201 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sb2-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 dev-libs/qjson
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e0dbef5e2a7524e45bbd33d8f186dec9
diff --git a/metadata/md5-cache/app-leechcraft/lc-secman-9999 b/metadata/md5-cache/app-leechcraft/lc-secman-9999
index 7415c01f0358..139cefc2aad2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-secman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-secman-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=51daed65c93d3c2fbe35f4c248386f59
diff --git a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999 b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
index eb9a7e3946c0..c1ef871b0507 100644
--- a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-search-show virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=12d6e49744af0301bbbeefca1db04391
diff --git a/metadata/md5-cache/app-leechcraft/lc-summary-9999 b/metadata/md5-cache/app-leechcraft/lc-summary-9999
index a6d77e4364ea..db5f9dc0072c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-summary-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-summary-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cbae4616b17d838827158cd19532464f
diff --git a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999 b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
index 6bcd7d39014a..b34da391632e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d3481fc079956548b2c03561e266a965
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
index 603233c43064..b3f83bc5df28 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30eb7368852e4a5abd119624170797d9
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999 b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
index 910406cb17cc..d6b0da81cf39 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=932c6820dcc0debb7bbca0e16005a581
diff --git a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
index 493b04a36782..45446be802b4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-libs/boost-1.52.0 dev-qt/qtwebkit:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4de5a23d806b055c81b815cf4322698e
diff --git a/metadata/md5-cache/app-leechcraft/lc-tpi-9999 b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
index 665136a335ed..64e389303d21 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tpi-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:4 ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8f0255cfba4f612397139a949c04fff8
diff --git a/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999 b/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
index 8ef5852cc491..17b46c0c42aa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-vgrabber-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/leechcraft-downloader-http
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d38724107c9da4eb8e058bfa68f91ad0
diff --git a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999 b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
index 7af90e7a5026..82c45acd52b2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
@@ -8,5 +8,5 @@ LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4 udisks? ( sys-fs/udisks:0 ) udisks2? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( udisks udisks2 )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=588309da715002e11036a0227c2ba908
diff --git a/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999 b/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999
index 4e519945e43b..c91511f16fab 100644
--- a/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-woodpecker-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qjson dev-libs/kqoauth
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1d83377476e40063d630217a9d60a49
diff --git a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999 b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
index 5e3219f1c01d..2a552a9f8a38 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4fa622cb190796b3edb02b36a89e1b83
diff --git a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999 b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
index e2ba3bee26be..44abdce63753 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	leechcraft	b9c58708fa589445cca962a066953778	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=046a1864aeecd9ffe8426d627d204cb5
diff --git a/metadata/md5-cache/app-leechcraft/liblaretz-9999 b/metadata/md5-cache/app-leechcraft/liblaretz-9999
index 287e7cb67110..2b31516067d1 100644
--- a/metadata/md5-cache/app-leechcraft/liblaretz-9999
+++ b/metadata/md5-cache/app-leechcraft/liblaretz-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://leechcraft.org
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f868e542137d338a1aa5be898c832a4
diff --git a/metadata/md5-cache/app-misc/dvtm-9999 b/metadata/md5-cache/app-misc/dvtm-9999
index e8cef9a424bc..a85778ed35ca 100644
--- a/metadata/md5-cache/app-misc/dvtm-9999
+++ b/metadata/md5-cache/app-misc/dvtm-9999
@@ -7,5 +7,5 @@ IUSE=unicode savedconfig
 LICENSE=MIT
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=5c5ebedd4b9c95c8a24de25c8ca75fb2
diff --git a/metadata/md5-cache/app-misc/freemind-0.9.0-r1 b/metadata/md5-cache/app-misc/freemind-0.9.0-r1
index e0df186eca0f..9d4c1a2dbabd 100644
--- a/metadata/md5-cache/app-misc/freemind-0.9.0-r1
+++ b/metadata/md5-cache/app-misc/freemind-0.9.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Mind-mapping software written in Java
 EAPI=4
 HOMEPAGE=http://freemind.sourceforge.net
 IUSE=groovy latex pdf svg elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ppc ~x86 ~x64-macos
+KEYWORDS=amd64 ppc x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b31da4d990d2dadd352f34e2dd154d30
+_md5_=11a7db3d3731bfe69dc950c0544aefb0
diff --git a/metadata/md5-cache/app-misc/gcalcli-2.4.2 b/metadata/md5-cache/app-misc/gcalcli-2.4.2
index b0da1ce555e8..0de10d3a6157 100644
--- a/metadata/md5-cache/app-misc/gcalcli-2.4.2
+++ b/metadata/md5-cache/app-misc/gcalcli-2.4.2
@@ -9,4 +9,4 @@ RDEPEND=dev-python/python-dateutil dev-python/google-api-python-client dev-pytho
 SLOT=0
 SRC_URI=https://github.com/insanum/gcalcli/archive/v2.4.2.tar.gz -> gcalcli-2.4.2.tar.gz
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=d64c4ace2d213dc570a53750341b3996
+_md5_=e993f516bf723708b0c2338fa1cbadad
diff --git a/metadata/md5-cache/app-misc/golly-2.4-r1 b/metadata/md5-cache/app-misc/golly-2.4-r1
index 3a8bd3a1daa9..d5432a8d4e0f 100644
--- a/metadata/md5-cache/app-misc/golly-2.4-r1
+++ b/metadata/md5-cache/app-misc/golly-2.4-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl sys-libs/zlib x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-2.4-src.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	3315ffba81a98dea5d9837edb418a587
-_md5_=e6449a3d439878b51e49cc9e2506fc09
+_md5_=be654da1965c240c9501605f8183adb8
diff --git a/metadata/md5-cache/app-misc/golly-2.5 b/metadata/md5-cache/app-misc/golly-2.5
index 21b72dc25c54..1053b48a362d 100644
--- a/metadata/md5-cache/app-misc/golly-2.5
+++ b/metadata/md5-cache/app-misc/golly-2.5
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl sys-libs/zlib x11-libs/wxGTK:2.8[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-2.5-src.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	3315ffba81a98dea5d9837edb418a587
-_md5_=a513d564908af8e90623078f8bcf37d9
+_md5_=b24e8c2dfaf437398d87d464461ed2e6
diff --git a/metadata/md5-cache/app-misc/grc-1.4-r1 b/metadata/md5-cache/app-misc/grc-1.4-r1
index eb0be9cddc10..c914e74e88d2 100644
--- a/metadata/md5-cache/app-misc/grc-1.4-r1
+++ b/metadata/md5-cache/app-misc/grc-1.4-r1
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 SLOT=0
 SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/grc/grc_1.4.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4cb0cee5e4fbc47f81e824175046906f
+_md5_=842bd469a2d932fe1fa1fe5dcd7cb0bd
diff --git a/metadata/md5-cache/app-misc/grc-1.5 b/metadata/md5-cache/app-misc/grc-1.5
new file mode 100644
index 000000000000..0421598b4321
--- /dev/null
+++ b/metadata/md5-cache/app-misc/grc-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Generic Colouriser beautifies your logfiles or output of commands
+EAPI=5
+HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+SLOT=0
+SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/grc/grc_1.5.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4ab53d3ae83c85b624763969cbcda400
diff --git a/metadata/md5-cache/app-misc/livecd-tools-9999 b/metadata/md5-cache/app-misc/livecd-tools-9999
index 6fe9a42a518f..206f3b2173de 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-9999
+++ b/metadata/md5-cache/app-misc/livecd-tools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://wolf31o2.org/projects/livecd-tools
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-dialup/mingetty >=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 sys-apps/pciutils sys-apps/gawk sys-apps/sed
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfb84d333343b8a3471c56c0ac7a435c
diff --git a/metadata/md5-cache/app-misc/mc-9999 b/metadata/md5-cache/app-misc/mc-9999
index bfd844aefde8..9f0785a57878 100644
--- a/metadata/md5-cache/app-misc/mc-9999
+++ b/metadata/md5-cache/app-misc/mc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 REQUIRED_USE=spell? ( edit )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c108fb6e5b0d0efbeaf54d20e5359f37
diff --git a/metadata/md5-cache/app-misc/pysmssend-9999 b/metadata/md5-cache/app-misc/pysmssend-9999
index b2a041cd751b..aaae79934c55 100644
--- a/metadata/md5-cache/app-misc/pysmssend-9999
+++ b/metadata/md5-cache/app-misc/pysmssend-9999
@@ -7,5 +7,5 @@ IUSE=qt4
 LICENSE=GPL-3
 RDEPEND=>=dev-python/mechanize-0.1.9 qt4? ( >=dev-python/PyQt4-4.3[X] ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e285cf54e638a24a063a7118a1e0600
diff --git a/metadata/md5-cache/app-misc/ranger-1.5.5-r1 b/metadata/md5-cache/app-misc/ranger-1.5.5-r1
index 4c628617d41f..e246c5d97f9f 100644
--- a/metadata/md5-cache/app-misc/ranger-1.5.5-r1
+++ b/metadata/md5-cache/app-misc/ranger-1.5.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://nongnu.org/ranger/ranger-1.5.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3ef35416ec242c35e876e1252042c909
+_md5_=1f9d8ca350e76242725c4e005a7a682a
diff --git a/metadata/md5-cache/app-misc/ranger-1.6.0 b/metadata/md5-cache/app-misc/ranger-1.6.0
index 7d22a6a6a722..ffc47b88d1bf 100644
--- a/metadata/md5-cache/app-misc/ranger-1.6.0
+++ b/metadata/md5-cache/app-misc/ranger-1.6.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://nongnu.org/ranger/ranger-1.6.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e03bc952ddeac7d3d2ddb29fd2317b17
+_md5_=f80c467ea2fc008450a7fe186be18123
diff --git a/metadata/md5-cache/app-misc/ranger-1.6.1 b/metadata/md5-cache/app-misc/ranger-1.6.1
index 7a257fa08dc9..2a99090363d2 100644
--- a/metadata/md5-cache/app-misc/ranger-1.6.1
+++ b/metadata/md5-cache/app-misc/ranger-1.6.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://nongnu.org/ranger/ranger-1.6.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c12d44e517a60d70e3b8e1843721525a
+_md5_=e9e21f0a3f485e8c2ebcb8a3b81a840d
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index c479465bc67f..456425f8597f 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/pager python_targets_python2_6? ( dev-lang/python:2.6[ncurses] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses] ) python_targets_python3_2? ( dev-lang/python:3.2[ncurses] ) python_targets_python3_3? ( dev-lang/python:3.3[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0d1ccc1f054a64da605def2755f89459
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=054f3d1e3f6d0a81a6d4a9ad8e74e805
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index 5af16c846196..635c218b6ace 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -7,5 +7,5 @@ IUSE=debug nethack pam selinux multiuser
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) >=sys-apps/openrc-0.11.6
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=77b22fe2c0d0834cf55c881cceb70152
diff --git a/metadata/md5-cache/app-misc/screenfetch-9999 b/metadata/md5-cache/app-misc/screenfetch-9999
index 5950f8a781f5..5e807c695dc7 100644
--- a/metadata/md5-cache/app-misc/screenfetch-9999
+++ b/metadata/md5-cache/app-misc/screenfetch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/KittyKatt/screenFetch
 LICENSE=GPL-3
 RDEPEND=media-gfx/scrot x11-apps/xdpyinfo
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=c833b7ff5abd754dff8205054b47279b
diff --git a/metadata/md5-cache/app-misc/sleepyhead-9999 b/metadata/md5-cache/app-misc/sleepyhead-9999
index 0210d17f8608..24ffdc198ba2 100644
--- a/metadata/md5-cache/app-misc/sleepyhead-9999
+++ b/metadata/md5-cache/app-misc/sleepyhead-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=virtual/opengl x11-libs/libX11 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtwebkit:4
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50385d3ccb18c4377ebfe2b571037e87
diff --git a/metadata/md5-cache/app-misc/subsurface-9999 b/metadata/md5-cache/app-misc/subsurface-9999
index 06af1ad4851d..837ab6bcf219 100644
--- a/metadata/md5-cache/app-misc/subsurface-9999
+++ b/metadata/md5-cache/app-misc/subsurface-9999
@@ -7,5 +7,5 @@ IUSE=doc map usb linguas_bg linguas_bg_BG linguas_de linguas_de_DE linguas_de_CH
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip gnome-base/gconf:2 map? ( sci-geosciences/osm-gps-map ) net-libs/libsoup:2.4 sys-libs/glibc virtual/libusb x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36692d57284674be1e69676b428c7f8e
diff --git a/metadata/md5-cache/app-misc/tmux-9999 b/metadata/md5-cache/app-misc/tmux-9999
index e2d1476565e6..25cedd757f7f 100644
--- a/metadata/md5-cache/app-misc/tmux-9999
+++ b/metadata/md5-cache/app-misc/tmux-9999
@@ -7,5 +7,5 @@ IUSE=debug vim-syntax
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=4ab207c957f8b61ac8efab29b7b7f58b
diff --git a/metadata/md5-cache/app-mobilephone/dfu-util-9999 b/metadata/md5-cache/app-mobilephone/dfu-util-9999
index 494992d242a2..d3a6759cd3b6 100644
--- a/metadata/md5-cache/app-mobilephone/dfu-util-9999
+++ b/metadata/md5-cache/app-mobilephone/dfu-util-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://wiki.openmoko.org/wiki/Dfu-util
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=353b6a7053e928baa8b27aac63f82ab3
diff --git a/metadata/md5-cache/app-mobilephone/freesmee-9999 b/metadata/md5-cache/app-mobilephone/freesmee-9999
index 41951fff9d2f..4a9c371c8c1d 100644
--- a/metadata/md5-cache/app-mobilephone/freesmee-9999
+++ b/metadata/md5-cache/app-mobilephone/freesmee-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-3
 RDEPEND=dev-util/ticpp dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c190ef342eab3bf6abdd1e688c387fd
diff --git a/metadata/md5-cache/app-mobilephone/gnokii-9999 b/metadata/md5-cache/app-mobilephone/gnokii-9999
index 7f882dbc477a..faaf680f4dbd 100644
--- a/metadata/md5-cache/app-mobilephone/gnokii-9999
+++ b/metadata/md5-cache/app-mobilephone/gnokii-9999
@@ -7,5 +7,5 @@ IUSE=nls bluetooth ical irda sms postgres mysql usb X debug +pcsc-lite linguas_c
 LICENSE=GPL-2
 RDEPEND=!app-mobilephone/smstools pcsc-lite? ( sys-apps/pcsc-lite ) X? ( x11-libs/gtk+:2 ) bluetooth? ( kernel_linux? ( net-wireless/bluez ) ) sms? ( !app-mobilephone/smstools >=dev-libs/glib-2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5903436705aed32b3247a2e4fce1fe9c
diff --git a/metadata/md5-cache/app-mobilephone/heimdall-9999 b/metadata/md5-cache/app-mobilephone/heimdall-9999
index 1cd4361c6bb2..f41778002df8 100644
--- a/metadata/md5-cache/app-mobilephone/heimdall-9999
+++ b/metadata/md5-cache/app-mobilephone/heimdall-9999
@@ -7,5 +7,5 @@ IUSE=qt4
 LICENSE=MIT
 RDEPEND=dev-libs/libusbx:1= qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3bc104383a3d602c24eb424a68653539
diff --git a/metadata/md5-cache/app-office/QtBitcoinTrader-9999 b/metadata/md5-cache/app-office/QtBitcoinTrader-9999
index 8220a1230c23..75877c0bacdd 100644
--- a/metadata/md5-cache/app-office/QtBitcoinTrader-9999
+++ b/metadata/md5-cache/app-office/QtBitcoinTrader-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/JulyIGHOR/QtBitcoinTrader
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtgui:4 dev-qt/qtmultimedia:4
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b76795a3b112d56467ea39d220505a7c
diff --git a/metadata/md5-cache/app-office/calligra-9999 b/metadata/md5-cache/app-office/calligra-9999
index 372aac4ad297..ffcda50fad49 100644
--- a/metadata/md5-cache/app-office/calligra-9999
+++ b/metadata/md5-cache/app-office/calligra-9999
@@ -10,5 +10,5 @@ RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office
 REQUIRED_USE=calligra_features_author? ( calligra_features_words ) calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1eb90edd8966e11f1c5ffffb581df1ff
diff --git a/metadata/md5-cache/app-office/libreoffice-4.0.9999 b/metadata/md5-cache/app-office/libreoffice-4.0.9999
index 8a5bc35067a8..7e9b9b15d552 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.0.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) pyt
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=78a3a533a13f373d5595141545700b80
diff --git a/metadata/md5-cache/app-office/libreoffice-4.1.9999 b/metadata/md5-cache/app-office/libreoffice-4.1.9999
index 547abc4003e8..f388c9ffb5ff 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.1.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) pyt
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=c62288f1be8ae738d19d442e5242c5d3
diff --git a/metadata/md5-cache/app-office/libreoffice-9999-r2 b/metadata/md5-cache/app-office/libreoffice-9999-r2
index 5911d6d18018..e354d2adff39 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) pyt
 REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=fd4de8754e54a16b6cc273dce52c211e
diff --git a/metadata/md5-cache/app-office/rabbit-0.9.2 b/metadata/md5-cache/app-office/rabbit-0.9.2
deleted file mode 100644
index fd56c01651c1..000000000000
--- a/metadata/md5-cache/app-office/rabbit-0.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=emacs? ( virtual/emacs ) test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-gdkpixbuf2-0.15.0[ruby_targets_ruby18] dev-ruby/ruby-gtk2[ruby_targets_ruby18] dev-ruby/ruby-poppler[ruby_targets_ruby18] dev-ruby/ruby-rsvg[ruby_targets_ruby18] dev-ruby/rdtool[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-DESCRIPTION=An application to do presentation with RD document
-EAPI=2
-HOMEPAGE=http://www.cozmixng.org/~rwiki/?cmd=view;name=Rabbit
-IUSE=nls postscript migemo tgif enscript emacs test elibc_FreeBSD ruby_targets_ruby18
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=emacs? ( virtual/emacs ) nls? ( dev-ruby/ruby-gettext ) postscript? ( app-text/ghostscript-gpl ) migemo? ( app-text/migemo ) enscript? ( app-text/enscript ) tgif? ( media-gfx/tgif ) ruby_targets_ruby18? ( >=dev-ruby/ruby-gdkpixbuf2-0.15.0[ruby_targets_ruby18] dev-ruby/ruby-gtk2[ruby_targets_ruby18] dev-ruby/ruby-poppler[ruby_targets_ruby18] dev-ruby/ruby-rsvg[ruby_targets_ruby18] dev-ruby/rdtool[ruby_targets_ruby18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-SLOT=0
-SRC_URI=http://www.cozmixng.org/~kou/download/rabbit-0.9.2.tar.gz
-_eclasses_=elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=68c77f5d8db34584cf41efcb1b942da0
diff --git a/metadata/md5-cache/app-office/unoconv-99999999 b/metadata/md5-cache/app-office/unoconv-99999999
index f10546ab21d9..70f7e08ff709 100644
--- a/metadata/md5-cache/app-office/unoconv-99999999
+++ b/metadata/md5-cache/app-office/unoconv-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://dag.wieers.com/home-made/unoconv/
 LICENSE=GPL-2
 RDEPEND=!app-text/odt2txt virtual/ooo =dev-lang/python-2*
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11105a09e5f8b55c2f3dd4cdcf1b40f2
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r2 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r2
index dac4b48dbd59..7413f6c74dc4 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r2
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/diffmask/downloads/diffmask-0.3.3.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c3d610e1043b4dc05053b43126fbfb8d
+_md5_=d2824ba3619b1fd547893e04f0f23c69
diff --git a/metadata/md5-cache/app-portage/diffmask-9999 b/metadata/md5-cache/app-portage/diffmask-9999
index 992e90317981..288748c40b1c 100644
--- a/metadata/md5-cache/app-portage/diffmask-9999
+++ b/metadata/md5-cache/app-portage/diffmask-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-apps/portage-2.1.8.3 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d1800e31221a2d9fc79d052a37821bc8
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=34b291bf715b0c71a05fee84accc06a5
diff --git a/metadata/md5-cache/app-portage/eix-0.29.3 b/metadata/md5-cache/app-portage/eix-0.29.3
index 7ee60c2820c1..164bcd11cf49 100644
--- a/metadata/md5-cache/app-portage/eix-0.29.3
+++ b/metadata/md5-cache/app-portage/eix-0.29.3
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlay
 EAPI=5
 HOMEPAGE=http://eix.berlios.de
 IUSE=clang debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools zsh-completion linguas_de linguas_ru
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
 SLOT=0
 SRC_URI=mirror://berlios/eix/eix-0.29.3.tar.xz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=186a7dcc82a1f7c7b838a15eba05eae5
+_md5_=69177e46edd8cbd84e45c2b2c4e4e04b
diff --git a/metadata/md5-cache/app-portage/epm-9999 b/metadata/md5-cache/app-portage/epm-9999
index 347746505361..d75d9f60842d 100644
--- a/metadata/md5-cache/app-portage/epm-9999
+++ b/metadata/md5-cache/app-portage/epm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/fuzzyray/epm
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8e854452fa1494605ec19190738c8850
diff --git a/metadata/md5-cache/app-portage/esearch-9999 b/metadata/md5-cache/app-portage/esearch-9999
index 2f4f1af02b4d..981ab1bb8265 100644
--- a/metadata/md5-cache/app-portage/esearch-9999
+++ b/metadata/md5-cache/app-portage/esearch-9999
@@ -7,5 +7,5 @@ IUSE=linguas_fr linguas_it
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage dev-lang/python[readline] dev-lang/python
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=c72127dac838ababa63bc04a7bbc81aa
diff --git a/metadata/md5-cache/app-portage/euscan-9999 b/metadata/md5-cache/app-portage/euscan-9999
index a195d17b0c28..505a20b10379 100644
--- a/metadata/md5-cache/app-portage/euscan-9999
+++ b/metadata/md5-cache/app-portage/euscan-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://euscan.iksaif.net
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage >=app-portage/gentoolkit-0.2.8 dev-python/setuptools dev-python/beautifulsoup:python-2 virtual/python-argparse dev-lang/python[xml] dev-lang/python
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=3a3fbb6042d17811c05f2fa61851f1da
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2-r3 b/metadata/md5-cache/app-portage/flaggie-0.2-r3
index 4760a6a33098..d52894a4053b 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2-r3
+++ b/metadata/md5-cache/app-portage/flaggie-0.2-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/flaggie/downloads/flaggie-0.2.tar.bz2
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7f082b6df551d79045b2ccb897c33429
+_md5_=61756b69d2606ed96ffc1f88bbc29b1d
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1 b/metadata/md5-cache/app-portage/flaggie-0.2.1
index ecb0552bcfd6..1d22303444c8 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/flaggie/downloads/flaggie-0.2.1.tar.bz2
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1ad77335931e320caa7851273885b0cc
+_md5_=1a9903f05f60255b752ca35b15f1be23
diff --git a/metadata/md5-cache/app-portage/flaggie-9999 b/metadata/md5-cache/app-portage/flaggie-9999
index 0617e8955980..bf82e437e990 100644
--- a/metadata/md5-cache/app-portage/flaggie-9999
+++ b/metadata/md5-cache/app-portage/flaggie-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-apps/portage-2.1.8.3 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5e8d2a9e1c5398d852144553d0f98f5c
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a06101937b889b63a00b358a14905e17
diff --git a/metadata/md5-cache/app-portage/genlop-9999 b/metadata/md5-cache/app-portage/genlop-9999
index ded36c7ba171..d8a8339574d6 100644
--- a/metadata/md5-cache/app-portage/genlop-9999
+++ b/metadata/md5-cache/app-portage/genlop-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/perl
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/DateManip dev-perl/libwww-perl
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=f9d33833ff03b37f6f6243bd11420e82
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.8 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.8
new file mode 100644
index 000000000000..29d39008eb0f
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/portage python_targets_python2_6? ( dev-lang/python:2.6[xml(+)] ) python_targets_python2_7? ( dev-lang/python:2.7[xml(+)] ) python_targets_python3_2? ( dev-lang/python:3.2[xml(+)] ) python_targets_python3_3? ( dev-lang/python:3.3[xml(+)] ) python_targets_pypy2_0? ( virtual/pypy:2.0[xml(+)] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Collection of administration scripts for Gentoo
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-apps/portage !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6[xml(+)] ) python_targets_python2_7? ( dev-lang/python:2.7[xml(+)] ) python_targets_python3_2? ( dev-lang/python:3.2[xml(+)] ) python_targets_python3_3? ( dev-lang/python:3.3[xml(+)] ) python_targets_pypy2_0? ( virtual/pypy:2.0[xml(+)] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://gentoo/gentoolkit-0.3.0.8.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ed303fff44516fc4585b837a3edf64d2
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index faa33736f081..87a60f623e86 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/portage !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6[xml(+)] ) python_targets_python2_7? ( dev-lang/python:2.7[xml(+)] ) python_targets_python3_2? ( dev-lang/python:3.2[xml(+)] ) python_targets_python3_3? ( dev-lang/python:3.3[xml(+)] ) python_targets_pypy2_0? ( virtual/pypy:2.0[xml(+)] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fe4c96412039e853e007e4bbada786a9
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f18ddd6b1204124ebc610ed11509b737
diff --git a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1 b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
index 64702709510d..e6f8b943234a 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-0.2.8.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gentoo/gentoolkit-dev-0.2.8.3.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=46880ce45066e283c64664265904a711
+_md5_=43669822aacd4eaacda60437808d904a
diff --git a/metadata/md5-cache/app-portage/gentoolkit-dev-9999 b/metadata/md5-cache/app-portage/gentoolkit-dev-9999
index 523f03189f02..94c3b5dc4f11 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage dev-lang/perl sys-apps/diffutils || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.3*[xml] =dev-lang/python-3.2*[xml] =dev-lang/python-3.1*[xml] =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=65a0f9e80e5cc02a2fecae438cba86b6
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.2.6 b/metadata/md5-cache/app-portage/gentoopm-0.2.6
index e8e6e484ac4f..910f8a42666b 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.2.6
+++ b/metadata/md5-cache/app-portage/gentoopm-0.2.6
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/gentoopm/downloads/gentoopm-0.2.6.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9bebabe40d9a10f6e9492a454be5ed39
+_md5_=ed6a784bec7fcf712413f22d3ac0681b
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.2.8 b/metadata/md5-cache/app-portage/gentoopm-0.2.8
index f31977e1e352..a77f4ef110aa 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.2.8
+++ b/metadata/md5-cache/app-portage/gentoopm-0.2.8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/gentoopm/downloads/gentoopm-0.2.8.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4d5723ddc096a38a17b03c21bbfc84aa
+_md5_=0a4260ce1cc9478223e94f72b34160e9
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.2.9 b/metadata/md5-cache/app-portage/gentoopm-0.2.9
index 82a6f7fb950f..8b65c6e186a6 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.2.9
+++ b/metadata/md5-cache/app-portage/gentoopm-0.2.9
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/gentoopm/downloads/gentoopm-0.2.9.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=67d3144d8e2f6d7d7668719bfb32c70e
+_md5_=1a1bb16b0b535ff6c65a2ab28af1ffdf
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index c8d89974450f..d88131314c33 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -9,5 +9,5 @@ PDEPEND=app-admin/eselect-package-manager
 RDEPEND=|| ( sys-apps/pkgcore >=sys-apps/portage-2.1.10.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] >=sys-apps/paludis-0.64.2[python-bindings] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f8f1460358761592c1c30fb885215540
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=90e4954da52827d2d3f3779fcacd93d9
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.1 b/metadata/md5-cache/app-portage/gpyutils-0.1
index 6d0026a07a5b..dcf5da32edc3 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.1
+++ b/metadata/md5-cache/app-portage/gpyutils-0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/gpyutils/downloads/gpyutils-0.1.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=78e0e29d8be682e1130c615476337ad0
+_md5_=ca091f821b35bb2f89caaf8db60d0a10
diff --git a/metadata/md5-cache/app-portage/gpyutils-9999 b/metadata/md5-cache/app-portage/gpyutils-9999
index a9be2b7944af..b4206f59e288 100644
--- a/metadata/md5-cache/app-portage/gpyutils-9999
+++ b/metadata/md5-cache/app-portage/gpyutils-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=app-portage/gentoopm-0.2.9[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f1b6415f7d9046f85b5b0cb1bd773d0f
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6da95afba76f10d3a8cb6a9b61cd3f8
diff --git a/metadata/md5-cache/app-portage/install-mask-0.0.2-r3 b/metadata/md5-cache/app-portage/install-mask-0.0.2-r3
index a95e19c23553..61657fa74e69 100644
--- a/metadata/md5-cache/app-portage/install-mask-0.0.2-r3
+++ b/metadata/md5-cache/app-portage/install-mask-0.0.2-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/install-mask/downloads/install-mask-0.0.2.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=53f8af8cd0ea83d07dbf975716a9a93a
+_md5_=02790e7f5c09c411b9e3cc0c104e83f4
diff --git a/metadata/md5-cache/app-portage/install-mask-0.1.1 b/metadata/md5-cache/app-portage/install-mask-0.1.1
index 42d578c05324..b8921b2bb40e 100644
--- a/metadata/md5-cache/app-portage/install-mask-0.1.1
+++ b/metadata/md5-cache/app-portage/install-mask-0.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/install-mask/downloads/install-mask-0.1.1.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8627c76fb35908d78bcc0d109b550f4a
+_md5_=4a14e5d90a814663310598c9e9f8d68e
diff --git a/metadata/md5-cache/app-portage/install-mask-9999 b/metadata/md5-cache/app-portage/install-mask-9999
index a6054c1c4712..6f1c6bbd1faf 100644
--- a/metadata/md5-cache/app-portage/install-mask-9999
+++ b/metadata/md5-cache/app-portage/install-mask-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-portage/flaggie[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d27c4aa362c2987a86cf70352bc3ee53
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cc19d242025bbf7f271d4629951b014e
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 958c3e9346fe..8a165a88497c 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( =dev-python/pyGPG-9999 ) virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] >=dev-python/requests-1.2.1 dev-python/ndg-httpsclient dev-python/pyasn1 >=dev-python/pyopenssl-0.13 python_targets_python2_6? ( dev-lang/python:2.6[xml(+)] ) python_targets_python2_7? ( dev-lang/python:2.7[xml(+)] ) python_targets_pypy2_0? ( virtual/pypy:2.0[xml(+)] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5616b96072596d8c14046a6d1d0f6e8
diff --git a/metadata/md5-cache/app-portage/layman-dbtools-0_p20100322 b/metadata/md5-cache/app-portage/layman-dbtools-0_p20100322
index 631e8b4e883f..480f68810a98 100644
--- a/metadata/md5-cache/app-portage/layman-dbtools-0_p20100322
+++ b/metadata/md5-cache/app-portage/layman-dbtools-0_p20100322
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=app-portage/layman =dev-lang/python-2* =dev-lang/python-2*[xml]
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=92d9de3e66969e180b33e25bacd4bc8a
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index a5fa783cbc1c..ba0995b867d0 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jaxml-3.01 >=sys-apps/portage-2.1.9.42 =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=55dce0f152764fc8ee8c68c6a8b23bee
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 4943986a2f88..71edd7c93a8b 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-analyzer/netselect python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] ) python_targets_python3_3? ( dev-lang/python:3.3[xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f745633a40eaa6f30ba1564eeb0a256
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.2 b/metadata/md5-cache/app-portage/overlint-0.5.2
index f0f221bd8be5..ea640dfe1878 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.2
+++ b/metadata/md5-cache/app-portage/overlint-0.5.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/overlint-0.5.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4f72b97e8adae8ee2bd2df79492897f8
+_md5_=29ff9416689d5cbcda8c54b2cf6c5811
diff --git a/metadata/md5-cache/app-portage/pms-test-suite-9999 b/metadata/md5-cache/app-portage/pms-test-suite-9999
index 7572277a0417..33f14c02f833 100644
--- a/metadata/md5-cache/app-portage/pms-test-suite-9999
+++ b/metadata/md5-cache/app-portage/pms-test-suite-9999
@@ -7,5 +7,5 @@ IUSE=doc test
 LICENSE=BSD-2
 RDEPEND=>=app-portage/gentoopm-0.1.5 dev-python/dbus-python dev-python/pygobject:2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a99ef98ff3791d06d7fa5518db8c9b6a
diff --git a/metadata/md5-cache/app-portage/pqlop-0.02-r1 b/metadata/md5-cache/app-portage/pqlop-0.02-r1
index 985764e4433a..20b20b586d61 100644
--- a/metadata/md5-cache/app-portage/pqlop-0.02-r1
+++ b/metadata/md5-cache/app-portage/pqlop-0.02-r1
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://bitbucket.org/LK4D4/pqlop/raw/0.02/pqlop.py -> pqlop-0.02.py
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=20b5789b0319a3af92d36e3c65d1b0ef
+_md5_=955664ef4e96e4d7aedbd236e01cb591
diff --git a/metadata/md5-cache/app-portage/repo-commit-9999 b/metadata/md5-cache/app-portage/repo-commit-9999
index 7e58b92aec99..820a0313da40 100644
--- a/metadata/md5-cache/app-portage/repo-commit-9999
+++ b/metadata/md5-cache/app-portage/repo-commit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/gentoo/repo-commit/
 LICENSE=BSD
 RDEPEND=|| ( >=sys-apps/portage-2.2.0_alpha86 ( >=sys-apps/portage-2.1.10.30 <sys-apps/portage-2.2.0_alpha ) app-portage/gentoolkit-dev ) sys-apps/portage
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03c0da84a20c71bbb8bd541e247f557c
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3
index cfd31a7a4fcc..45cfc42efc44 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/smart-live-rebuild/downloads/smart-live-rebuild-1.3.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f2dac748ab6cfb4df71e9683282b535b
+_md5_=e5f6046cf8ce0476252a1074850acb52
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 5f36b09ec244..ef78e10840f9 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a5e6994b4cb60701d7d226a61f5a7d5b
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9580aa3874c12a56809c97feda22d0aa
diff --git a/metadata/md5-cache/app-portage/tatt-9999 b/metadata/md5-cache/app-portage/tatt-9999
index 99a15c72a53b..0ef40767dd55 100644
--- a/metadata/md5-cache/app-portage/tatt-9999
+++ b/metadata/md5-cache/app-portage/tatt-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] app-portage/eix app-portage/gentoolkit www-client/pybugz dev-python/configobj python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a726f4726096a0f0d04c2d4a68e11500
diff --git a/metadata/md5-cache/app-portage/ufed-9999 b/metadata/md5-cache/app-portage/ufed-9999
index 6a80d11381df..049762127430 100644
--- a/metadata/md5-cache/app-portage/ufed-9999
+++ b/metadata/md5-cache/app-portage/ufed-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-lang/perl
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1f730c7f01449e0e15c371b0fdb2a9b0
diff --git a/metadata/md5-cache/app-shells/autojump-21.3.0-r1 b/metadata/md5-cache/app-shells/autojump-21.3.0-r1
index 4c7b33c41d64..bc6a75bd5f10 100644
--- a/metadata/md5-cache/app-shells/autojump-21.3.0-r1
+++ b/metadata/md5-cache/app-shells/autojump-21.3.0-r1
@@ -10,4 +10,4 @@ RDEPEND=bash-completion? ( >=app-shells/bash-4 ) python? ( python_targets_python
 SLOT=0
 SRC_URI=https://github.com/joelthelion/autojump/archive/release-v21.3.0.tar.gz -> autojump-21.3.0.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=a78b27f01d9aef75d68334918837f589
+_md5_=b06b4b8692fe48174900e5e36cfe633f
diff --git a/metadata/md5-cache/app-shells/autojump-21.5.8-r1 b/metadata/md5-cache/app-shells/autojump-21.5.8-r1
index f3d555e369ae..4cb039b0b8a9 100644
--- a/metadata/md5-cache/app-shells/autojump-21.5.8-r1
+++ b/metadata/md5-cache/app-shells/autojump-21.5.8-r1
@@ -10,4 +10,4 @@ RDEPEND=bash-completion? ( >=app-shells/bash-4 ) python? ( python_targets_python
 SLOT=0
 SRC_URI=https://github.com/joelthelion/autojump/archive/release-v21.5.8.tar.gz -> autojump-21.5.8.tar.gz
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=c74e34b4a73ec09402a229439ef282c8
+_md5_=e8481ff7bf7975425a256c1718a8378e
diff --git a/metadata/md5-cache/app-shells/autojump-21.6.9 b/metadata/md5-cache/app-shells/autojump-21.6.9
index 95c3456ab8e6..8f80d9e22c4f 100644
--- a/metadata/md5-cache/app-shells/autojump-21.6.9
+++ b/metadata/md5-cache/app-shells/autojump-21.6.9
@@ -10,4 +10,4 @@ RDEPEND=bash-completion? ( >=app-shells/bash-4 ) python? ( python_targets_python
 SLOT=0
 SRC_URI=https://github.com/joelthelion/autojump/archive/release-v21.6.9.tar.gz -> autojump-21.6.9.tar.gz
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=d501686683868399b98ed4de2a823278
+_md5_=99514fdaa52b21073dd220343e32203f
diff --git a/metadata/md5-cache/app-shells/fish-2.0.0 b/metadata/md5-cache/app-shells/fish-2.0.0
index 160837c995fc..7737e74dee46 100644
--- a/metadata/md5-cache/app-shells/fish-2.0.0
+++ b/metadata/md5-cache/app-shells/fish-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=5
 HOMEPAGE=http://fishshell.com/
 IUSE=X
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel )
 SLOT=0
 SRC_URI=http://fishshell.com/files/2.0.0/fish-2.0.0.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1072b4e667108977c9691ce1437e6f8e
+_md5_=099141fb6c266711eaf53716b178044a
diff --git a/metadata/md5-cache/app-shells/zsh-5.0.2-r3 b/metadata/md5-cache/app-shells/zsh-5.0.2-r3
index 775daf34ab86..27cdc1d67588 100644
--- a/metadata/md5-cache/app-shells/zsh-5.0.2-r3
+++ b/metadata/md5-cache/app-shells/zsh-5.0.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=5
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-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 ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1 static? ( >=sys-libs/ncurses-5.7-r4[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm )
 SLOT=0
 SRC_URI=mirror://sourceforge/zsh/zsh-5.0.2.tar.bz2 ftp://ftp.zsh.org/pub/zsh-5.0.2.tar.bz2 doc? ( ftp://ftp.zsh.org/pub/zsh-5.0.2-doc.tar.bz2 )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1e4c0014f92bd4141e4da03e18ceba37
+_md5_=ce1f26d2f4a55d111217e37ab18dfc1c
diff --git a/metadata/md5-cache/app-shells/zsh-completion-99999999 b/metadata/md5-cache/app-shells/zsh-completion-99999999
index f66565467524..dd228ac69da8 100644
--- a/metadata/md5-cache/app-shells/zsh-completion-99999999
+++ b/metadata/md5-cache/app-shells/zsh-completion-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/zsh-completion.git
 LICENSE=ZSH
 RDEPEND=>=app-shells/zsh-4.3.5
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=111ca37755e0e479c5db37537689921f
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.8-r1 b/metadata/md5-cache/app-text/asciidoc-8.6.8-r1
index aa61741e33ac..1faff8aa9e9c 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.8-r1
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=highlight? ( python_single_target_python2_6? ( python_targets_pytho
 SLOT=0
 SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.8/asciidoc-8.6.8.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=b2dd14f58d0f3ce338ebab9036005142
+_md5_=d41ea77cf21bf65aafd056e3452f1688
diff --git a/metadata/md5-cache/app-text/asciidoc-9999 b/metadata/md5-cache/app-text/asciidoc-9999
index f14742473edf..136d40066cce 100644
--- a/metadata/md5-cache/app-text/asciidoc-9999
+++ b/metadata/md5-cache/app-text/asciidoc-9999
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( med
 REQUIRED_USE=highlight? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_pypy2_0? ( python_targets_pypy2_0 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 python_single_target_pypy2_0 ) )
 SLOT=0
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a303013a198329463db0d2eff5cc130c
+_md5_=8b7ff1aef12d8a329d68a8b52e455f5a
diff --git a/metadata/md5-cache/app-text/fbless-9999 b/metadata/md5-cache/app-text/fbless-9999
index 711e6179c05f..a3f4b0136f45 100644
--- a/metadata/md5-cache/app-text/fbless-9999
+++ b/metadata/md5-cache/app-text/fbless-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( dev-lang/python:2.7[ncurses,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=53fdf39e210e965cc5883079996f9fd4
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.09 b/metadata/md5-cache/app-text/ghostscript-gpl-9.10
similarity index 95%
rename from metadata/md5-cache/app-text/ghostscript-gpl-9.09
rename to metadata/md5-cache/app-text/ghostscript-gpl-9.10
index 56776222870a..a8e06777ea07 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.09
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.10
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.5:2 >=media-libs/libpng-1.6.2:0= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) idn? ( net-dns/libidn ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other !<net-print/cups-filters-1.0.36-r2
 SLOT=0
-SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.09.tar.bz2 mirror://gentoo/ghostscript-gpl-9.09-patchset-1.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.6.tar.gz ) )
+SRC_URI=mirror://sourceforge/ghostscript/ghostscript-9.10.tar.bz2 mirror://gentoo/ghostscript-gpl-9.09-patchset-1.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.6.tar.gz ) )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=163f445a9aa20806e09d396616cd5bb3
+_md5_=a9753dc733fc161ef5f6878675ffae3c
diff --git a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1
index 405bd4566431..68a4de47bcd6 100644
--- a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1
+++ b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=86fd4203df151e9b4381e4626a309d2c
+_md5_=24e0e353a9d66e05fe73a0094c865f3e
diff --git a/metadata/md5-cache/app-text/jmupdf-9999 b/metadata/md5-cache/app-text/jmupdf-9999
index 9302a216f1a2..62ac67f97359 100644
--- a/metadata/md5-cache/app-text/jmupdf-9999
+++ b/metadata/md5-cache/app-text/jmupdf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=system-mupdf? ( >=app-text/mupdf-1.2 ) virtual/jdk:1.7 >=dev-java/java-config-2.1.9-r1
 REQUIRED_USE=!system-mupdf
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b881e693c464199893f76dca2e09d9e6
diff --git a/metadata/md5-cache/app-text/libmspub-9999 b/metadata/md5-cache/app-text/libmspub-9999
index a1eb587d3af3..2cb4a929ebbe 100644
--- a/metadata/md5-cache/app-text/libmspub-9999
+++ b/metadata/md5-cache/app-text/libmspub-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=LGPL-2.1
 RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e280a79dd151041b2b2e7b4e07b09a2b
diff --git a/metadata/md5-cache/app-text/llpp-9999 b/metadata/md5-cache/app-text/llpp-9999
index 34b0b48ad6db..7dbe2b24fa78 100644
--- a/metadata/md5-cache/app-text/llpp-9999
+++ b/metadata/md5-cache/app-text/llpp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.3:= media-libs/openjpeg:2 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47cf83db419fc01f87c6c3ada847f42b
diff --git a/metadata/md5-cache/app-text/mupdf-9999 b/metadata/md5-cache/app-text/mupdf-9999
index ddf8c05b660c..50ad115efbb1 100644
--- a/metadata/md5-cache/app-text/mupdf-9999
+++ b/metadata/md5-cache/app-text/mupdf-9999
@@ -7,5 +7,5 @@ IUSE=X vanilla static static-libs
 LICENSE=AGPL-3
 RDEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/openjpeg:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
 SLOT=0/1.3
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93876ba56f8088c4d3feafb6df93677a
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index 6a846fd024d2..285a8a61f130 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://home.gna.org/nfoview/
 LICENSE=GPL-3
 RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font || ( =dev-lang/python-3.3* =dev-lang/python-3.2* )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=daa39d98e425dd0cb7b36c6bf77c2b83
diff --git a/metadata/md5-cache/app-text/pylize-1.3b-r1 b/metadata/md5-cache/app-text/pylize-1.3b-r1
index 2f4ab41d343e..c255b6ad2bd8 100644
--- a/metadata/md5-cache/app-text/pylize-1.3b-r1
+++ b/metadata/md5-cache/app-text/pylize-1.3b-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://www.chrisarndt.de/en/software/pylize/download/pylize-1.3b.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f1032dfcb0f94520a7daada783fa3a3c
+_md5_=956def401f022b3e285419178c50dd58
diff --git a/metadata/md5-cache/app-text/unpaper-9999 b/metadata/md5-cache/app-text/unpaper-9999
index eebb9a5a1bb3..9e29ffabb7f8 100644
--- a/metadata/md5-cache/app-text/unpaper-9999
+++ b/metadata/md5-cache/app-text/unpaper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.flameeyes.eu/projects/unpaper
 IUSE=test
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=2c80448f493ded1289ccc0ec4fdedfd9
diff --git a/metadata/md5-cache/app-text/xournal-9999 b/metadata/md5-cache/app-text/xournal-9999
index 15121ee8ac8b..b922a5e70c94 100644
--- a/metadata/md5-cache/app-text/xournal-9999
+++ b/metadata/md5-cache/app-text/xournal-9999
@@ -7,5 +7,5 @@ IUSE=+pdf vanilla
 LICENSE=GPL-2
 RDEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=47c54c2a28c2a81856724796aacb6b44
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 4a38e68adc84..cf7ec8a03e90 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -7,5 +7,5 @@ IUSE=+doc +deprecated sqlite test test
 LICENSE=ZLIB
 RDEPEND=dev-libs/glib:2 x11-libs/cairo:= deprecated? ( >=dev-libs/girara-0.1.6:2 ) !deprecated? ( >=dev-libs/girara-0.1.6:3 ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=cdc7bf69cc14b174d6489f90fd06f77d
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index 439396aa2801..ef4f06fcbd88 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -7,5 +7,5 @@ IUSE=+deprecated
 LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 app-arch/libarchive:= x11-libs/cairo:= app-arch/p7zip app-arch/tar app-arch/unrar app-arch/unzip
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6c154c55cef2916121e61ab3d968dc3
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index ac3551bc32eb..ccdaa524cc8c 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -7,5 +7,5 @@ IUSE=+deprecated
 LICENSE=ZLIB
 RDEPEND=>=app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 x11-libs/cairo:=
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0a1f3e32abdfd5ef8d0c94df001104c6
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index bc3f6ca42781..39d631fafa9a 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -7,5 +7,5 @@ IUSE=+deprecated
 LICENSE=ZLIB
 RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0[deprecated=] media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg x11-libs/cairo:=
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b3241ea8b4b9c6ba004a7569d965054
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index e53b84ec6bef..6d8bcd9831f2 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -7,5 +7,5 @@ IUSE=+deprecated
 LICENSE=ZLIB
 RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.0[deprecated=] x11-libs/cairo:=
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef3b164f30ac028adda41f8a8b0d4348
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index 4bb1048edf7a..d836cb3b85aa 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -7,5 +7,5 @@ IUSE=+deprecated
 LICENSE=ZLIB
 RDEPEND=>=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 x11-libs/cairo:=
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a249b900b4ab0c1aab9985d1d5d6e09
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-99999999 b/metadata/md5-cache/app-vim/exheres-syntax-99999999
index 197737988896..ac777769769d 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-99999999
+++ b/metadata/md5-cache/app-vim/exheres-syntax-99999999
@@ -5,5 +5,5 @@ HOMEPAGE=http://www.exherbo.org/
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
 _md5_=edc0590bd9234395d388b0404ab3f2fc
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-99999999 b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
index 756d987ddbb3..d63c5b42bf92 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-99999999
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
@@ -7,5 +7,5 @@ IUSE=ignore-glep31
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
 _md5_=865107ccf2aa1690d394f6822ba88200
diff --git a/metadata/md5-cache/app-vim/gundo-2.5.0 b/metadata/md5-cache/app-vim/gundo-2.5.0
index 2f6e924e044e..54753396ce6c 100644
--- a/metadata/md5-cache/app-vim/gundo-2.5.0
+++ b/metadata/md5-cache/app-vim/gundo-2.5.0
@@ -10,4 +10,4 @@ RDEPEND=|| ( app-editors/vim[python_targets_python2_6(-)?,python_targets_python2
 SLOT=0
 SRC_URI=https://github.com/sjl/gundo.vim/archive/v2.5.0.tar.gz -> gundo-2.5.0.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
-_md5_=69b1af7b951d61443be4abcc4a3c1774
+_md5_=4debb0cbabbddd7e01435ebd560b4f22
diff --git a/metadata/md5-cache/app-vim/syntastic-9999 b/metadata/md5-cache/app-vim/syntastic-9999
index 86c5b9be6b5e..add95e67f082 100644
--- a/metadata/md5-cache/app-vim/syntastic-9999
+++ b/metadata/md5-cache/app-vim/syntastic-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2736 https://github.com
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
 _md5_=60b9922008e9a352d914cefac36c4834
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116 b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116
index 7dea46d3fe31..0a96b13080c7 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116
+++ b/metadata/md5-cache/app-vim/vim-latex-1.8.23.20130116
@@ -10,4 +10,4 @@ RDEPEND=|| ( app-editors/vim[python?] app-editors/gvim[python?] ) virtual/latex-
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.8.23-20130116.788-git2ef9956.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
-_md5_=adc1b8cc894a7e4aa780ae9db9d08e42
+_md5_=a302161ec73b42f104a85f9c932d4864
diff --git a/metadata/md5-cache/dev-cpp/libcmis-9999 b/metadata/md5-cache/dev-cpp/libcmis-9999
index 82147bed09e2..2a56c1c11968 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-9999
+++ b/metadata/md5-cache/dev-cpp/libcmis-9999
@@ -7,5 +7,5 @@ IUSE=static-libs man test
 LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
 RDEPEND=!dev-cpp/libcmis:0 dev-libs/boost:= dev-libs/libxml2 net-misc/curl
 SLOT=0.4
-_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51f5b3addfb9737b158568e7141aca1d
diff --git a/metadata/md5-cache/dev-db/ctdb-1.13 b/metadata/md5-cache/dev-db/ctdb-1.13
index 7d866d4e149f..7b36aafdbd0f 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.13
+++ b/metadata/md5-cache/dev-db/ctdb-1.13
@@ -3,10 +3,10 @@ DEPEND=dev-libs/popt
 DESCRIPTION=A cluster implementation of the TDB database used to store temporary data.
 EAPI=4
 HOMEPAGE=http://ctdb.samba.org/
-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=GPL-3
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/ctdb-1.13.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=130405dd24b1e5e00c01969efc6382e1
+_md5_=3724243b54852dde626d34f3b2051f20
diff --git a/metadata/md5-cache/dev-db/ctdb-9999 b/metadata/md5-cache/dev-db/ctdb-9999
index c1e75758584b..a826e7a5033e 100644
--- a/metadata/md5-cache/dev-db/ctdb-9999
+++ b/metadata/md5-cache/dev-db/ctdb-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://ctdb.samba.org/
 LICENSE=GPL-3
 RDEPEND=dev-libs/popt
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95bb15200aae9affaf7cacd3ce343952
diff --git a/metadata/md5-cache/dev-db/phppgadmin-9999 b/metadata/md5-cache/dev-db/phppgadmin-9999
index 1af0780d388f..fe493da4bdb3 100644
--- a/metadata/md5-cache/dev-db/phppgadmin-9999
+++ b/metadata/md5-cache/dev-db/phppgadmin-9999
@@ -7,5 +7,5 @@ IUSE=vhosts
 LICENSE=GPL-2
 RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) dev-lang/php[postgres,session] >=app-admin/webapp-config-1.50.15
 SLOT=9999
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=c0f3573bea41e64eafdee8768586894e
diff --git a/metadata/md5-cache/dev-db/postgresql-base-9999 b/metadata/md5-cache/dev-db/postgresql-base-9999
index a6890f7bf89b..4c5a9a4bc81c 100644
--- a/metadata/md5-cache/dev-db/postgresql-base-9999
+++ b/metadata/md5-cache/dev-db/postgresql-base-9999
@@ -9,5 +9,5 @@ RDEPEND=!!dev-db/libpq !!dev-db/postgresql !!dev-db/postgresql-client !!dev-db/p
 RESTRICT=test
 SLOT=9.4
 SRC_URI=http://dev.gentoo.org/~titanofold/postgresql-patches-9.3-r1.tbz2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f913913a63fbf9dfe8f44d05d60939ef
diff --git a/metadata/md5-cache/dev-db/postgresql-server-8.4.17 b/metadata/md5-cache/dev-db/postgresql-server-8.4.17
index 11fd7652d64b..5c2e9fd54371 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-8.4.17
+++ b/metadata/md5-cache/dev-db/postgresql-server-8.4.17
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-8.4.17:8.4[kerberos?,pam?,pg_legacytimestamp=,nl
 SLOT=8.4
 SRC_URI=mirror://postgresql/source/v8.4.17/postgresql-8.4.17.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r3.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.4.tbz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=55a76ae36e2765996e1ac1410266e913
+_md5_=f1654738023c5b2249397dd54ab21bc5
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.0.13 b/metadata/md5-cache/dev-db/postgresql-server-9.0.13
index 926151049662..d515af0a66ba 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.0.13
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.0.13
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-9.0.13:9.0[kerberos?,pam?,pg_legacytimestamp=,nl
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.13/postgresql-9.0.13.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r4.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.4.tbz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bab1f5e7e247470a470efe54577e6d72
+_md5_=763e0b8a7f2ed9b7c11d0354a50bf102
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.1.9 b/metadata/md5-cache/dev-db/postgresql-server-9.1.9
index a98cb4f77512..0dc35f100d1a 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.1.9
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.1.9
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-9.1.9:9.1[kerberos?,pam?,pg_legacytimestamp=,nls
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.9/postgresql-9.1.9.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-pre92-2.4.tbz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ff510dc4a9e3152d68d19f8cc69118e2
+_md5_=8fe74a5f4cc3a756403d32e031a03a99
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.2.4 b/metadata/md5-cache/dev-db/postgresql-server-9.2.4
index 83c4e6396c4d..85cee684ff5f 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.2.4
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.2.4
@@ -11,4 +11,4 @@ RDEPEND=~dev-db/postgresql-base-9.2.4:9.2[kerberos?,pam?,pg_legacytimestamp=,nls
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.4/postgresql-9.2.4.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.4.tbz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=611fc51f918c6b707767e157a5ce095c
+_md5_=58ecc6f4dfa6320ede34311eaa461a2e
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.3_beta1-r1 b/metadata/md5-cache/dev-db/postgresql-server-9.3_beta1-r1
index 525778cd0501..6bc5692e7b31 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.3_beta1-r1
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.3_beta1-r1
@@ -10,4 +10,4 @@ RDEPEND=~dev-db/postgresql-base-9.3_beta1:9.3[kerberos?,pam?,pg_legacytimestamp=
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3/postgresql-9.3beta1.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.3.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.5.tbz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d3d2e4a8980d87110dee2c93d76744ec
+_md5_=5038afd67b905b6306f3578477a1039c
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.3_beta2 b/metadata/md5-cache/dev-db/postgresql-server-9.3_beta2
index 08af4b94677e..73cb47b8fcfb 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.3_beta2
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.3_beta2
@@ -10,4 +10,4 @@ RDEPEND=~dev-db/postgresql-base-9.3_beta2:9.3[kerberos?,pam?,pg_legacytimestamp=
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3beta2/postgresql-9.3beta2.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.3-r1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.5.tbz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a96be1ad563715374bcd884a1fac16a9
+_md5_=1d4cd8925a60ce3d37131cc5df0027fa
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9999 b/metadata/md5-cache/dev-db/postgresql-server-9999
index 64ef10cec325..ab3db41b6187 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9999
+++ b/metadata/md5-cache/dev-db/postgresql-server-9999
@@ -8,5 +8,5 @@ LICENSE=POSTGRESQL GPL-2
 RDEPEND=~dev-db/postgresql-base-9999:9.4[kerberos?,pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt )
 SLOT=9.4
 SRC_URI=http://dev.gentoo.org/~titanofold/postgresql-initscript-2.4.tbz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.3-r1.tbz2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4ccc0c508b0c0a892e7e197d0781eda5
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	prefix	21058c21ca48453d771df15500873ede	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e31079ea2e5603047df10f272c66bb5b
diff --git a/metadata/md5-cache/dev-dotnet/pe-format-2.9999 b/metadata/md5-cache/dev-dotnet/pe-format-2.9999
index 93eb9c6b4bda..6e74434ccd58 100644
--- a/metadata/md5-cache/dev-dotnet/pe-format-2.9999
+++ b/metadata/md5-cache/dev-dotnet/pe-format-2.9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/pe-format2/
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.4
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b1f6fb3ad5271be8e9beaeebbae98be0
diff --git a/metadata/md5-cache/dev-embedded/bitbake-1.17.0 b/metadata/md5-cache/dev-embedded/bitbake-1.17.0
index 472975a9c3f5..e881950d9ab3 100644
--- a/metadata/md5-cache/dev-embedded/bitbake-1.17.0
+++ b/metadata/md5-cache/dev-embedded/bitbake-1.17.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/openembedded/bitbake/archive/1.17.0.tar.gz -> bitbake-1.17.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=f0cc3a637008a5f6ff1c7eedd160d2ba
+_md5_=6b4d2848a63df5fe72542cb91848788e
diff --git a/metadata/md5-cache/dev-embedded/bitbake-9999 b/metadata/md5-cache/dev-embedded/bitbake-9999
index 2a61d34f9030..d460ed0ad47f 100644
--- a/metadata/md5-cache/dev-embedded/bitbake-9999
+++ b/metadata/md5-cache/dev-embedded/bitbake-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-python/ply dev-python/progressbar python_targets_python2_6? ( dev-lang/python:2.6[sqlite] ) python_targets_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=2ae038f2af101942afb7230f04ddfef4
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=534320d8f5cbbfbcfb2ff58850320833
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index a9a14f48ad18..df9f48c8b38a 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -7,5 +7,5 @@ IUSE=cxx doc examples python static-libs tools
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) tools? ( dev-libs/confuse )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3e2ee2a8aba42a9b285c554d031002c0
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index f20bd02ef763..9bfc7ff31b2a 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/
 REQUIRED_USE=blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7662c2493ee517e3df631068ebd121c9
diff --git a/metadata/md5-cache/dev-embedded/urjtag-9999 b/metadata/md5-cache/dev-embedded/urjtag-9999
index 9ebd2fdee37f..6668ac63bad9 100644
--- a/metadata/md5-cache/dev-embedded/urjtag-9999
+++ b/metadata/md5-cache/dev-embedded/urjtag-9999
@@ -7,5 +7,5 @@ IUSE=ftd2xx ftdi readline static-libs usb
 LICENSE=GPL-2
 RDEPEND=ftdi? ( dev-embedded/libftdi ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=13a8205ee7d0ff1251bac2bfe016c41f
diff --git a/metadata/md5-cache/dev-games/aseprite-9999 b/metadata/md5-cache/dev-games/aseprite-9999
index bc4ca7223fb3..ab5ca1e13dab 100644
--- a/metadata/md5-cache/dev-games/aseprite-9999
+++ b/metadata/md5-cache/dev-games/aseprite-9999
@@ -7,5 +7,5 @@ IUSE=debug memleak static test
 LICENSE=GPL-2 FTL
 RDEPEND=dev-libs/tinyxml media-libs/allegro:0[X,png] media-libs/giflib media-libs/libpng:0 net-misc/curl sys-libs/zlib virtual/jpeg x11-libs/libX11
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fccb9017c2ea51c1f965e32218457db7
diff --git a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3 b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3
index 1fa0d609a74c..d70b74c7cbc3 100644
--- a/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3
+++ b/metadata/md5-cache/dev-haskell/cgi-3001.1.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=A library for writing CGI programs
 EAPI=5
 HOMEPAGE=http://andersk.mit.edu/haskell/cgi/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/monadcatchio-mtl:=[profile?] >=dev-haskell/mtl-1.0:=[profile?] >=dev-haskell/network-2.0:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] >=dev-haskell/xhtml-3000.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3001.1.8.3
 SRC_URI=mirror://hackage/packages/archive/cgi/3001.1.8.3/cgi-3001.1.8.3.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	48f0813cd6c66200944782b078f0a188	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4d11ff03dddffd9c01458380df2626c4
+_md5_=68e9562de1c2f8b5fe50c6b885b6de02
diff --git a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5 b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5
index 937438650418..79d6f1f51cb7 100644
--- a/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5
+++ b/metadata/md5-cache/dev-haskell/monadcatchio-mtl-0.3.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Monad-transformer version of the Control.Exception module
 EAPI=5
 HOMEPAGE=http://darcsden.com/jcpetruzza/MonadCatchIO-mtl
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.5
 SRC_URI=mirror://hackage/packages/archive/MonadCatchIO-mtl/0.3.0.5/MonadCatchIO-mtl-0.3.0.5.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	48f0813cd6c66200944782b078f0a188	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9dbb5621a09353510709fa6b7058a514
+_md5_=4a48a6ea56138dd460de1b621dc2e7a1
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.2 b/metadata/md5-cache/dev-haskell/network-2.4.1.2
index 8769697ec275..2b43cbe6305c 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level networking interface
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network
 IUSE=doc hscolour profile test
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.1.2
 SRC_URI=mirror://hackage/packages/archive/network/2.4.1.2/network-2.4.1.2.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	48f0813cd6c66200944782b078f0a188	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0bd4b3fc87a99c316d68debd2e354605
+_md5_=857e2251bbf3650fa1c9dd59e87a4350
diff --git a/metadata/md5-cache/dev-haskell/tar-0.3.2.0 b/metadata/md5-cache/dev-haskell/tar-0.3.2.0
index 7a72ab0ecc74..c4a78a45f6ef 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.3.2.0
+++ b/metadata/md5-cache/dev-haskell/tar-0.3.2.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
 DEPEND=>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Reading, writing and manipulating .tar archive files.
 EAPI=3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/tar/0.3.2.0/tar-0.3.2.0.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	48f0813cd6c66200944782b078f0a188	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dfd5afc31b1f89d60c6a614bbe4fb135
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	48f0813cd6c66200944782b078f0a188	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=05148b2c3b3099979faf279d4dce673c
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.3.1 b/metadata/md5-cache/dev-haskell/text-0.11.3.1
index fde87b9c864a..cc61b96bc4af 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.3.1
+++ b/metadata/md5-cache/dev-haskell/text-0.11.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=An efficient packed Unicode text type.
 EAPI=5
 HOMEPAGE=https://github.com/bos/text
 IUSE=developer doc hscolour profile test
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-haskell/deepseq-1.1.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.11.3.1
 SRC_URI=mirror://hackage/packages/archive/text/0.11.3.1/text-0.11.3.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	48f0813cd6c66200944782b078f0a188	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dc1afbf126b29ab41e6efea93416cd06
+_md5_=0b2ff420954268afb69fbc902b41fbd9
diff --git a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1 b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1
index 98e277286946..003133ff1717 100644
--- a/metadata/md5-cache/dev-haskell/xhtml-3000.2.1
+++ b/metadata/md5-cache/dev-haskell/xhtml-3000.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=An XHTML combinator library
 EAPI=3
 HOMEPAGE=https://github.com/haskell/xhtml
 IUSE=profile
-KEYWORDS=alpha amd64 ia64 ppc ~sparc ~x86
+KEYWORDS=alpha amd64 ia64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/xhtml/3000.2.1/xhtml-3000.2.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	48f0813cd6c66200944782b078f0a188	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dc1322d29f5e27ff515915c1c5650980
+_md5_=ea032c7829b8fd2c1f0bad58352f5f98
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r1 b/metadata/md5-cache/dev-java/antlr-2.7.7-r1
index cb73fb38e237..643e8ef61366 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r1
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e6ab86b5a1330efe71d89168499d34fc
+_md5_=467c31e8b2e4082a9c0de54fedf3c244
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r3 b/metadata/md5-cache/dev-java/antlr-2.7.7-r3
index 2e6c032d9b19..63d4d865127b 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r3
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b41b4599aa4d3dc5964c2e2656db47e8
+_md5_=a1b0263e3e79038bd0e73faa3a5b4474
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r4 b/metadata/md5-cache/dev-java/antlr-2.7.7-r4
index 3c6019b34834..6ca399983eac 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r4
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r4
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7c4dfb23cb60ec819980124d8929f1eb
+_md5_=d86d6685759a65fe58b9fd6734f5c178
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r5 b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
index 5cdf250dbd7d..4411ae4995f9 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r5
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=37370d9458aa8521758d0c556f88c5ff
+_md5_=473ac2620bc051126db1e8cdb5785a0d
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1 b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
index 9675db34b07a..42c0eca9e9ba 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An easy-to-use Java logging toolkit designed for secure, performance
 EAPI=4
 HOMEPAGE=http://avalon.apache.org/
 IUSE=elibc_FreeBSD doc source test
-KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=Apache-1.1
 RDEPEND=dev-java/avalon-framework:4.1 dev-java/log4j:0 java-virtuals/jaf:0 java-virtuals/javamail:0 java-virtuals/jms:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://apache/avalon/logkit/source/logkit-1.2.2-src.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1981b4fd2cb70f25f57a36a944a7e8a9
+_md5_=a78c40c6355af69d58f19d1ef048f2ee
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r2 b/metadata/md5-cache/dev-java/bcmail-1.38-r3
similarity index 57%
rename from metadata/md5-cache/dev-java/bcmail-1.38-r2
rename to metadata/md5-cache/dev-java/bcmail-1.38-r3
index 47402edcd1ee..e040eea8c4f5 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r2
+++ b/metadata/md5-cache/dev-java/bcmail-1.38-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip ~dev-java/bcprov-1.38:0 =dev-java/junit-3.8* dev-java/sun-jaf java-virtuals/javamail >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/bcprov:1.38 =dev-java/junit-3.8* dev-java/sun-jaf java-virtuals/javamail >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
 DESCRIPTION=Java cryptography APIs
 EAPI=1
 HOMEPAGE=http://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 ~dev-java/bcprov-1.38:0 =dev-java/junit-3.8* dev-java/sun-jaf java-virtuals/javamail >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.4 dev-java/bcprov:1.38 =dev-java/junit-3.8* dev-java/sun-jaf java-virtuals/javamail >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=1.38
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f18a4138a77927be3c8cdc440d85ad5e
+_md5_=027f0f5791ee359bdc3a9fe06c3646e8
diff --git a/metadata/md5-cache/dev-java/hoteqn-4.0.0 b/metadata/md5-cache/dev-java/hoteqn-4.0.0
index fb389701169e..63bc9fa77872 100644
--- a/metadata/md5-cache/dev-java/hoteqn-4.0.0
+++ b/metadata/md5-cache/dev-java/hoteqn-4.0.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
 DESCRIPTION=Java applet to view and display LaTeX mathematical equations
 HOMEPAGE=http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html
 IUSE=elibc_FreeBSD
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/hoteqn-4.0.0.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=25b13dea76a4297685fea00daa93b00a
+_md5_=dbb95cb88dc3e483a8f068b48ef45e25
diff --git a/metadata/md5-cache/dev-java/java-config-2.1.12-r1 b/metadata/md5-cache/dev-java/java-config-2.1.12-r1
index 808c4c7f67d8..2498d9e8cfdd 100644
--- a/metadata/md5-cache/dev-java/java-config-2.1.12-r1
+++ b/metadata/md5-cache/dev-java/java-config-2.1.12-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gentoo/java-config-2.1.12.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0204724c80fad09fdec284e6d014351f
+_md5_=60442ce919d491576df41d1bca5554a3
diff --git a/metadata/md5-cache/dev-java/java-config-2.2.0 b/metadata/md5-cache/dev-java/java-config-2.2.0
index fcd1c1d0c8dc..e3a490101177 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=2
 SRC_URI=http://dev.gentoo.org/~sera/distfiles/java-config-2.2.0.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d9ae2d834002293a217447223395bf8b
+_md5_=13791aaf480deacf3723196cd0b8cc36
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9 b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
index 8a1ead85e628..51b2de9ce8c9 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c8167a01d8f2efd2357638a5691e465f
+_md5_=eda02f9f3403517baaf4003705c84fdc
diff --git a/metadata/md5-cache/dev-lang/jimtcl-9999 b/metadata/md5-cache/dev-lang/jimtcl-9999
index d403851cab54..f29df4d669b6 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-9999
+++ b/metadata/md5-cache/dev-lang/jimtcl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://jim.tcl.tk
 IUSE=doc static-libs
 LICENSE=LGPL-2
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=2f8ba7fdbe839b7dfe8d19a667df279d
diff --git a/metadata/md5-cache/dev-lang/niecza-9999 b/metadata/md5-cache/dev-lang/niecza-9999
index 1cc0eb39a68b..42e0085cfdde 100644
--- a/metadata/md5-cache/dev-lang/niecza-9999
+++ b/metadata/md5-cache/dev-lang/niecza-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/sorear/niecza
 LICENSE=Artistic-2
 RDEPEND=dev-lang/mono
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7dd6e4b3e492523fca847d916ad5a8eb
diff --git a/metadata/md5-cache/dev-lang/opendylan-9999 b/metadata/md5-cache/dev-lang/opendylan-9999
index 06e97ed4181d..8e5dc0aca2be 100644
--- a/metadata/md5-cache/dev-lang/opendylan-9999
+++ b/metadata/md5-cache/dev-lang/opendylan-9999
@@ -7,5 +7,5 @@ LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=815e1cce5fe63e5e539fb38d546dec84
diff --git a/metadata/md5-cache/dev-lang/rebol-9999 b/metadata/md5-cache/dev-lang/rebol-9999
index 3a34598865f0..cf339bbfe375 100644
--- a/metadata/md5-cache/dev-lang/rebol-9999
+++ b/metadata/md5-cache/dev-lang/rebol-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://rebol.com
 LICENSE=Apache-2.0
 RDEPEND=|| ( dev-lang/rebol dev-lang/rebol-bin )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bee90e51abee92208dbca126ecc4af2f
diff --git a/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r1 b/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r1
index 5a64ca495e29..e9616b59e236 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r1
+++ b/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] >=dev-ruby/json-1.7.7[ruby_targets_ruby20] >=dev-ruby/rake-0.9.6[ruby_targets_ruby20] rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.0
 SRC_URI=mirror://ruby/2.0/ruby-2.0.0-p247.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.0.0_p247-r1.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=069d7ef2b398862a268a0f8e166958a1
+_md5_=5618305d6a1cf053079eadf29626a91f
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-1.8.2.15-r2 b/metadata/md5-cache/dev-lang/spidermonkey-1.8.2.15-r2
index 82703e2169d4..f3dfd1413df6 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-1.8.2.15-r2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-1.8.2.15-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
 IUSE=threadsafe
-KEYWORDS=alpha amd64 ~arm ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-macos
 LICENSE=NPL-1.1
 RDEPEND=threadsafe? ( >=dev-libs/nspr-4.8.6 )
 SLOT=0/mozjs
 SRC_URI=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.15/source/firefox-3.6.15.source.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6cbed752201c1a233dddf0651e4fb5d4
+_md5_=35f3902ead5f2788e60824d30108fca3
diff --git a/metadata/md5-cache/dev-lang/yasm-9999 b/metadata/md5-cache/dev-lang/yasm-9999
index fe28daa41da4..cee9758f49a9 100644
--- a/metadata/md5-cache/dev-lang/yasm-9999
+++ b/metadata/md5-cache/dev-lang/yasm-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
 RDEPEND=nls? ( virtual/libintl )
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=59a26b502dbbaf3f32b1af15a9c01fb7
diff --git a/metadata/md5-cache/dev-libs/Ice-3.5.0-r1 b/metadata/md5-cache/dev-libs/Ice-3.5.0-r1
index 31634bbe8f0f..c44d377c9f15 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.5.0-r1
+++ b/metadata/md5-cache/dev-libs/Ice-3.5.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 >=dev-libs/openssl-0.9.8o:
 SLOT=0
 SRC_URI=http://www.zeroc.com/download/Ice/3.5/Ice-3.5.0.tar.gz doc? ( http://www.zeroc.com/download/Ice/3.5/Ice-3.5.0.pdf )
 _eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e81ab9ab21ed15d495d4c5025d468678
+_md5_=c8ec45459f45f2d82d6cdae17b20824a
diff --git a/metadata/md5-cache/dev-libs/STLport-5.2.1 b/metadata/md5-cache/dev-libs/STLport-5.2.1-r2
similarity index 67%
rename from metadata/md5-cache/dev-libs/STLport-5.2.1
rename to metadata/md5-cache/dev-libs/STLport-5.2.1-r2
index 484617e91a2b..f90c4df91ab6 100644
--- a/metadata/md5-cache/dev-libs/STLport-5.2.1
+++ b/metadata/md5-cache/dev-libs/STLport-5.2.1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup test
 DEPEND=boost? ( >=dev-libs/boost-1.35.0-r5 )
 DESCRIPTION=C++ STL library
-EAPI=2
+EAPI=5
 HOMEPAGE=http://stlport.sourceforge.net/
 IUSE=boost debug static static-libs threads
-KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=boehm-gc HPND
 RDEPEND=boost? ( >=dev-libs/boost-1.35.0-r5 )
 SLOT=0
-SRC_URI=mirror://sourceforge/stlport/STLport-5.2.1.tar.bz2 mirror://gentoo/distfiles/STLport-patches-5.2.1-1.tbz2
+SRC_URI=mirror://sourceforge/stlport/STLport-5.2.1.tar.bz2 http://dev.gentoo.org/~xarthisius/distfiles/STLport-patches-5.2.1-2.tbz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=860bb55fd263f3bf419ccd2a1d3ec40e
+_md5_=f97a98786a6d48bbdca30219c4347644
diff --git a/metadata/md5-cache/dev-libs/boost-1.52.0-r6 b/metadata/md5-cache/dev-libs/boost-1.52.0-r6
index 1f808be14d2b..8e50ec84e091 100644
--- a/metadata/md5-cache/dev-libs/boost-1.52.0-r6
+++ b/metadata/md5-cache/dev-libs/boost-1.52.0-r6
@@ -10,4 +10,4 @@ RDEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys
 SLOT=0/1.52
 SRC_URI=mirror://sourceforge/boost/boost_1_52_0.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7df18141a68bac7cbcb2024dedfe980f
+_md5_=9f0e071185909e7c69b20afe22f3150d
diff --git a/metadata/md5-cache/dev-libs/boost-1.53.0 b/metadata/md5-cache/dev-libs/boost-1.53.0
index 9ff3fd0d4138..0b19ba62920e 100644
--- a/metadata/md5-cache/dev-libs/boost-1.53.0
+++ b/metadata/md5-cache/dev-libs/boost-1.53.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 py
 SLOT=0/1.53
 SRC_URI=mirror://sourceforge/boost/boost_1_53_0.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1d2249a9fdd1d9edea820a90480670a3
+_md5_=658d86b9c0cb1b7d6ff3593dac0c974f
diff --git a/metadata/md5-cache/dev-libs/boost-1.54.0 b/metadata/md5-cache/dev-libs/boost-1.54.0
index b87b75ef9597..3364b946feb2 100644
--- a/metadata/md5-cache/dev-libs/boost-1.54.0
+++ b/metadata/md5-cache/dev-libs/boost-1.54.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 py
 SLOT=0/1.54
 SRC_URI=mirror://sourceforge/boost/boost_1_54_0.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=315cb2e4359f3d9cf0393fc61e11707d
+_md5_=9a04cca9cfe300785c4050edd95a6d14
diff --git a/metadata/md5-cache/dev-libs/botan-1.10.3-r1 b/metadata/md5-cache/dev-libs/botan-1.10.3-r1
index 41eeebca45d2..1e34d8cd2f42 100644
--- a/metadata/md5-cache/dev-libs/botan-1.10.3-r1
+++ b/metadata/md5-cache/dev-libs/botan-1.10.3-r1
@@ -10,4 +10,4 @@ RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.5 ) zlib? ( >=sys-libs/zlib-1.2.3 ) python
 SLOT=0
 SRC_URI=http://files.randombit.net/botan/Botan-1.10.3.tbz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=abb21c17ecbff545c47f57e89cc1ae64
+_md5_=df7e6194fed3e3a1d08d1b2675a44cdd
diff --git a/metadata/md5-cache/dev-libs/cryptlib-3.4.0-r1 b/metadata/md5-cache/dev-libs/cryptlib-3.4.0-r1
index d116c495921c..7fecaaa53d24 100644
--- a/metadata/md5-cache/dev-libs/cryptlib-3.4.0-r1
+++ b/metadata/md5-cache/dev-libs/cryptlib-3.4.0-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) odbc? ( dev-db/unixODBC ) pytho
 SLOT=0
 SRC_URI=ftp://ftp.franken.de/pub/crypt/cryptlib/cl340.zip doc? ( mirror://gentoo/cryptlib-3.4.0-manual.pdf.bz2 )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3de52d00aca34642b7d9bf34dbabea0f
+_md5_=8228fd5858d6f6659a0422649e81087b
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
deleted file mode 100644
index d0939b0c07c5..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
-EAPI=2
-HOMEPAGE=http://asg.web.cmu.edu/sasl/
-IUSE=authdaemond berkdb crypt gdbm kerberos openldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz ntlm_unsupported_patch? ( mirror://gentoo/cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1479b854bd4e4747bc5347e0a9207ad4
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r4
deleted file mode 100644
index ecb7bf989902..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.25-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) =sys-devel/automake-1.12* >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
-EAPI=4
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5993ca5aab54f68daa0d79104ed63637
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r1 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r1
deleted file mode 100644
index 196d376193e2..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) =sys-devel/automake-1.12* >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
-EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=95c8ea233fe524161d2935efc95f508a
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r2 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r2
deleted file mode 100644
index 9ca50bf8a4b3..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) =sys-devel/automake-1.12* >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer).
-EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=393fea22942054c4f169579c3b47301e
diff --git a/metadata/md5-cache/dev-libs/dee-1.0.14-r2 b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
index 7d458ac8f0f7..589f46fe39d8 100644
--- a/metadata/md5-cache/dev-libs/dee-1.0.14-r2
+++ b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=introspection? ( || ( python_targets_python2_6 python_targets_pytho
 SLOT=0
 SRC_URI=https://launchpad.net/dee/1.0/1.0.14/+download/dee-1.0.14.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
-_md5_=5e01c2109ca013d8b9a5b91583211037
+_md5_=b530b79165e7bfd29e7049bef130ce85
diff --git a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13 b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13
index 0dfd85ae0889..a27843a400c0 100644
--- a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13
+++ b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13
@@ -4,10 +4,10 @@ DESCRIPTION=Loki C++ library from Modern C++ Design
 EAPI=5
 HOMEPAGE=http://www.libferris.com/
 IUSE=static-libs stlport
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=stlport? ( >=dev-libs/STLport-5 ) dev-libs/libsigc++:2
 SLOT=0
 SRC_URI=mirror://sourceforge/witme/ferrisloki-3.0.13.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4397bd24e6a47d29ceee2e4a7eb7db44
+_md5_=895423c281a91e4a26d1d021465a9b5f
diff --git a/metadata/md5-cache/dev-libs/glib-2.34.3-r1 b/metadata/md5-cache/dev-libs/glib-2.34.3-r1
index 16759e775e09..24f4c37dff23 100644
--- a/metadata/md5-cache/dev-libs/glib-2.34.3-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.34.3-r1
@@ -11,4 +11,4 @@ RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.34/glib-2.34.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e6dc1b6e30dfd1e8f30ee8087b7afaba
+_md5_=05226539288107a4f38788cdd01e7e07
diff --git a/metadata/md5-cache/dev-libs/glib-2.36.4 b/metadata/md5-cache/dev-libs/glib-2.36.4
index def366a7d12e..f85037dd2a79 100644
--- a/metadata/md5-cache/dev-libs/glib-2.36.4
+++ b/metadata/md5-cache/dev-libs/glib-2.36.4
@@ -11,4 +11,4 @@ RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_3
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.4.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8273334ec3e77226f2283fd064e8ba6d
+_md5_=bba24f0322690008c7588da06d487dc3
diff --git a/metadata/md5-cache/dev-libs/glib-2.36.4-r1 b/metadata/md5-cache/dev-libs/glib-2.36.4-r1
index e6df3d180cd2..e12181eae57f 100644
--- a/metadata/md5-cache/dev-libs/glib-2.36.4-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.36.4-r1
@@ -11,4 +11,4 @@ RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_3
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.4.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f0b3744397cfb344c343194ce4ae19b1
+_md5_=0d0ecaab7d31d99397dcbb2284c56d1f
diff --git a/metadata/md5-cache/dev-libs/gnulib-9999-r1 b/metadata/md5-cache/dev-libs/gnulib-9999-r1
index e4b290b62127..5bd06e79bbc4 100644
--- a/metadata/md5-cache/dev-libs/gnulib-9999-r1
+++ b/metadata/md5-cache/dev-libs/gnulib-9999-r1
@@ -5,5 +5,5 @@ HOMEPAGE=http://www.gnu.org/software/gnulib
 IUSE=doc
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8610ab53dd7176cc5ca28cda77c01357
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.36.0-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.36.0-r1
new file mode 100644
index 000000000000..2f5a15f92b38
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.36.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/gobject-introspection-common-1.36.0 >=dev-libs/glib-2.36:2 doctool? ( dev-python/mako ) virtual/libffi:= !<dev-lang/vala-0.20.0 >=dev-util/gtk-doc-am-1.15 sys-devel/bison sys-devel/flex virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Introspection infrastructure for generating gobject library bindings for various languages
+EAPI=5
+HOMEPAGE=http://live.gnome.org/GObjectIntrospection/
+IUSE=cairo doctool test python_targets_python2_7 python_single_target_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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+PDEPEND=cairo? ( x11-libs/cairo[glib] )
+RDEPEND=>=dev-libs/gobject-introspection-common-1.36.0 >=dev-libs/glib-2.36:2 doctool? ( dev-python/mako ) virtual/libffi:= !<dev-lang/vala-0.20.0
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) test? ( cairo )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gobject-introspection/1.36/gobject-introspection-1.36.0.tar.xz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=7850f1e044bb5a833cc5ca0d355fed36
diff --git a/metadata/md5-cache/dev-libs/libRocket-1.2.1 b/metadata/md5-cache/dev-libs/libRocket-1.2.1
index 78c698f147ab..e600a0d245b4 100644
--- a/metadata/md5-cache/dev-libs/libRocket-1.2.1
+++ b/metadata/md5-cache/dev-libs/libRocket-1.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lloydw/libRocket/archive/release-1.2.1.tar.gz -> libRocket-1.2.1.tar.gz
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d50670a457ed3432ee19cb8f584a6529
+_md5_=88833c4a39a9a8c683aa2c037d1e78ca
diff --git a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110 b/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110
index e5969617e633..2daf74cd135e 100644
--- a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110
+++ b/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/libRocket-1.2.1_p20130110.tar.xz
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=82ac4a73e85b41618bb61dc4ee7ae066
+_md5_=cd5128a222bcac047beab9c59cdad996
diff --git a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1 b/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
index fe28484df54b..0aff60587c24 100644
--- a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
+++ b/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/libRocket-1.2.1_p20130110.tar.xz
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=517e430981bc18a4e8c2a488c1533d77
+_md5_=0d1acf90978714086bddfc42c1cc9a64
diff --git a/metadata/md5-cache/dev-libs/libRocket-9999 b/metadata/md5-cache/dev-libs/libRocket-9999
index 3e1e0f4e669a..88e17e5b330a 100644
--- a/metadata/md5-cache/dev-libs/libRocket-9999
+++ b/metadata/md5-cache/dev-libs/libRocket-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/boost[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 )
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ce9f05b75ed5b30b044e5d9a87a84f4f
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=12f76cd768b303d20c008a56c7c0a72d
diff --git a/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524 b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524
index 0b695e358faf..54157aa3ba2f 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524
+++ b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524
@@ -9,4 +9,4 @@ RDEPEND=>=sys-devel/clang-3.2 >=sys-devel/llvm-3.2
 SLOT=0
 SRC_URI=mirror://gentoo/libclc-0.0.1_pre20130524.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e143ad7387ea699cee1d03559b5abc9f
+_md5_=b28aaac22c8ce5a78fff253d9bb4d33c
diff --git a/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130819 b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130819
index 6db1af0077e3..0389c53d8d5e 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130819
+++ b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130819
@@ -9,4 +9,4 @@ RDEPEND=>=sys-devel/clang-3.2 >=sys-devel/llvm-3.2
 SLOT=0
 SRC_URI=mirror://gentoo/libclc-0.0.1_pre20130819.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=637c200525a21c9f80a90f5dd0a26393
+_md5_=ce35163d7746338d0304986abc78c35a
diff --git a/metadata/md5-cache/dev-libs/libdivecomputer-9999 b/metadata/md5-cache/dev-libs/libdivecomputer-9999
index 977d22914e8c..b2316d17cd5d 100644
--- a/metadata/md5-cache/dev-libs/libdivecomputer-9999
+++ b/metadata/md5-cache/dev-libs/libdivecomputer-9999
@@ -7,5 +7,5 @@ IUSE=usb examples +static-libs
 LICENSE=LGPL-2.1
 RDEPEND=usb? ( virtual/libusb )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71835ab1b17ce6be03ef31051ddec9da
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.12 b/metadata/md5-cache/dev-libs/libdnet-1.12
index dd41273a26ce..f4fc6614f0f9 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.12
+++ b/metadata/md5-cache/dev-libs/libdnet-1.12
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://libdnet.googlecode.com/files/libdnet-1.12.tgz ipv6? ( http://fragroute-ipv6.googlecode.com/files/libdnet-1.12.ipv6-1.patch.gz )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2bb243c078182c6ceb8c0797759f938a
+_md5_=9babc8d2427972e7ab7db236c59737ee
diff --git a/metadata/md5-cache/dev-libs/libev-4.15 b/metadata/md5-cache/dev-libs/libev-4.15
index 5f41802f4d33..d56929a04d00 100644
--- a/metadata/md5-cache/dev-libs/libev-4.15
+++ b/metadata/md5-cache/dev-libs/libev-4.15
@@ -4,10 +4,10 @@ DESCRIPTION=A high-performance event loop/event model with lots of feature
 EAPI=5
 HOMEPAGE=http://software.schmorp.de/pkg/libev.html
 IUSE=elibc_glibc static-libs
-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 ~x86-macos
+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 ~x86-macos
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.15.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7a34fb722c077002370839828aa6ad7b
+_md5_=dad2e2b3d3cb414c5596c4fb7092d208
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index 7aee0ea9b444..bf7e5b1a60ce 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=MIT
 RDEPEND=dev-libs/boost:=
 SLOT=0/0.5
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5052c5b60c440372f072b7fee183951c
diff --git a/metadata/md5-cache/dev-libs/libmowgli-9999 b/metadata/md5-cache/dev-libs/libmowgli-9999
index 0a367d5b118f..28a09dd01318 100644
--- a/metadata/md5-cache/dev-libs/libmowgli-9999
+++ b/metadata/md5-cache/dev-libs/libmowgli-9999
@@ -7,5 +7,5 @@ IUSE=ssl
 LICENSE=BSD-2
 RDEPEND=ssl? ( dev-libs/openssl )
 SLOT=2
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=3b57aab2e5ce2b5a82ff76de98293f34
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.22-r2 b/metadata/md5-cache/dev-libs/libnl-3.2.22-r2
index 412fcce5b6bf..7a23a26c2c8e 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.22-r2
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.22-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 py
 SLOT=3
 SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.22.tar.gz doc? ( http://www.infradead.org/~tgr/libnl/files/libnl-doc-3.2.22.tar.gz )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2529a297d98b6d8d5927632cee95b6ca
+_md5_=9f01370a511079234fb984dc25d20506
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index b10d910271d6..9484548916ea 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.51.0:= >=dev-libs/libixion-0.5.0:=
 SLOT=0/0.5
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5bb8b5692c607185ad063ea2b0a2d5c4
diff --git a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0 b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
index 0645034e4875..8a6fad56d12d 100644
--- a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
+++ b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=4
 SRC_URI=mirror://kde/stable/libqzeitgeist/0.8.0/src/libqzeitgeist-0.8.0.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=05a2a962b97e1d082618052ebdf3306a
+_md5_=2d581ab85456ceecad76a610a7e0d057
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2 b/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2
index 47e2b825dfc6..705fd330d8a2 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.0-r2
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) py
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=897daf6577229a8a135d60d775942a0e
+_md5_=e0139c792f76d7ec897fd610e306b0d8
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.1 b/metadata/md5-cache/dev-libs/libxml2-2.9.1
index 0dae0cbded3e..31491131825b 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) py
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6c655140d57f3ec949906c1b656fe595
+_md5_=d58a8d8998ccc21fee811c65ea62c32a
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.1-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.1-r1
index 1c2977563004..4c0070c25c8c 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.1-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.1-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib:= icu? ( dev-libs/icu:= ) lzma? ( app-arch/xz-utils:= ) py
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df5c231a20647374a7f922cc08ec385b
+_md5_=0a16b9918ddf1a59e3d3b94b7490c344
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1
index 0abbd45ee9a0..7ccab0eddd8c 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9ac317d0dbab2366ea9746165fa50324
+_md5_=6695ef7c870188001f9f1c47b722f326
diff --git a/metadata/md5-cache/dev-libs/libzip-0.11 b/metadata/md5-cache/dev-libs/libzip-0.11
deleted file mode 100644
index e0d938a09f35..000000000000
--- a/metadata/md5-cache/dev-libs/libzip-0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Library for manipulating zip archives
-EAPI=5
-HOMEPAGE=http://www.nih.at/libzip/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.nih.at/libzip/libzip-0.11.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=05e6a99199a9bde1ec241bdfcf4ad4da
diff --git a/metadata/md5-cache/dev-libs/libzip-0.11.1 b/metadata/md5-cache/dev-libs/libzip-0.11.1
index 0285505408ab..7b8d61b24dd7 100644
--- a/metadata/md5-cache/dev-libs/libzip-0.11.1
+++ b/metadata/md5-cache/dev-libs/libzip-0.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for manipulating zip archives
 EAPI=5
 HOMEPAGE=http://www.nih.at/libzip/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nih.at/libzip/libzip-0.11.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c532a459279328150d7da98438b53f8c
+_md5_=877264acffdd77bad0771eb3a7014abd
diff --git a/metadata/md5-cache/dev-libs/polylib-9999 b/metadata/md5-cache/dev-libs/polylib-9999
index e2429e171412..35e4115ff857 100644
--- a/metadata/md5-cache/dev-libs/polylib-9999
+++ b/metadata/md5-cache/dev-libs/polylib-9999
@@ -4,5 +4,5 @@ DESCRIPTION=ppl port of cloog
 HOMEPAGE=http://icps.u-strasbg.fr/polylib/
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=179a1278bda82737d29eb084142b3c81
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0 b/metadata/md5-cache/dev-libs/protobuf-2.5.0
index 39b73d86fdb9..c9d00ad55387 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_6? ( dev-lang/
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bd4333d579b3cf98ffcefc24a3e33939
+_md5_=b46772c9c0d20c0b1f0849c0598d1be8
diff --git a/metadata/md5-cache/dev-libs/qrosscore-9999 b/metadata/md5-cache/dev-libs/qrosscore-9999
index 76103ab974f7..2d02ee47431e 100644
--- a/metadata/md5-cache/dev-libs/qrosscore-9999
+++ b/metadata/md5-cache/dev-libs/qrosscore-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6a90fb1fc5da60dabc2c66bedff2a6c7
diff --git a/metadata/md5-cache/dev-libs/qrosspython-9999 b/metadata/md5-cache/dev-libs/qrosspython-9999
index b8e16667e561..ab2c9fbeeaff 100644
--- a/metadata/md5-cache/dev-libs/qrosspython-9999
+++ b/metadata/md5-cache/dev-libs/qrosspython-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND==dev-libs/qrosscore-9999 =dev-lang/python-2*
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34010717462975f4976e6bdbf99fcbf5
diff --git a/metadata/md5-cache/dev-libs/suikyo-2.1.0-r2 b/metadata/md5-cache/dev-libs/suikyo-2.1.0-r2
deleted file mode 100644
index 0c7aa0e25ea7..000000000000
--- a/metadata/md5-cache/dev-libs/suikyo-2.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-lang/ruby:1.8 emacs? ( virtual/emacs ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-DESCRIPTION=Romaji Hiragana conversion library
-EAPI=2
-HOMEPAGE=http://taiyaki.org/suikyo/
-IUSE=emacs elibc_FreeBSD ruby_targets_ruby18
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/ruby:1.8 emacs? ( virtual/emacs ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-SLOT=0
-SRC_URI=http://prime.sourceforge.jp/src/suikyo-2.1.0.tar.gz
-_eclasses_=elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3ebaed776d3ce38bbb1d6a03361b4164
diff --git a/metadata/md5-cache/dev-lua/luvit-9999 b/metadata/md5-cache/dev-lua/luvit-9999
index b3d020bc95ec..f666b5a8c06a 100644
--- a/metadata/md5-cache/dev-lua/luvit-9999
+++ b/metadata/md5-cache/dev-lua/luvit-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 !bundled-libs? ( BSD MIT )
 RDEPEND=dev-libs/openssl:0 sys-libs/zlib !bundled-libs? ( dev-lang/luajit:2[lua52compat] >=dev-libs/yajl-2.0.4 )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=8b41e282bb008a71fe942298b8f8fa4e
diff --git a/metadata/md5-cache/dev-ml/findlib-1.4 b/metadata/md5-cache/dev-ml/findlib-1.4
index 433c61722672..de750970333b 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.4
+++ b/metadata/md5-cache/dev-ml/findlib-1.4
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml tool to find/use non-standard packages.
 EAPI=5
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.4.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=636ca6ffc3031090e4cfc226f3f4e45f
+_md5_=dc49e33a1ca81fec3b209cae3277cbbd
diff --git a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.30.0 b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.30.0
new file mode 100644
index 000000000000..9d3ba498fa0f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.30.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Module-Build || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=Automated accessor generation
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Class-ErrorHandler/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Class-ErrorHandler-0.03.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4ce7d64860cada5d03a34db7a426763e
diff --git a/metadata/md5-cache/dev-perl/Compress-Bzip2-2.170.0 b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.170.0
new file mode 100644
index 000000000000..0a6d4225ca32
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Compress-Bzip2-2.170.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/bzip2 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=A Bzip2 perl module
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Compress-Bzip2/
+KEYWORDS=~amd64 ~ia64 ~mips ~sparc ~x86 ~ppc-aix
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.17.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4e73f0e080823e172373ff6354001b4b
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0
index 0b6e7cb16990..e07f6bc180d8 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-MIME-Base64-3.07 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DEPEND=>=virtual/perl-MIME-Base64-3.07 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Capture-Tiny ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=A unified interface to MIME encoding and decoding
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Email-MIME-Encodings/
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/perl-MIME-Base64-3.07 || ( >=dev-lang/perl-5.16 <dev-lang/perl
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0f291f6396093d90cb33607050d98f5e
+_md5_=f7470d3840f4a189ddb4ff84e7e080ac
diff --git a/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.300-r1 b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.300-r1
new file mode 100644
index 000000000000..5b45e28c4489
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/FileHandle-Unget-0.162.300-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=A FileHandle which supports ungetting of multiple bytes
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/FileHandle-Unget/
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1623.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9909ac46d6057486d68e3f1206dc9aa4
diff --git a/metadata/md5-cache/dev-perl/MLDBM-2.01 b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
similarity index 61%
rename from metadata/md5-cache/dev-perl/MLDBM-2.01
rename to metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
index 8f8e8c58f364..16a9c53d6937 100644
--- a/metadata/md5-cache/dev-perl/MLDBM-2.01
+++ b/metadata/md5-cache/dev-perl/FreezeThaw-0.500.100-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=A multidimensional/tied hash Perl Module
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/MLDBM/
-KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 s390 sparc x86
+DESCRIPTION=converting Perl structures to strings and back
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/FreezeThaw/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
+SRC_URI=mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a9b117dcdee5d5783b44a6cc96447821
+_md5_=e556e10f964a807b452830d2198a2bc8
diff --git a/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.94 b/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.94
deleted file mode 100644
index 675c2d77c3e2..000000000000
--- a/metadata/md5-cache/dev-perl/Gearman-Client-Async-0.94
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Asynchronous client module for Gearman for Danga::Socket applications
-EAPI=2
-HOMEPAGE=http://search.cpan.org/dist/Gearman-Client-Async/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=dev-perl/Gearman-1.07 >=dev-perl/Danga-Socket-1.57 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BR/BRADFITZ/Gearman-Client-Async-0.94.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=65bf5fa2f1a9e3c8dfee17ac6edaf2e6
diff --git a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0 b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
similarity index 94%
rename from metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0
rename to metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
index 65fc0bda6488..3249f07462eb 100644
--- a/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0
+++ b/metadata/md5-cache/dev-perl/Graphics-ColorObject-0.5.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-perl/Graphics-ColorNames-0.32 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=convert between color spaces
-EAPI=2
+EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Graphics-ColorObject/
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-2 )
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/Graphics-ColorNames-0.32 || ( >=dev-lang/perl-5.16 <dev-lang/
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AI/AIZVORSKI/Graphics-ColorObject-0.5.0.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=21a4c6a3bb9ff17a76335d89a30f09c4
+_md5_=afcadc02994be71d1054fd61d8a2a079
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-9999 b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
index 3a66c24c8de6..8cb1dc95cedc 100644
--- a/metadata/md5-cache/dev-perl/Lab-Measurement-9999
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
@@ -7,5 +7,5 @@ IUSE=debug +xpression
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-perl/Clone dev-perl/Exception-Class dev-perl/TermReadKey dev-perl/TeX-Encode dev-perl/XML-Generator dev-perl/XML-DOM dev-perl/XML-Twig dev-perl/encoding-warnings perl-core/Switch sci-visualization/gnuplot virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-Switch virtual/perl-Time-HiRes !dev-perl/Lab-Instrument !dev-perl/Lab-Tools debug? ( dev-lang/perl[ithreads] dev-perl/wxperl ) xpression? ( dev-perl/wxperl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9abfd9a6e147aeec51d9f257297f8a4e
diff --git a/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1 b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
new file mode 100644
index 000000000000..722e19f468f4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lingua-Preferred-0.2.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Log-TraceMessages || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=Pick a language based on user's preferences
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Lingua-Preferred/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-2 GPL-3 )
+RDEPEND=dev-perl/Log-TraceMessages || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ED/EDAVIS/Lingua-Preferred-0.2.4.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9e96fbd41f4e835223bc2ead38058915
diff --git a/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.500.200-r1 b/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.500.200-r1
new file mode 100644
index 000000000000..6724bddaa4f6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Mail-Mbox-MessageParser-1.500.200-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Text-Diff dev-perl/FileHandle-Unget || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=Manipulation of electronic mail addresses
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/m-m-msgparser/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Text-Diff dev-perl/FileHandle-Unget || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5002.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5178fed5e7541365f7b03437917d9796
diff --git a/metadata/md5-cache/dev-perl/Math-Base36-0.120.0 b/metadata/md5-cache/dev-perl/Math-Base36-0.120.0
index 7c2fd3a4cffd..1756bcc12e46 100644
--- a/metadata/md5-cache/dev-perl/Math-Base36-0.120.0
+++ b/metadata/md5-cache/dev-perl/Math-Base36-0.120.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DEPEND=test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Exception ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Encoding and decoding of base36 strings
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Math-Base36/
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/Math-Base36-0.12.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=44686d29ca120498d396f15354558405
+_md5_=d220808a5dd4ddfcb385eb12081bc118
diff --git a/metadata/md5-cache/dev-perl/String-Escape-2010.002 b/metadata/md5-cache/dev-perl/String-Escape-2010.002
new file mode 100644
index 000000000000..bad6dfb881c3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/String-Escape-2010.002
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
+DESCRIPTION=Backslash escapes, quoted phrase, word elision, etc.
+HOMEPAGE=http://search.cpan.org/dist/String-Escape/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-2 )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=85adcacb4b328f372e1ff9404d2901fe
diff --git a/metadata/md5-cache/dev-perl/crypt-idea-1.100.0 b/metadata/md5-cache/dev-perl/crypt-idea-1.100.0
new file mode 100644
index 000000000000..1b5f98993e22
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/crypt-idea-1.100.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DESCRIPTION=Parse and save PGP packet streams
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Crypt-IDEA/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=DES
+RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=05acc284033d811f750e61ae2ae38312
diff --git a/metadata/md5-cache/dev-php/libvirt-php-9999 b/metadata/md5-cache/dev-php/libvirt-php-9999
index 379b71620753..c67ef9265604 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-9999
+++ b/metadata/md5-cache/dev-php/libvirt-php-9999
@@ -9,5 +9,5 @@ RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php5-3? ( dev-lang/ph
 REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81ecae652a09e58f805ef1d586986a8f
diff --git a/metadata/md5-cache/dev-python/Babel-0.9.6-r1 b/metadata/md5-cache/dev-python/Babel-0.9.6-r1
index b213448607b4..76970b224852 100644
--- a/metadata/md5-cache/dev-python/Babel-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/Babel-0.9.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/babel/Babel-0.9.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=62da3bf6186bc2efe3e5abd74298e947
+_md5_=66531d8af1fd5675c3b5605514ffe879
diff --git a/metadata/md5-cache/dev-python/Babel-1.2 b/metadata/md5-cache/dev-python/Babel-1.2
index 25cd88a3274e..03452d952a50 100644
--- a/metadata/md5-cache/dev-python/Babel-1.2
+++ b/metadata/md5-cache/dev-python/Babel-1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-1.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8d2f82e3a4d3a3ca4636b47449ce2515
+_md5_=b20854ab7d89e7c541e55257c7d3cc5b
diff --git a/metadata/md5-cache/dev-python/Babel-1.3 b/metadata/md5-cache/dev-python/Babel-1.3
index 1260b26cf632..0fa24f440a6c 100644
--- a/metadata/md5-cache/dev-python/Babel-1.3
+++ b/metadata/md5-cache/dev-python/Babel-1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b527f22d9382bb451917eb0001f9693
+_md5_=eaec6007e902250a7031df23236a724d
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.13.1 b/metadata/md5-cache/dev-python/PyGithub-1.13.1
index 131557b5473f..b8df39ed9ff7 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.13.1
+++ b/metadata/md5-cache/dev-python/PyGithub-1.13.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/jacquev6/PyGithub/archive/v1.13.1.tar.gz -> PyGithub-1.13.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f113609de1c11ba69c281739482ed31a
+_md5_=c246ff752860557c0d09378c6ab95e84
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.15.0 b/metadata/md5-cache/dev-python/PyGithub-1.15.0
index 7e8c6f63e8b8..a0202e192f41 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.15.0
+++ b/metadata/md5-cache/dev-python/PyGithub-1.15.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/jacquev6/PyGithub/archive/v1.15.0.tar.gz -> PyGithub-1.15.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f0c057c142c748af792e26e61a39aa7b
+_md5_=6cedebc792ada334479f670c9f75d030
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.16.0 b/metadata/md5-cache/dev-python/PyGithub-1.16.0
index ae17b2427e52..21916e4dd492 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.16.0
+++ b/metadata/md5-cache/dev-python/PyGithub-1.16.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/jacquev6/PyGithub/archive/v1.16.0.tar.gz -> PyGithub-1.16.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=35ad5f0c95017b09dbb4f2e6f0722bd9
+_md5_=7ab31334af0523911bc2c01ce5c3e2bc
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.17.0 b/metadata/md5-cache/dev-python/PyGithub-1.17.0
index 50ab972e7078..5250d3de4b3a 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.17.0
+++ b/metadata/md5-cache/dev-python/PyGithub-1.17.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/jacquev6/PyGithub/archive/v1.17.0.tar.gz -> PyGithub-1.17.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be9fbca8151585173fafb4f66119dbee
+_md5_=f2d9bea4f3c26420e53101d133f6b400
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.10.1 b/metadata/md5-cache/dev-python/PyQt4-4.10.1
index 5e0fdc796d9a..eea3772c055c 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.10.1
+++ b/metadata/md5-cache/dev-python/PyQt4-4.10.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.10.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d85d86d2f9825349fc3aef72ad408980
+_md5_=61125198078f973791b08cf04d7b138f
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.10.2 b/metadata/md5-cache/dev-python/PyQt4-4.10.2
index d5f9aa821206..59cd28a6d2d4 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.10.2
+++ b/metadata/md5-cache/dev-python/PyQt4-4.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt toolkit
 EAPI=5
 HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt
 IUSE=X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.14.3:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-qt/qtcore-4.8.0:4 X? ( >=dev-qt/qtgui-4.8.0:4 || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) >=dev-qt/qttest-4.8.0:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=dev-qt/qtdbus-4.8.0:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.0:4 ) help? ( >=dev-qt/qthelp-4.8.0:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.0:4 ) opengl? ( >=dev-qt/qtopengl-4.8.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-4.8.0:4 media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-4.8.0:4 ) sql? ( >=dev-qt/qtsql-4.8.0:4 ) svg? ( >=dev-qt/qtsvg-4.8.0:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.0:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.0:4 )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) webkit? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.10.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f8d666885a3d38881ee79d8b32e68256
+_md5_=6bac9faf1568190f2ec6af261b59c3ad
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.9.6-r2 b/metadata/md5-cache/dev-python/PyQt4-4.9.6-r2
index 5b60515009be..c36695158048 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.9.6-r2
+++ b/metadata/md5-cache/dev-python/PyQt4-4.9.6-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phon
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.9.6.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=68d76180db197c20bef3865980f91f89
+_md5_=84adfa4091de2ea448f31a4c3452a8fb
diff --git a/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
index 3276b6704988..7ea2f4242182 100644
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/PyRSS2Gen-1.0.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.dalkescientific.com/Python/PyRSS2Gen-1.0.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=405c4a55f8af82ec13d7370b181c9230
+_md5_=689d25943f7c0f62c5b35066b99cb7bd
diff --git a/metadata/md5-cache/dev-python/RecSQL-0.7.8 b/metadata/md5-cache/dev-python/RecSQL-0.7.8
index a68763c2ff73..7589f4f9eee9 100644
--- a/metadata/md5-cache/dev-python/RecSQL-0.7.8
+++ b/metadata/md5-cache/dev-python/RecSQL-0.7.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/orbeckst/RecSQL/archive/release-0.7.8.tar.gz -> RecSQL-0.7.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=9420575a8a0a02830ebf11bd3dbb7314
+_md5_=27dbc4a79a75878ba4f4504b6dec89d1
diff --git a/metadata/md5-cache/dev-python/addons-0.7 b/metadata/md5-cache/dev-python/addons-0.7
index ea57b52aa421..f65271635983 100644
--- a/metadata/md5-cache/dev-python/addons-0.7
+++ b/metadata/md5-cache/dev-python/addons-0.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/A/AddOns/AddOns-0.7.zip -> addons-0.7.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=779404da3a673a55bbbd5f59acab242e
+_md5_=f00138045ec4653ca60a1ecf5b34575f
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 a8c79adf823f..4a2f8c216120 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://adns-python.googlecode.com/files/adns-python-1.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fa4c3677e9d1a93d5ca424b86a4d960c
+_md5_=ae7f58e936eced15334b7e36b7464ced
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 31eefb253e68..1eb0b9d41165 100644
--- a/metadata/md5-cache/dev-python/adodb-py-2.20-r1
+++ b/metadata/md5-cache/dev-python/adodb-py-2.20-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/adodb/adodb-220.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a3260608b7d2911488bb13bf53fea6b
+_md5_=5ba6f77572494a0414a152179eb5d42a
diff --git a/metadata/md5-cache/dev-python/alembic-0.4.2 b/metadata/md5-cache/dev-python/alembic-0.4.2
index a7b02ea874b7..e6002ec9e42e 100644
--- a/metadata/md5-cache/dev-python/alembic-0.4.2
+++ b/metadata/md5-cache/dev-python/alembic-0.4.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.4.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=266aa5555409e5201988d06288fcc669
+_md5_=4b435216572d320b058f276facd3d9a5
diff --git a/metadata/md5-cache/dev-python/alembic-0.5.0 b/metadata/md5-cache/dev-python/alembic-0.5.0
index 8a5f7f05fd66..b27721517c59 100644
--- a/metadata/md5-cache/dev-python/alembic-0.5.0
+++ b/metadata/md5-cache/dev-python/alembic-0.5.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.5.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=202922809cebc812a0c728675459b618
+_md5_=107e36cab61fa7ef7a2185dfa748757f
diff --git a/metadata/md5-cache/dev-python/amqplib-0.6.1-r1 b/metadata/md5-cache/dev-python/amqplib-0.6.1-r1
index 6556e9370888..43dbf910b24f 100644
--- a/metadata/md5-cache/dev-python/amqplib-0.6.1-r1
+++ b/metadata/md5-cache/dev-python/amqplib-0.6.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://py-amqplib.googlecode.com/files/amqplib-0.6.1.tgz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f472c6e1b1aec2985acd981ddef4d000
+_md5_=6a806d4b35fc377e5001fe055bfaca43
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 881b1534559f..a5c6e93c0713 100644
--- a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://py-amqplib.googlecode.com/files/amqplib-1.0.2.tgz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b9fea7c0c79e99f9e6cf28817de136a5
+_md5_=ef745215ef50fc134fc45dbab212ec6b
diff --git a/metadata/md5-cache/dev-python/ansi2html-0.9.3-r1 b/metadata/md5-cache/dev-python/ansi2html-0.9.3-r1
index a2cf1c271d12..54f66c6c51eb 100644
--- a/metadata/md5-cache/dev-python/ansi2html-0.9.3-r1
+++ b/metadata/md5-cache/dev-python/ansi2html-0.9.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-0.9.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a89c296e9da607ef8fe9d8c4bb3cd519
+_md5_=58d28a69dc5531b61981215ab6adb894
diff --git a/metadata/md5-cache/dev-python/ansi2html-0.9.4 b/metadata/md5-cache/dev-python/ansi2html-0.9.4
index 847f218f8b3d..d331e1459863 100644
--- a/metadata/md5-cache/dev-python/ansi2html-0.9.4
+++ b/metadata/md5-cache/dev-python/ansi2html-0.9.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-0.9.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0a49b5fc41e382b971ba45d5cf43291a
+_md5_=52a3bdaf48bcbadf9b00a15878e673db
diff --git a/metadata/md5-cache/dev-python/anyjson-0.2.4 b/metadata/md5-cache/dev-python/anyjson-0.2.4
index 65e4f9d8a02a..b872c1f78c74 100644
--- a/metadata/md5-cache/dev-python/anyjson-0.2.4
+++ b/metadata/md5-cache/dev-python/anyjson-0.2.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] dev-python/simplejson[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] dev-python/simplejson[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Wraps the best available JSON implementation available in a common interface
 EAPI=5
 HOMEPAGE=http://bitbucket.org/runeh/anyjson
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyjson/anyjson-0.2.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=599e75dda1ee05746c1bf59e42917e58
+_md5_=82a2a0c1a39393505cf06bc1a978a4a1
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 514897d73eaf..ffec8257db7d 100644
--- a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
+++ b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/simplejson[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/simplejson[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Wraps the best available JSON implementation available in a common interface
 EAPI=5
 HOMEPAGE=http://bitbucket.org/runeh/anyjson
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyjson/anyjson-0.3.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f7109ab58c8d3d3932006c225114d35c
+_md5_=8add6fb4818415ef794aaf0f4f632549
diff --git a/metadata/md5-cache/dev-python/apipkg-1.2-r1 b/metadata/md5-cache/dev-python/apipkg-1.2-r1
index 657a6546f2c1..80adef7dece4 100644
--- a/metadata/md5-cache/dev-python/apipkg-1.2-r1
+++ b/metadata/md5-cache/dev-python/apipkg-1.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/apipkg/apipkg-1.2.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b46f3d7813678c63654494f79ea34e50
+_md5_=870e6a733935e8b5fbf876b4caad942b
diff --git a/metadata/md5-cache/dev-python/appdirs-1.2.0-r1 b/metadata/md5-cache/dev-python/appdirs-1.2.0-r1
index 41d1849737e7..1d1b429162da 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/appdirs-1.2.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/appdirs/appdirs-1.2.0.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=157e6c4e668995f63d455dcc76752037
+_md5_=9bd187c3a0f10ee4ebf35124f0a8d696
diff --git a/metadata/md5-cache/dev-python/apse-0.2-r2 b/metadata/md5-cache/dev-python/apse-0.2-r2
index d1050b8ac61b..444f47ffb898 100644
--- a/metadata/md5-cache/dev-python/apse-0.2-r2
+++ b/metadata/md5-cache/dev-python/apse-0.2-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.personal.psu.edu/staff/i/u/iua1/python/apse/dist/Apse-0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=696bcedde48fb0400a6455a45ad5f3a6
+_md5_=58d5ef3eeb831de996e2a353462509a6
diff --git a/metadata/md5-cache/dev-python/apse-0.2-r3 b/metadata/md5-cache/dev-python/apse-0.2-r3
index 33c0fcbe9a98..5d1225a0aac6 100644
--- a/metadata/md5-cache/dev-python/apse-0.2-r3
+++ b/metadata/md5-cache/dev-python/apse-0.2-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.personal.psu.edu/staff/i/u/iua1/python/apse/dist/Apse-0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b6fdf0c3505179fa214f5d780ad7a9d2
+_md5_=aa2969ff612fd35a99142af18bd0c2e1
diff --git a/metadata/md5-cache/dev-python/apsw-3.7.15.1_p1 b/metadata/md5-cache/dev-python/apsw-3.7.15.1_p1
index 70f02aca90fd..c9884823cd21 100644
--- a/metadata/md5-cache/dev-python/apsw-3.7.15.1_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.7.15.1_p1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://apsw.googlecode.com/files/apsw-3.7.15.1-r1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=008c580ace7e7c3bbc7e821edbdbeaa5
+_md5_=28e90b86203e86c661257001f35dfe5a
diff --git a/metadata/md5-cache/dev-python/apsw-3.7.15.2_p1 b/metadata/md5-cache/dev-python/apsw-3.7.15.2_p1
index 6edd13ab5dc7..735fb2c445c8 100644
--- a/metadata/md5-cache/dev-python/apsw-3.7.15.2_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.7.15.2_p1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://apsw.googlecode.com/files/apsw-3.7.15.2-r1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d9208be8747970219d57ce51a61f79bb
+_md5_=c4dd4f54db052e2c5a74062cd0ab8ca5
diff --git a/metadata/md5-cache/dev-python/apsw-3.7.16.2_p1 b/metadata/md5-cache/dev-python/apsw-3.7.16.2_p1
index 4f8ac6f31d79..fdd3569a7a11 100644
--- a/metadata/md5-cache/dev-python/apsw-3.7.16.2_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.7.16.2_p1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://apsw.googlecode.com/files/apsw-3.7.16.2-r1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ef73d237d4291f8586b65970babe86cd
+_md5_=cc218e4c863338bb876f9c2d63d70704
diff --git a/metadata/md5-cache/dev-python/apsw-3.7.17_p1 b/metadata/md5-cache/dev-python/apsw-3.7.17_p1
index 3a09fd0b2ec8..3463616771af 100644
--- a/metadata/md5-cache/dev-python/apsw-3.7.17_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.7.17_p1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://apsw.googlecode.com/files/apsw-3.7.17-r1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cc6a479913b156681f6f9aea0b8b7eb3
+_md5_=abe8a2d4074fc5c7a93f609a92873fcb
diff --git a/metadata/md5-cache/dev-python/argh-0.23.0-r1 b/metadata/md5-cache/dev-python/argh-0.23.0-r1
index 70607786dcb6..4e0f6f7fc65e 100644
--- a/metadata/md5-cache/dev-python/argh-0.23.0-r1
+++ b/metadata/md5-cache/dev-python/argh-0.23.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.23.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f4481163e404c20a1d2e42de80ddc013
+_md5_=5cf5c7b59410f4852610e6c7996c399c
diff --git a/metadata/md5-cache/dev-python/argh-0.23.1 b/metadata/md5-cache/dev-python/argh-0.23.1
index 56babf8f04d9..e8dc749cf764 100644
--- a/metadata/md5-cache/dev-python/argh-0.23.1
+++ b/metadata/md5-cache/dev-python/argh-0.23.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.23.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1d4b36d46af24dcca145e28c5145abdd
+_md5_=7166f74e3cfec187be8f3aaa0327656c
diff --git a/metadata/md5-cache/dev-python/argh-0.23.2 b/metadata/md5-cache/dev-python/argh-0.23.2
index d31f58d3b259..36e308755bad 100644
--- a/metadata/md5-cache/dev-python/argh-0.23.2
+++ b/metadata/md5-cache/dev-python/argh-0.23.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.23.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d90690be13941a20299f66b0b7af115d
+_md5_=0030704eaf47d8e8a6215723a71f885e
diff --git a/metadata/md5-cache/dev-python/argh-0.23.3 b/metadata/md5-cache/dev-python/argh-0.23.3
index 0d3d96a4d1f7..c971a56e8826 100644
--- a/metadata/md5-cache/dev-python/argh-0.23.3
+++ b/metadata/md5-cache/dev-python/argh-0.23.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.23.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5c79653c2112e31ca6eff0b0fbceefa2
+_md5_=8c52b80aeee50fc6ffc0f720b5be9177
diff --git a/metadata/md5-cache/dev-python/argparse-1.2.1-r2 b/metadata/md5-cache/dev-python/argparse-1.2.1-r2
index 599c42519aa2..02983b62fbf6 100644
--- a/metadata/md5-cache/dev-python/argparse-1.2.1-r2
+++ b/metadata/md5-cache/dev-python/argparse-1.2.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 )
 SLOT=0
 SRC_URI=http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=28bdb438642ea12d8f72a78eeca22682
+_md5_=4d0196f3692efe11fadeb25e246bdec9
diff --git a/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1 b/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
index 6d41efc30534..84e7d0c6215d 100644
--- a/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/arrayterator-1.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrayterator/arrayterator-1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6fe634d7c5fa6eb24f5fab9a199957cb
+_md5_=f3fe0abd77fd4824ff8d2886f27cfa59
diff --git a/metadata/md5-cache/dev-python/asciitable-0.8.0-r1 b/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
index 8d4ec36a8c25..019fd43b2c31 100644
--- a/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/asciitable/asciitable-0.8.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ace5ac9b48b33e13be26755232fc8d1b
+_md5_=843c5884835926e71d8607531ef194c6
diff --git a/metadata/md5-cache/dev-python/astng-0.24.3 b/metadata/md5-cache/dev-python/astng-0.24.3
index 0dadec0fc479..58694db2ad8c 100644
--- a/metadata/md5-cache/dev-python/astng-0.24.3
+++ b/metadata/md5-cache/dev-python/astng-0.24.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=ftp://ftp.logilab.org/pub/astng/logilab-astng-0.24.3.tar.gz mirror://pypi/l/logilab-astng/logilab-astng-0.24.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eace8cea34e7be0567a5e73aee41b70c
+_md5_=37656c0f18e912d258a563c8847a52d7
diff --git a/metadata/md5-cache/dev-python/authres-0.501 b/metadata/md5-cache/dev-python/authres-0.501
index e672098dc33a..a4fef68ffac4 100644
--- a/metadata/md5-cache/dev-python/authres-0.501
+++ b/metadata/md5-cache/dev-python/authres-0.501
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-0.501.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1da3bd86b6433a255c84e1ffaba0d8b7
+_md5_=bf95687f433f89ddbfb13e337df78a06
diff --git a/metadata/md5-cache/dev-python/authres-0.600 b/metadata/md5-cache/dev-python/authres-0.600
index efa2c5f4f783..00e8d3f182bb 100644
--- a/metadata/md5-cache/dev-python/authres-0.600
+++ b/metadata/md5-cache/dev-python/authres-0.600
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-0.600.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5e4c2d76eab6dd60fc3671c2c25c722e
+_md5_=fad9fe996319c4910d5d585764bf4523
diff --git a/metadata/md5-cache/dev-python/authres-0.601 b/metadata/md5-cache/dev-python/authres-0.601
index 8de0e51e2e8f..01c91324dd57 100644
--- a/metadata/md5-cache/dev-python/authres-0.601
+++ b/metadata/md5-cache/dev-python/authres-0.601
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-0.601.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c67b8365e37fdb1732a46f01373df3e
+_md5_=c7fed75134b0b412b0bf327c0288dcc9
diff --git a/metadata/md5-cache/dev-python/authres-0.602 b/metadata/md5-cache/dev-python/authres-0.602
index b7d549fd4e4f..08ff15a422aa 100644
--- a/metadata/md5-cache/dev-python/authres-0.602
+++ b/metadata/md5-cache/dev-python/authres-0.602
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-0.602.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2e60847f5288952e53c28f459db9b6bd
+_md5_=5046bf0bad991dbea046bde4f3b7d178
diff --git a/metadata/md5-cache/dev-python/autopep8-0.9.2 b/metadata/md5-cache/dev-python/autopep8-0.9.2
index 5d01acd67c4a..2421ccd371ca 100644
--- a/metadata/md5-cache/dev-python/autopep8-0.9.2
+++ b/metadata/md5-cache/dev-python/autopep8-0.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/hhatto/autopep8/tarball/ver0.9.2 -> autopep8-0.9.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=3d032a985f1aa64e194489406f04bda5
+_md5_=6ffc9e72e7ac6168dfedfe6762432cb4
diff --git a/metadata/md5-cache/dev-python/autopep8-0.9.3 b/metadata/md5-cache/dev-python/autopep8-0.9.3
index 0d8a126b7d83..67184f593606 100644
--- a/metadata/md5-cache/dev-python/autopep8-0.9.3
+++ b/metadata/md5-cache/dev-python/autopep8-0.9.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/hhatto/autopep8/tarball/ver0.9.3 -> autopep8-0.9.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=e73994cadf9a5fc0744d89be6ff737a1
+_md5_=057e4d7a8fe0635f1f55c4cddfbed9f5
diff --git a/metadata/md5-cache/dev-python/autopep8-9999 b/metadata/md5-cache/dev-python/autopep8-9999
index c463df3ad8ba..f3d0391898ec 100644
--- a/metadata/md5-cache/dev-python/autopep8-9999
+++ b/metadata/md5-cache/dev-python/autopep8-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-python/pep8-1.4.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=72db6c0f748b483fff964a053c5ca000
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=54f20ebb5b7583d01dfa6a85793e2274
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.1 b/metadata/md5-cache/dev-python/backports-lzma-0.0.1
index 0e49a3a76682..3b14a5fa7705 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.1
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c156ea222fdf8f14cd30ee4bf2ec902c
+_md5_=445869e7e85ff0f135c77449a726c5be
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.2 b/metadata/md5-cache/dev-python/backports-lzma-0.0.2
index bceb43aea6f0..a94d7fcb2637 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.2
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=19ad2b3d396765c5a4deaeab722fd4b7
+_md5_=ef7bb8ca2d12546f7190c7e1c256c9ed
diff --git a/metadata/md5-cache/dev-python/beaker-1.6.4-r1 b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
index 1cb0087acafa..525ff5aadc2d 100644
--- a/metadata/md5-cache/dev-python/beaker-1.6.4-r1
+++ b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/B/Beaker/Beaker-1.6.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e492753cba2a1586022a304d5a900499
+_md5_=42ceee6ceb81aadd80dabf1b68b8274d
diff --git a/metadata/md5-cache/dev-python/beanstalkc-0.3.0-r1 b/metadata/md5-cache/dev-python/beanstalkc-0.3.0-r1
index 806058287267..54ca53bc87b2 100644
--- a/metadata/md5-cache/dev-python/beanstalkc-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/beanstalkc-0.3.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beanstalkc/beanstalkc-0.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f983759c77bc5747aad71ed1d5c6787
+_md5_=0d56baffc7773d3dd78c1c5c83f60417
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2 b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
index 5a10f94b9bb8..6247d837f36f 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_2 python_targets_python3_3 )
 SLOT=python-3
 SRC_URI=http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup-3.1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=286bc8fa0be86163048a6da44adb91fe
+_md5_=c160a5fdcda9cf5672b4b040502ba2ad
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1 b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
index 308aec9b4101..0c7da5bc5b5f 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=python-2
 SRC_URI=http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c1987086c3b5e580dfd805aefbc2d036
+_md5_=32fcdd8f8ba7e4e1bbf7e97081cfb059
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1 b/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
index 5850c5c891aa..1db0c70e5d4e 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=05b191b7d5a664cef8c2ebd69a594141
+_md5_=84f31bc60a6a80029248d6d8f5bd71b9
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.2.0 b/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
index 16ddab3e54e5..a8249ffff851 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d464b6a6aa9450e68bad24e66b2ff9df
+_md5_=a5acab04bae495cf49c63ce8618ee3c6
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.2.1 b/metadata/md5-cache/dev-python/beautifulsoup-4.2.1
index 83c7600d9e50..96365bf5d798 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.2.1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=54fcb9d296c5dd1f44c2c01aa3c85348
+_md5_=b908471e1d1ce608ebd80c28761605c2
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.20-r1 b/metadata/md5-cache/dev-python/billiard-2.7.3.20-r1
index df81645c5d81..0d679f6676e4 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.20-r1
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.20-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.20.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c182c1b1eab4fd4438917cc2c1fa1e6b
+_md5_=021f770bd4a90ad1f56d75d9a8d41911
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.21 b/metadata/md5-cache/dev-python/billiard-2.7.3.21
index 559d171388e0..b3aea8839481 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.21
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.21
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.21.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e4a3739bef4100e521edafdbfee6ddb3
+_md5_=de8cbf8e40ba68d61cf027a1c66b325d
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.22 b/metadata/md5-cache/dev-python/billiard-2.7.3.22
index 0403c47633c2..5bee6bf3f63d 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.22
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.22
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.22.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=90e78b781d2a26a5721ddc93bc5c4ffc
+_md5_=428bf5a6e3fef9a0effcf7c65af71deb
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.23 b/metadata/md5-cache/dev-python/billiard-2.7.3.23
index 709e63aeea05..75b1ab7e11ee 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.23
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.23
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.23.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dc1823978a7f613b29a0761a1f8e1098
+_md5_=350889daa7a91a424f7794988aa7df72
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.27 b/metadata/md5-cache/dev-python/billiard-2.7.3.27
index a659dc7c0940..6dc85b46cdff 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.27
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.27
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.27.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=307839c60df61436e685cf4f610e3b0d
+_md5_=89bb8fc6b477ded89fbf83f8f316bd2e
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.28 b/metadata/md5-cache/dev-python/billiard-2.7.3.28
index 41f49f4f0dab..57f2d1aadca0 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.28
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.28
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.28.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f4119d8053bf1910e01215f61f29c18e
+_md5_=1063aacc245c543010aac423796f855a
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.31 b/metadata/md5-cache/dev-python/billiard-2.7.3.31
index fefd19da9954..da27dbfcc2a9 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.31
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.31
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.31.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2758fd6a631b38e1ec2d2e5069e465b6
+_md5_=8e1589afa79195c807d1c5f324a06fcd
diff --git a/metadata/md5-cache/dev-python/billiard-2.7.3.32 b/metadata/md5-cache/dev-python/billiard-2.7.3.32
index 7e2cf20dd4d2..8c6f28a308d6 100644
--- a/metadata/md5-cache/dev-python/billiard-2.7.3.32
+++ b/metadata/md5-cache/dev-python/billiard-2.7.3.32
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-2.7.3.32.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e0e944b624221df03f290cc5be275c16
+_md5_=b01e1754179cd1bdba883a7813b57f69
diff --git a/metadata/md5-cache/dev-python/blinker-1.2-r1 b/metadata/md5-cache/dev-python/blinker-1.2-r1
index 3e1957984fc5..e02232f20e48 100644
--- a/metadata/md5-cache/dev-python/blinker-1.2-r1
+++ b/metadata/md5-cache/dev-python/blinker-1.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=27e32eea16bcc9eff83a07ce6ecc4ecf
+_md5_=5385b5d332b59d1dbde2eaed73690c89
diff --git a/metadata/md5-cache/dev-python/blinker-1.3 b/metadata/md5-cache/dev-python/blinker-1.3
index 7fe79a8b70d3..474a405ac948 100644
--- a/metadata/md5-cache/dev-python/blinker-1.3
+++ b/metadata/md5-cache/dev-python/blinker-1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=73ac2a6ef15e4af95784cdeb50f577ab
+_md5_=fa254f29bdf8dcf546fa3e416289bc97
diff --git a/metadata/md5-cache/dev-python/bluelet-0.2.0 b/metadata/md5-cache/dev-python/bluelet-0.2.0
index 2824329541ab..5559144f9b86 100644
--- a/metadata/md5-cache/dev-python/bluelet-0.2.0
+++ b/metadata/md5-cache/dev-python/bluelet-0.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/sampsyo/bluelet/archive/v0.2.0.tar.gz -> bluelet-0.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=812c189c2eeabf6faac7b8b4c4896dca
+_md5_=535023101a864c6b6e0f129d4935d215
diff --git a/metadata/md5-cache/dev-python/boto-2.1.1 b/metadata/md5-cache/dev-python/boto-2.1.1
index 94d25857a8fc..36184e5679ed 100644
--- a/metadata/md5-cache/dev-python/boto-2.1.1
+++ b/metadata/md5-cache/dev-python/boto-2.1.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=39a848fe781e6c317e2939a505bb3f54
+_md5_=4ba7c2c8e015eacad24210ef8abbd124
diff --git a/metadata/md5-cache/dev-python/boto-2.10.0 b/metadata/md5-cache/dev-python/boto-2.10.0
index 275d18564765..f53656691f7f 100644
--- a/metadata/md5-cache/dev-python/boto-2.10.0
+++ b/metadata/md5-cache/dev-python/boto-2.10.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.10.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=54d488ba18bfad7af5fc7bb9c31044b1
+_md5_=67ca3bcbbf70b1410bc053feaef85b3a
diff --git a/metadata/md5-cache/dev-python/boto-2.11.0 b/metadata/md5-cache/dev-python/boto-2.11.0
index 92de697bd127..205d0e620245 100644
--- a/metadata/md5-cache/dev-python/boto-2.11.0
+++ b/metadata/md5-cache/dev-python/boto-2.11.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.11.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e4aa702ebe18cd24a15b2e511cdc9581
+_md5_=d8261fd469c3ccf692e0aee90bf36c54
diff --git a/metadata/md5-cache/dev-python/boto-2.9.9 b/metadata/md5-cache/dev-python/boto-2.9.9
index 20e373b92b18..37e29eb9d8ab 100644
--- a/metadata/md5-cache/dev-python/boto-2.9.9
+++ b/metadata/md5-cache/dev-python/boto-2.9.9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.9.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2bb21bb34f8d0e1ab7408883549c6bad
+_md5_=cb3318f42f1e42b11976e5a0fc63fc25
diff --git a/metadata/md5-cache/dev-python/bottle-0.11.6 b/metadata/md5-cache/dev-python/bottle-0.11.6
index ddd7c814dba2..e64c60b74cf2 100644
--- a/metadata/md5-cache/dev-python/bottle-0.11.6
+++ b/metadata/md5-cache/dev-python/bottle-0.11.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.11.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6dc6e588ded550fe8a7207a978bc19f8
+_md5_=5c6a463f59c8e8c4073022032d71e7d5
diff --git a/metadata/md5-cache/dev-python/bottle-0.11.6-r1 b/metadata/md5-cache/dev-python/bottle-0.11.6-r1
index 1d84e66ee01b..7e3598a26a44 100644
--- a/metadata/md5-cache/dev-python/bottle-0.11.6-r1
+++ b/metadata/md5-cache/dev-python/bottle-0.11.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and simple micro-framework for small web-applications
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/bottle http://bottlepy.org/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=amd64 ~arm ia64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ia64 ppc ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.11.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9fd662673d8ce96d0da2bba27c5a3438
+_md5_=ef3945999cc64c987584a57e83a66c80
diff --git a/metadata/md5-cache/dev-python/bsddb3-5.3.0-r1 b/metadata/md5-cache/dev-python/bsddb3-5.3.0-r1
index af4416ca50a8..766faa52f664 100644
--- a/metadata/md5-cache/dev-python/bsddb3-5.3.0-r1
+++ b/metadata/md5-cache/dev-python/bsddb3-5.3.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-5.3.0.tar.gz
 _eclasses_=db-use	1c719875d6599536f956fafea9e1f404	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9896666919989efdea816c499b7b656f
+_md5_=4436768b4562814cfa7171dd3581e8f0
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.0.0 b/metadata/md5-cache/dev-python/bsddb3-6.0.0
index b42021a05926..830acc7d24bf 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.0.0
+++ b/metadata/md5-cache/dev-python/bsddb3-6.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.0.0.tar.gz
 _eclasses_=db-use	1c719875d6599536f956fafea9e1f404	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a88ce98698d34a5523dca44aba5816b9
+_md5_=777988af27793e456aef4fba10cd3590
diff --git a/metadata/md5-cache/dev-python/bytecodeassembler-0.6 b/metadata/md5-cache/dev-python/bytecodeassembler-0.6
index 5957b4c0792c..57bd7c3bcfc3 100644
--- a/metadata/md5-cache/dev-python/bytecodeassembler-0.6
+++ b/metadata/md5-cache/dev-python/bytecodeassembler-0.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/B/BytecodeAssembler/BytecodeAssembler-0.6.zip -> bytecodeassembler-0.6.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b08230796b6afcf03b009f244b3b2376
+_md5_=df2a1762c7846f241f18a04fffb943a8
diff --git a/metadata/md5-cache/dev-python/celementtree-1.0.5-r2 b/metadata/md5-cache/dev-python/celementtree-1.0.5-r2
index def0d3e87e7f..3c9675a9e402 100644
--- a/metadata/md5-cache/dev-python/celementtree-1.0.5-r2
+++ b/metadata/md5-cache/dev-python/celementtree-1.0.5-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://effbot.org/downloads/cElementTree-1.0.5-20051216.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7cc1b6ba2eb2f7b6bdf7a984b4b8b86d
+_md5_=7a1e0b110e0b51c27572e784c0e577e3
diff --git a/metadata/md5-cache/dev-python/cement-2.0.2 b/metadata/md5-cache/dev-python/cement-2.0.2
index b8c7c9b16039..846495774477 100644
--- a/metadata/md5-cache/dev-python/cement-2.0.2
+++ b/metadata/md5-cache/dev-python/cement-2.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://builtoncement.com/cement/2.0/source/cement-2.0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4ec628d14d26699908d2af3534d39207
+_md5_=f598fe0b60e03b312d2f300c506dd837
diff --git a/metadata/md5-cache/dev-python/cffi-0.6 b/metadata/md5-cache/dev-python/cffi-0.6
index 5a400de84f9a..c589b1b41470 100644
--- a/metadata/md5-cache/dev-python/cffi-0.6
+++ b/metadata/md5-cache/dev-python/cffi-0.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cffi/cffi-0.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dacf98ed02d977bde07d5afc40535e58
+_md5_=85c6873ed5e414a0ebf209cec4b13000
diff --git a/metadata/md5-cache/dev-python/cffi-0.7 b/metadata/md5-cache/dev-python/cffi-0.7
index 25482595d243..74a79c819333 100644
--- a/metadata/md5-cache/dev-python/cffi-0.7
+++ b/metadata/md5-cache/dev-python/cffi-0.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cffi/cffi-0.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1d108efd85d00f7a4666592e77010d54
+_md5_=28b584b9e5b4c50068406213b38ec5f1
diff --git a/metadata/md5-cache/dev-python/cffi-0.7.2 b/metadata/md5-cache/dev-python/cffi-0.7.2
index 20c23ccbdd60..c504da371641 100644
--- a/metadata/md5-cache/dev-python/cffi-0.7.2
+++ b/metadata/md5-cache/dev-python/cffi-0.7.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cffi/cffi-0.7.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ce2bbcb60d998d164b69748e5e808c7
+_md5_=7de4557940f12fb86579a03d5e991d21
diff --git a/metadata/md5-cache/dev-python/charade-1.0.3 b/metadata/md5-cache/dev-python/charade-1.0.3
index 10727e5da76d..fde78154b149 100644
--- a/metadata/md5-cache/dev-python/charade-1.0.3
+++ b/metadata/md5-cache/dev-python/charade-1.0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/charade/charade-1.0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=329067ec835e7aa13fca61411f0ed337
+_md5_=ec8b12d8fb7615df2c1d9584d56ffa2d
diff --git a/metadata/md5-cache/dev-python/chardet-2.0.1-r1 b/metadata/md5-cache/dev-python/chardet-2.0.1-r1
index 05ad060b25fb..410623d33a6d 100644
--- a/metadata/md5-cache/dev-python/chardet-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/chardet-2.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://chardet.feedparser.org/download/python2-chardet-2.0.1.tgz http://chardet.feedparser.org/download/python3-chardet-2.0.1.tgz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=76fcdfa7e69ab3eddbe56a1b30229b80
+_md5_=31aad6306960e8460be13b36fb2dd875
diff --git a/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1 b/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1
index b298b25f326a..7f50fb39fca9 100644
--- a/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/cherrypy-3.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://download.cherrypy.org/cherrypy/3.2.2/CherryPy-3.2.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ac4e1c77e2f5c71f076887f396518dc
+_md5_=c7d44b0f5a97b924fe3b84b4e9d2c5e8
diff --git a/metadata/md5-cache/dev-python/colorama-0.2.4-r1 b/metadata/md5-cache/dev-python/colorama-0.2.4-r1
index 465c3eed8fe5..368acb52aee6 100644
--- a/metadata/md5-cache/dev-python/colorama-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/colorama-0.2.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.2.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e5a0551b57c0d3f3554dda44204a433b
+_md5_=92b9dc134b1f14aa457a2bd47bf2e8af
diff --git a/metadata/md5-cache/dev-python/colout-0.1 b/metadata/md5-cache/dev-python/colout-0.1
index 54ab6dd5fc77..44d918ae2dc6 100644
--- a/metadata/md5-cache/dev-python/colout-0.1
+++ b/metadata/md5-cache/dev-python/colout-0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/colout/colout-0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3e60f4600d9e14a16d426973be1afbe8
+_md5_=f1740668894d28664f2b76ed34e3c18a
diff --git a/metadata/md5-cache/dev-python/configobj-4.7.2-r1 b/metadata/md5-cache/dev-python/configobj-4.7.2-r1
index 032cb49ba586..d1c64df7711a 100644
--- a/metadata/md5-cache/dev-python/configobj-4.7.2-r1
+++ b/metadata/md5-cache/dev-python/configobj-4.7.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/configobj/configobj-4.7.2.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d637be726a7a31e692cc3219f0ec2542
+_md5_=affaefe93700957c78e2aec11e1eda66
diff --git a/metadata/md5-cache/dev-python/configobj-4.7.2-r2 b/metadata/md5-cache/dev-python/configobj-4.7.2-r2
index 687d8f0ba55d..409350fa8aae 100644
--- a/metadata/md5-cache/dev-python/configobj-4.7.2-r2
+++ b/metadata/md5-cache/dev-python/configobj-4.7.2-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/configobj/configobj-4.7.2.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a837a17a1cc64dd1904ef1fa8328646b
+_md5_=f722829714d1e9c8f2fcb5831824f91e
diff --git a/metadata/md5-cache/dev-python/configshell-9999 b/metadata/md5-cache/dev-python/configshell-9999
index 80772cee39cc..b35f942ecb6c 100644
--- a/metadata/md5-cache/dev-python/configshell-9999
+++ b/metadata/md5-cache/dev-python/configshell-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://linux-iscsi.org/
 LICENSE=AGPL-3
 RDEPEND=dev-python/epydoc dev-python/simpleparse =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=89a28565c65cfdb6d4daa438b94bd26f
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.4.0 b/metadata/md5-cache/dev-python/contextlib2-0.4.0
index 15030d897668..e0bb3b961e76 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.4.0
+++ b/metadata/md5-cache/dev-python/contextlib2-0.4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.4.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f6ab9295eee1c4f43bad23cdd8bd1ced
+_md5_=05af58e5b61ad6acee9c2fc2bab7b7df
diff --git a/metadata/md5-cache/dev-python/couchdb-python-0.8-r1 b/metadata/md5-cache/dev-python/couchdb-python-0.8-r1
index 4044304d214c..c0fd7e3a1c8e 100644
--- a/metadata/md5-cache/dev-python/couchdb-python-0.8-r1
+++ b/metadata/md5-cache/dev-python/couchdb-python-0.8-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CouchDB/CouchDB-0.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8890b1b76e46f546c1a10ae0f925f15d
+_md5_=df3024f8cb8e2f6dc710dbd5b55bf4cc
diff --git a/metadata/md5-cache/dev-python/coverage-3.5.3-r1 b/metadata/md5-cache/dev-python/coverage-3.5.3-r1
index c77b6f1b475d..689391bdb3e7 100644
--- a/metadata/md5-cache/dev-python/coverage-3.5.3-r1
+++ b/metadata/md5-cache/dev-python/coverage-3.5.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-3.5.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c12f827f8f23e80a34d88cbb8f0dcf92
+_md5_=a211c810476a8cf2c842eee49436d591
diff --git a/metadata/md5-cache/dev-python/coverage-3.6 b/metadata/md5-cache/dev-python/coverage-3.6
index b18a3d5dacf3..cf8d8f33bcbc 100644
--- a/metadata/md5-cache/dev-python/coverage-3.6
+++ b/metadata/md5-cache/dev-python/coverage-3.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-3.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3be3f049b53f020496c0b3022fab248a
+_md5_=5db9a08e56d6176ba433f35341b28df4
diff --git a/metadata/md5-cache/dev-python/cssselect-0.7.1-r1 b/metadata/md5-cache/dev-python/cssselect-0.7.1-r1
index 4e5a03637687..566e0d2d62e1 100644
--- a/metadata/md5-cache/dev-python/cssselect-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/cssselect-0.7.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect/cssselect-0.7.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bbe240d8b1d68911b02750de5ea0e4f5
+_md5_=c2e892a4cb64954341454f2b8c6ffc76
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 c9fb56b815c8..604f7bfdffaf 100644
--- a/metadata/md5-cache/dev-python/cssutils-0.9.10-r1
+++ b/metadata/md5-cache/dev-python/cssutils-0.9.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://bitbucket.org/cthedot/cssutils/get/6fbc1877f6089610b733a92d21c2bbf25dc1ca28.tar.gz -> cssutils-0.9.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=f2080b928b74bdd9f00768abbc38ac0b
+_md5_=4b63a7c547fc12b8dd6e9c80401252df
diff --git a/metadata/md5-cache/dev-python/cssutils-0.9.10_beta1-r1 b/metadata/md5-cache/dev-python/cssutils-0.9.10_beta1-r1
index 2eae6482bfd6..1cb67216ca4e 100644
--- a/metadata/md5-cache/dev-python/cssutils-0.9.10_beta1-r1
+++ b/metadata/md5-cache/dev-python/cssutils-0.9.10_beta1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-0.9.10b1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a6016e1541196b874c2822a7e3e6c876
+_md5_=b54277057a4253c041e111bae054f90a
diff --git a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1 b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
index 61b22efe030a..9bb402db6236 100644
--- a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
+++ b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/ctypesgen-0_p72.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cd350df5d869f893dc8afe66195c2f03
+_md5_=7f5361d231b95f0922a2109698448215
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-4.3.1-r1 b/metadata/md5-cache/dev-python/cx_Freeze-4.3.1-r1
index 4ddee40f6db6..b8662f081f7b 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-4.3.1-r1
+++ b/metadata/md5-cache/dev-python/cx_Freeze-4.3.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/cx-freeze/cx_Freeze-4.3.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a62cd574e269fd6bfa44037591aca5ef
+_md5_=bf953db8f8d8bcf1617ef149620fef6e
diff --git a/metadata/md5-cache/dev-python/cython-0.18-r1 b/metadata/md5-cache/dev-python/cython-0.18-r1
index c385febd75e9..754a429fe393 100644
--- a/metadata/md5-cache/dev-python/cython-0.18-r1
+++ b/metadata/md5-cache/dev-python/cython-0.18-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.cython.org/release/Cython-0.18.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e1cf9c9091777466b9d7b245eb9a7b70
+_md5_=30ec567ba3dced23e10c35a12a4c401a
diff --git a/metadata/md5-cache/dev-python/cython-0.19.1 b/metadata/md5-cache/dev-python/cython-0.19.1
index 74dfea0e30d0..d14c8da2d115 100644
--- a/metadata/md5-cache/dev-python/cython-0.19.1
+++ b/metadata/md5-cache/dev-python/cython-0.19.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.cython.org/release/Cython-0.19.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c4c9ae20359fe113fb1699eb31e5376b
+_md5_=fb3efed591d6c9241d8c3ef80e5289b0
diff --git a/metadata/md5-cache/dev-python/d2to1-0.2.10 b/metadata/md5-cache/dev-python/d2to1-0.2.10
index fb09d0509e5d..06643dfd3fc1 100644
--- a/metadata/md5-cache/dev-python/d2to1-0.2.10
+++ b/metadata/md5-cache/dev-python/d2to1-0.2.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/d2to1/d2to1-0.2.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=05bdbb5a1f1eaf0f2a5cd7096fa39ce9
+_md5_=ad36723fca873a82ce5b2dde3a47ed9f
diff --git a/metadata/md5-cache/dev-python/d2to1-0.2.11 b/metadata/md5-cache/dev-python/d2to1-0.2.11
index 0461f470163d..94ee3e4d2f95 100644
--- a/metadata/md5-cache/dev-python/d2to1-0.2.11
+++ b/metadata/md5-cache/dev-python/d2to1-0.2.11
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/d2to1/d2to1-0.2.11.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cda1f2cbc8ff2e1d670a47f9ccef3d6b
+_md5_=5f68a7d133336e0e8eb16f114a4d9a15
diff --git a/metadata/md5-cache/dev-python/decorator-3.4.0-r1 b/metadata/md5-cache/dev-python/decorator-3.4.0-r1
index 191e3cc1e202..921f894fe4e7 100644
--- a/metadata/md5-cache/dev-python/decorator-3.4.0-r1
+++ b/metadata/md5-cache/dev-python/decorator-3.4.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-3.4.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=16524430422c0ca17874602b7fc8b845
+_md5_=5e8db1052d2fc32ca05a0110d8a99d09
diff --git a/metadata/md5-cache/dev-python/decoratortools-1.8-r1 b/metadata/md5-cache/dev-python/decoratortools-1.8-r1
index 14d236283764..521ebdfcbbf5 100644
--- a/metadata/md5-cache/dev-python/decoratortools-1.8-r1
+++ b/metadata/md5-cache/dev-python/decoratortools-1.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/D/DecoratorTools/DecoratorTools-1.8.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c8e94091f32e1afb2ad95cd86b59bef3
+_md5_=89c739cfd7772ab2bbc1ff911d759f72
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.4.1 b/metadata/md5-cache/dev-python/defusedxml-0.4.1
index cdd81c9e6bd2..468c4f76ab96 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.4.1
+++ b/metadata/md5-cache/dev-python/defusedxml-0.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/defusedxml/defusedxml-0.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=09d0862ecaac2d6518cea16ed8579762
+_md5_=114fe7d99e89ad736236de9bb6606406
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 4796b528c08e..3085cdc11738 100644
--- a/metadata/md5-cache/dev-python/dingus-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/dingus-0.3.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/dingus/dingus-0.3.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=289a7678dc120fdc0a01ed424b4dcec4
+_md5_=c834781097ca457f7306e97f4066250a
diff --git a/metadata/md5-cache/dev-python/discogs-client-1.1.1 b/metadata/md5-cache/dev-python/discogs-client-1.1.1
index 9575de5cfa9c..e6d3b1466a19 100644
--- a/metadata/md5-cache/dev-python/discogs-client-1.1.1
+++ b/metadata/md5-cache/dev-python/discogs-client-1.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/discogs/discogs_client/archive/v1.1.1.tar.gz -> discogs-client-1.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=171727075332d3818760f91e0850596a
+_md5_=0c6bb8538c29f3d86ea6477814cf615c
diff --git a/metadata/md5-cache/dev-python/django-1.2.7 b/metadata/md5-cache/dev-python/django-1.2.7
index 75242cd3703e..3065c32d2281 100644
--- a/metadata/md5-cache/dev-python/django-1.2.7
+++ b/metadata/md5-cache/dev-python/django-1.2.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.2/Django-1.2.7.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=d303f107a9eb0d46a3b52c82a9b7bf76
+_md5_=2076f6e6b5bbef6522ce3760a2dabbee
diff --git a/metadata/md5-cache/dev-python/django-1.3.7 b/metadata/md5-cache/dev-python/django-1.3.7
index 1d4faa55e270..a49a6fedf836 100644
--- a/metadata/md5-cache/dev-python/django-1.3.7
+++ b/metadata/md5-cache/dev-python/django-1.3.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.3/Django-1.3.7.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=2f67778bf42167b85b93c26b4d86c2e9
+_md5_=e114c96da93dcffe26577c4a3416d5e6
diff --git a/metadata/md5-cache/dev-python/django-1.4.2-r2 b/metadata/md5-cache/dev-python/django-1.4.2-r2
index 15664586c1cd..f886842d8205 100644
--- a/metadata/md5-cache/dev-python/django-1.4.2-r2
+++ b/metadata/md5-cache/dev-python/django-1.4.2-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.4/Django-1.4.2.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=898e3ff98be25c842b703ab5d838fbfa
+_md5_=277683a3627e9dfa913b7d0b46ed7f79
diff --git a/metadata/md5-cache/dev-python/django-1.4.5 b/metadata/md5-cache/dev-python/django-1.4.5
index 268fcc8042ea..bd540026ccbd 100644
--- a/metadata/md5-cache/dev-python/django-1.4.5
+++ b/metadata/md5-cache/dev-python/django-1.4.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.4/Django-1.4.5.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=edfcbcfab4f5311e805cc230d6f03cef
+_md5_=ffa4cdf52d5685a7bd8ce2b96a44575c
diff --git a/metadata/md5-cache/dev-python/django-9999 b/metadata/md5-cache/dev-python/django-9999
index e4d48d4a62b2..6756349f52f0 100644
--- a/metadata/md5-cache/dev-python/django-9999
+++ b/metadata/md5-cache/dev-python/django-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/python-imaging[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] postgres? ( dev-python/psycopg:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) mysql? ( >=dev-python/mysql-python-1.2.3[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6[sqlite?] ) python_targets_python2_7? ( dev-lang/python:2.7[sqlite?] ) python_targets_python3_2? ( dev-lang/python:3.2[sqlite?] ) python_targets_python3_3? ( dev-lang/python:3.3[sqlite?] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=8dcc827ac32c8baee0b81477f18d5b6a
diff --git a/metadata/md5-cache/dev-python/django-annoying-0.7.6-r1 b/metadata/md5-cache/dev-python/django-annoying-0.7.6-r1
index 506a3dbb67f4..b5e5b90380e7 100644
--- a/metadata/md5-cache/dev-python/django-annoying-0.7.6-r1
+++ b/metadata/md5-cache/dev-python/django-annoying-0.7.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-annoying/django-annoying-0.7.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b3730b69033e8606925f38d8c2b755d8
+_md5_=ce1547dce509ef22a8405a127af66aa9
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 137fd32ce5df..258fe5ac6045 100644
--- a/metadata/md5-cache/dev-python/django-annoying-0.7.7
+++ b/metadata/md5-cache/dev-python/django-annoying-0.7.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-annoying/django-annoying-0.7.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4f9b6832fa3a5eaa72b1658241121695
+_md5_=2bb01b420a2f791b2a7881035722c5da
diff --git a/metadata/md5-cache/dev-python/django-international-0.0.3 b/metadata/md5-cache/dev-python/django-international-0.0.3
index bf8b97c6f3b5..d877507ab732 100644
--- a/metadata/md5-cache/dev-python/django-international-0.0.3
+++ b/metadata/md5-cache/dev-python/django-international-0.0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-international/django-international-0.0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0dfe07521eb3bf4979fc286ae5f72b98
+_md5_=6a5784b580adb2da198ca5e8c3c56023
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 ca0ebcc8e80b..4076249c38ed 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-piston/django-piston-0.2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4fd421fe2452e6944ac265dd9668baf5
+_md5_=f35e50bb1c00235db0dfb320aad11613
diff --git a/metadata/md5-cache/dev-python/django-setuptest-0.1.2-r1 b/metadata/md5-cache/dev-python/django-setuptest-0.1.2-r1
index fbf7651fa595..65e33dddc4a1 100644
--- a/metadata/md5-cache/dev-python/django-setuptest-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/django-setuptest-0.1.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/praekelt/django-setuptest/zipball/master/praekelt-django-setuptest-0.1.2-O-g86Offe9.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d24d55f9c2a16f364d3e4cff4adaae16
+_md5_=a016eee5d6b1b5f0a6e433a778b54553
diff --git a/metadata/md5-cache/dev-python/django-setuptest-0.1.4 b/metadata/md5-cache/dev-python/django-setuptest-0.1.4
index 45307bf323dd..17926a79a1ea 100644
--- a/metadata/md5-cache/dev-python/django-setuptest-0.1.4
+++ b/metadata/md5-cache/dev-python/django-setuptest-0.1.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/praekelt/django-setuptest/archive/0.1.4.tar.gz -> django-setuptest-0.1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4053185d87b31bef99c1c63f7880d4b6
+_md5_=8fa05dd9cbcc58463c2dda4fa8fc18fd
diff --git a/metadata/md5-cache/dev-python/dnspython-1.10.0-r1 b/metadata/md5-cache/dev-python/dnspython-1.10.0-r1
index 22637b89389f..d10620f0fb00 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.10.0-r1
+++ b/metadata/md5-cache/dev-python/dnspython-1.10.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=069e88b414057e2aed4eb858e3958be0
+_md5_=5b8180f0be88f3238bd735ebc3f9889a
diff --git a/metadata/md5-cache/dev-python/docutils-0.10 b/metadata/md5-cache/dev-python/docutils-0.10
index 8943dd85d5b1..f8f1fa246d20 100644
--- a/metadata/md5-cache/dev-python/docutils-0.10
+++ b/metadata/md5-cache/dev-python/docutils-0.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b2f0ff59e8812b809de659e46665fc5a
+_md5_=cc5564a025164f76aea1bb51dc5085d1
diff --git a/metadata/md5-cache/dev-python/docutils-0.9.1-r1 b/metadata/md5-cache/dev-python/docutils-0.9.1-r1
index ca14419f254d..9fad826e7916 100644
--- a/metadata/md5-cache/dev-python/docutils-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/docutils-0.9.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.9.1.tar.gz glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=98cd1ccded14ea2d6a4662484c8fa025
+_md5_=27f2337d7d53c5844a04f7fbfac47455
diff --git a/metadata/md5-cache/dev-python/docutils-glep-0.4-r1 b/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
index ab5789d8f657..5f719898286a 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
+++ b/metadata/md5-cache/dev-python/docutils-glep-0.4-r1
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/docutils-0.10[python_targets_python2_6(-)?,python_targets_p
 SLOT=0
 SRC_URI=mirror://gentoo/glep-0.4-r1.tbz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c7d1040837e313b75d7df6e4ea142475
+_md5_=cebca0ed4d8fb28bf67d37583ecc901d
diff --git a/metadata/md5-cache/dev-python/editobj-0.5.7-r2 b/metadata/md5-cache/dev-python/editobj-0.5.7-r2
index 931d3cdd10fa..0e9403b66121 100644
--- a/metadata/md5-cache/dev-python/editobj-0.5.7-r2
+++ b/metadata/md5-cache/dev-python/editobj-0.5.7-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/songwrite/EditObj-0.5.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cc8b10d06aa59d504ad6e69e44afa11f
+_md5_=b9312578d513ac564d9eb1a9836a2c59
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
index 521cc8a6e982..fdce8b215e40 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://downloads.egenix.com/python/egenix-mx-base-3.2.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3fbdc7e16746f9e0bd3eaa95bbeeb6f2
+_md5_=e196d1949c13391a39bd82db6e42189a
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6
index 925e75b5b38f..9710dfc0ce83 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://downloads.egenix.com/python/egenix-mx-base-3.2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4ec9183b6ccc23318c67bd65ba1355c3
+_md5_=414ec8a19510f8f72122a03a681b1fe4
diff --git a/metadata/md5-cache/dev-python/elementtree-1.2.6-r3 b/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
index 33c12d55df08..6dcf1140f250 100644
--- a/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
+++ b/metadata/md5-cache/dev-python/elementtree-1.2.6-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e3e223b82891a5c90455321bea08d4b6
+_md5_=de8446f59affb243c1399a9363c7b6f0
diff --git a/metadata/md5-cache/dev-python/empy-3.3-r1 b/metadata/md5-cache/dev-python/empy-3.3-r1
index ca7af453bf68..4f818f6ba444 100644
--- a/metadata/md5-cache/dev-python/empy-3.3-r1
+++ b/metadata/md5-cache/dev-python/empy-3.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=37056f120f70351720d9d915bc1536fb
+_md5_=b6cfe99167826e3cfbd2341e50a5ca4a
diff --git a/metadata/md5-cache/dev-python/envoy-0.0.2-r1 b/metadata/md5-cache/dev-python/envoy-0.0.2-r1
index bcc8e2d1135d..6bc908238909 100644
--- a/metadata/md5-cache/dev-python/envoy-0.0.2-r1
+++ b/metadata/md5-cache/dev-python/envoy-0.0.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/e/envoy/envoy-0.0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=22d5f09f9509a7ecdbf63bbf4f336091
+_md5_=15167a26c1d1dcf737f73de807e1cd50
diff --git a/metadata/md5-cache/dev-python/enzyme-9999 b/metadata/md5-cache/dev-python/enzyme-9999
index 23af80517242..8b5ec5049dee 100644
--- a/metadata/md5-cache/dev-python/enzyme-9999
+++ b/metadata/md5-cache/dev-python/enzyme-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=48f10b5452aafd9f3188e06b845d8ba8
diff --git a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2 b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
index f535726d4355..bb516b5ccb27 100644
--- a/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
+++ b/metadata/md5-cache/dev-python/epydoc-3.0.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/epydoc/epydoc-3.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0744df75881ccdd1a2e8c2834cd99687
+_md5_=56ca94756c77efb75717f352960ed2a7
diff --git a/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1 b/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1
index dc106858770b..e470de33da31 100644
--- a/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1
+++ b/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://debian/pool/main/e/eunuchs/eunuchs_20050320.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=56fdaff3f79bc5e2df8ed154d12bff9e
+_md5_=a5695c719ddf4a2f9d3ad8dbaea085c9
diff --git a/metadata/md5-cache/dev-python/eventlet-0.13.0 b/metadata/md5-cache/dev-python/eventlet-0.13.0
new file mode 100644
index 000000000000..e8b34ac57008
--- /dev/null
+++ b/metadata/md5-cache/dev-python/eventlet-0.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( >=dev-python/greenlet-0.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=Highly concurrent networking library
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/eventlet
+IUSE=doc examples test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/greenlet-0.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/e/eventlet/eventlet-0.13.0.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7afa12950529146540d47fd99b9dc78f
diff --git a/metadata/md5-cache/dev-python/execnet-1.1-r1 b/metadata/md5-cache/dev-python/execnet-1.1-r1
index 0be725cd9044..cc09ed2ff40e 100644
--- a/metadata/md5-cache/dev-python/execnet-1.1-r1
+++ b/metadata/md5-cache/dev-python/execnet-1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e1206ec571e5ebe6a63c11b59bde9656
+_md5_=15196b0d30634e3950af973bdfc731cd
diff --git a/metadata/md5-cache/dev-python/extras-0.0.3 b/metadata/md5-cache/dev-python/extras-0.0.3
index d2c832ae9484..4784529237d6 100644
--- a/metadata/md5-cache/dev-python/extras-0.0.3
+++ b/metadata/md5-cache/dev-python/extras-0.0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-0.0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b45e763e07ba791ddf2e6764882147f
+_md5_=d0301caec661d0d3de46c330d5fdae89
diff --git a/metadata/md5-cache/dev-python/extremes-1.1.1 b/metadata/md5-cache/dev-python/extremes-1.1.1
index 19b63fb424a3..ff03b29961cb 100644
--- a/metadata/md5-cache/dev-python/extremes-1.1.1
+++ b/metadata/md5-cache/dev-python/extremes-1.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/E/Extremes/Extremes-1.1.1.zip -> extremes-1.1.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42030ce77630df1227bf361026ea068b
+_md5_=6edd60f65ecb4392724d490dc31d15f7
diff --git a/metadata/md5-cache/dev-python/fabric-1.6.1-r1 b/metadata/md5-cache/dev-python/fabric-1.6.1-r1
index ccb536cfbc3d..dbc977643e1d 100644
--- a/metadata/md5-cache/dev-python/fabric-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/fabric-1.6.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-python/multiprocessing[python_targets_python2_5] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( <dev-python/fudge-1.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( <dev-python/fudge-1.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=A simple pythonic tool for remote execution and deployment.
 EAPI=5
 HOMEPAGE=http://fabfile.org http://pypi.python.org/pypi/Fabric
 IUSE=doc test python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-python/multiprocessing[python_targets_python2_5] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fabric/Fabric-1.6.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eadb4f8889323c2517d2eefb864cc150
+_md5_=57a8337c9a57c0b8b70c8be024583fce
diff --git a/metadata/md5-cache/dev-python/fabric-1.7.0 b/metadata/md5-cache/dev-python/fabric-1.7.0
index 74628d92b2fc..2447af1caf52 100644
--- a/metadata/md5-cache/dev-python/fabric-1.7.0
+++ b/metadata/md5-cache/dev-python/fabric-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-python/multiprocessing[python_targets_python2_5] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( <dev-python/fudge-1.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) test? ( <dev-python/fudge-1.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=A simple pythonic tool for remote execution and deployment.
 EAPI=5
 HOMEPAGE=http://fabfile.org http://pypi.python.org/pypi/Fabric
 IUSE=doc test python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-python/multiprocessing[python_targets_python2_5] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/paramiko-1.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fabric/Fabric-1.7.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e8882809cd9b1a6b1367d4dfd369070
+_md5_=e8dd3c6056615d8c3d248758a1150fa9
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.5 b/metadata/md5-cache/dev-python/feedgenerator-1.5
index 60c5dd800a8c..4fc04659e7da 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.5
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7f99e30e44363b864c3894670df8df89
+_md5_=527099ccb874f1f8975a9112428b07b6
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.6 b/metadata/md5-cache/dev-python/feedgenerator-1.6
index faf39ab0313c..5d408dd6845c 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.6
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ee82a2e69802aa1e4d1a990eac694f84
+_md5_=2c2b2cf5313e3496f87b98be13eff377
diff --git a/metadata/md5-cache/dev-python/feedparser-5.1.3-r1 b/metadata/md5-cache/dev-python/feedparser-5.1.3-r1
index 794533949afe..8ecb0fd5f5ef 100644
--- a/metadata/md5-cache/dev-python/feedparser-5.1.3-r1
+++ b/metadata/md5-cache/dev-python/feedparser-5.1.3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://feedparser.googlecode.com/files/feedparser-5.1.3.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3993f93705a772ce0357d3b4d9f8fb8d
+_md5_=78a7073d1608eea9de8e0ba38a7c6b67
diff --git a/metadata/md5-cache/dev-python/fixtures-0.3.12-r1 b/metadata/md5-cache/dev-python/fixtures-0.3.12-r1
index 974f6e25e452..4b54cdbb238a 100644
--- a/metadata/md5-cache/dev-python/fixtures-0.3.12-r1
+++ b/metadata/md5-cache/dev-python/fixtures-0.3.12-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-0.3.12.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bda81cfde3fc12ccfb60e4e67842be85
+_md5_=180b55761486d4f22075480a7bb7ccc9
diff --git a/metadata/md5-cache/dev-python/flake8-2.0 b/metadata/md5-cache/dev-python/flake8-2.0
index 7003630ab335..b560f880b39b 100644
--- a/metadata/md5-cache/dev-python/flake8-2.0
+++ b/metadata/md5-cache/dev-python/flake8-2.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1f261a2a0833b87b0736b53ada522927
+_md5_=7ddabee595800dfdfcb52308dcb4951f
diff --git a/metadata/md5-cache/dev-python/flask-9999 b/metadata/md5-cache/dev-python/flask-9999
index 460db4bbd6d4..84cd42614373 100644
--- a/metadata/md5-cache/dev-python/flask-9999
+++ b/metadata/md5-cache/dev-python/flask-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=667562f226e865af963c1460db795ca1
diff --git a/metadata/md5-cache/dev-python/flup-1.0.2-r1 b/metadata/md5-cache/dev-python/flup-1.0.2-r1
index f7c9ce00ece2..db88fd94f3f4 100644
--- a/metadata/md5-cache/dev-python/flup-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/flup-1.0.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.saddi.com/software/flup/dist/flup-1.0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c92b8599daf5f187a7411a57a2e25cb
+_md5_=7dbcc95495a854b7b8f6d78a9d50cc5b
diff --git a/metadata/md5-cache/dev-python/formencode-1.2.6-r1 b/metadata/md5-cache/dev-python/formencode-1.2.6-r1
index 900e2a6c33d1..93678013cf29 100644
--- a/metadata/md5-cache/dev-python/formencode-1.2.6-r1
+++ b/metadata/md5-cache/dev-python/formencode-1.2.6-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/FormEncode/FormEncode-1.2.6.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ea81eecde30917feeec48cc76d86b7f3
+_md5_=ebd5ed904f08ef281cbd1dfa761bdb81
diff --git a/metadata/md5-cache/dev-python/fpconst-0.7.3-r1 b/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
index 551bcfc63641..47598dc926ac 100644
--- a/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/fpconst-0.7.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/rsoap/fpconst-0.7.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a1d5a4623bdff744c6a4c006b6fc45a4
+_md5_=ba135d9a3601ee0061581c32341bdcc8
diff --git a/metadata/md5-cache/dev-python/fudge-0.9.6-r1 b/metadata/md5-cache/dev-python/fudge-0.9.6-r1
index fc55f0a3f3ef..b4b59101cbb2 100644
--- a/metadata/md5-cache/dev-python/fudge-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/fudge-0.9.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-0.9.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=98f7c3135b894bf782ddf52606a817fa
+_md5_=6941801d2396166b6f7f3d07b3f2f26c
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 029aec7b9101..a3e30c98ce1c 100644
--- a/metadata/md5-cache/dev-python/fudge-1.0.3-r2
+++ b/metadata/md5-cache/dev-python/fudge-1.0.3-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-1.0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=03473afd682a12b6c92fa983a01793d7
+_md5_=32e90e7d23ab1762da7acc9c317a84e8
diff --git a/metadata/md5-cache/dev-python/futures-2.1.4 b/metadata/md5-cache/dev-python/futures-2.1.4
index 551d214613a7..72597c7f2f9b 100644
--- a/metadata/md5-cache/dev-python/futures-2.1.4
+++ b/metadata/md5-cache/dev-python/futures-2.1.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~idella4/tarballs/futures-2.1.4-20130706.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=685ec92213287affab10d677ee3cc3c3
+_md5_=ca40af6b46329093a0d7b01b40c7da30
diff --git a/metadata/md5-cache/dev-python/gdata-2.0.17-r1 b/metadata/md5-cache/dev-python/gdata-2.0.17-r1
index a1b09b262da8..b3ba0682899a 100644
--- a/metadata/md5-cache/dev-python/gdata-2.0.17-r1
+++ b/metadata/md5-cache/dev-python/gdata-2.0.17-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://gdata-python-client.googlecode.com/files/gdata-2.0.17.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=16a52acb04d8ad1822b1e6191ba57ee6
+_md5_=f9a33f3f83e523219715cb7c7a47de3e
diff --git a/metadata/md5-cache/dev-python/gdata-2.0.18 b/metadata/md5-cache/dev-python/gdata-2.0.18
index ed51c0382bbd..e1e788f7a39d 100644
--- a/metadata/md5-cache/dev-python/gdata-2.0.18
+++ b/metadata/md5-cache/dev-python/gdata-2.0.18
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://gdata-python-client.googlecode.com/files/gdata-2.0.18.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ad73bcfd0fc9b689944b9c60e8043223
+_md5_=647b7f4e7709ca326605ae9fef1b620b
diff --git a/metadata/md5-cache/dev-python/genshi-0.7 b/metadata/md5-cache/dev-python/genshi-0.7
index 41b4d8c9b0e4..4f08d20bc78a 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7
+++ b/metadata/md5-cache/dev-python/genshi-0.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=242546cbe584b5f3cd00663a5383ded5
+_md5_=8c78b5dcbfaee0b9b643621b3cad2268
diff --git a/metadata/md5-cache/dev-python/geoip-python-1.2.8-r1 b/metadata/md5-cache/dev-python/geoip-python-1.2.8-r1
index 89209c2c824b..12e94970a896 100644
--- a/metadata/md5-cache/dev-python/geoip-python-1.2.8-r1
+++ b/metadata/md5-cache/dev-python/geoip-python-1.2.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-1.2.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b16fdccdc316412c9b5df1c941d3aa90
+_md5_=e75baeaaacb7235ada8977b06e1ee916
diff --git a/metadata/md5-cache/dev-python/gntp-1.0.1 b/metadata/md5-cache/dev-python/gntp-1.0.1
index 43905a194e16..3a8eb642d22e 100644
--- a/metadata/md5-cache/dev-python/gntp-1.0.1
+++ b/metadata/md5-cache/dev-python/gntp-1.0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/g/gntp/gntp-1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5f6ab8e9b09fb622671ed27e581d501b
+_md5_=9faadfcd70780a5355dbbbe12365d364
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.1 b/metadata/md5-cache/dev-python/google-api-python-client-1.1
index 43134b018d5d..b486d13ef068 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.1
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://google-api-python-client.googlecode.com/files/google-api-python-client-1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3ed9fea839774f72599d1f80610fb147
+_md5_=943da36dd2be4617746a4d29035f2e18
diff --git a/metadata/md5-cache/dev-python/graph-tool-9999 b/metadata/md5-cache/dev-python/graph-tool-9999
index 6fea4c26a775..224b58cccd1b 100644
--- a/metadata/md5-cache/dev-python/graph-tool-9999
+++ b/metadata/md5-cache/dev-python/graph-tool-9999
@@ -7,5 +7,5 @@ IUSE=+cairo openmp python_targets_python2_7
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.46.0[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-mathematics/cgal cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
-_eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73516e7d7661975f4b2a3e2a08755178
diff --git a/metadata/md5-cache/dev-python/graphy-1.0-r1 b/metadata/md5-cache/dev-python/graphy-1.0-r1
index 9680a0142578..b4f61d03bb6b 100644
--- a/metadata/md5-cache/dev-python/graphy-1.0-r1
+++ b/metadata/md5-cache/dev-python/graphy-1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://graphy.googlecode.com/files/graphy_1.0.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a361935c3f430dcf7367893933e0d402
+_md5_=cd41edc4575bc5cb158d0e86710ce420
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.0-r1 b/metadata/md5-cache/dev-python/greenlet-0.4.0-r1
index c3ee3092764a..2d2a61795910 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.0.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=228e50151c0fbb77f9f28a5df75413ca
+_md5_=b1d96fe0de1b56e33f4c233cd15980c7
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.0-r2 b/metadata/md5-cache/dev-python/greenlet-0.4.0-r2
index 89e8418abc81..2ec2f361bddb 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.0-r2
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.0.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4eb2ab56f2dbad01a40807967301d3d4
+_md5_=7acfcb6463d2a0db4287388871ba6f53
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.1 b/metadata/md5-cache/dev-python/greenlet-0.4.1
index c2cc29618919..b421832d9e53 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.1
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df42e56b035cd47e4a045d5114d11b66
+_md5_=e804a09eda1d728be00550a1daeecb3c
diff --git a/metadata/md5-cache/dev-python/guessit-9999 b/metadata/md5-cache/dev-python/guessit-9999
index 35ea9fd0fcfd..d6b5d227ddbd 100644
--- a/metadata/md5-cache/dev-python/guessit-9999
+++ b/metadata/md5-cache/dev-python/guessit-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac7cda9fe7851948957fca91470d8601
diff --git a/metadata/md5-cache/dev-python/happydoc-3.1-r2 b/metadata/md5-cache/dev-python/happydoc-3.1-r2
index 2d1c9d78c71b..b2496adc18c4 100644
--- a/metadata/md5-cache/dev-python/happydoc-3.1-r2
+++ b/metadata/md5-cache/dev-python/happydoc-3.1-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/happydoc/HappyDoc_r3_1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=91a9274358a9086ad982b0b731486756
+_md5_=0ef47be0958abcc6a836f3020561b50e
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.16-r1 b/metadata/md5-cache/dev-python/hgdistver-0.16-r1
index 9699819e919c..3e4a5f10c0e1 100644
--- a/metadata/md5-cache/dev-python/hgdistver-0.16-r1
+++ b/metadata/md5-cache/dev-python/hgdistver-0.16-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.16.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b4e66bc4074cc39260995bc761970198
+_md5_=3e6e0d1f5ddcab0eee12791b36a7521e
diff --git a/metadata/md5-cache/dev-python/hglib-1.0 b/metadata/md5-cache/dev-python/hglib-1.0
index 137a90ffc5dc..a23a2f8a2886 100644
--- a/metadata/md5-cache/dev-python/hglib-1.0
+++ b/metadata/md5-cache/dev-python/hglib-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-hglib/python-hglib-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=03049ec9f29fdb6fbd270e26027c712d
+_md5_=0b734ef022935fb21b278652ba1506bf
diff --git a/metadata/md5-cache/dev-python/hgtools-2.0.2 b/metadata/md5-cache/dev-python/hgtools-2.0.2
index 0b9dd336df24..5e3a0300262f 100644
--- a/metadata/md5-cache/dev-python/hgtools-2.0.2
+++ b/metadata/md5-cache/dev-python/hgtools-2.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/hgtools/hgtools-2.0.2.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2e2f7380e18e66c30b2ae6518ff0f884
+_md5_=8a97f6bb9ee7b603308a5088d52d10db
diff --git a/metadata/md5-cache/dev-python/hgtools-2.0.2-r1 b/metadata/md5-cache/dev-python/hgtools-2.0.2-r1
index b080946fcc87..9252e5c3738d 100644
--- a/metadata/md5-cache/dev-python/hgtools-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/hgtools-2.0.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/hgtools/hgtools-2.0.2.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a204367b5c8c03ada625c30b13713c09
+_md5_=92bf274b53dca133900f6a1b2bff1e44
diff --git a/metadata/md5-cache/dev-python/hgtools-3.0.2 b/metadata/md5-cache/dev-python/hgtools-3.0.2
index 22f3f6f5428e..27bdd638e5ee 100644
--- a/metadata/md5-cache/dev-python/hgtools-3.0.2
+++ b/metadata/md5-cache/dev-python/hgtools-3.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/hgtools/hgtools-3.0.2.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a868c8a15a9274d9e5b623a92107b5f8
+_md5_=52e14586ae29c092dac6adf0f6d7e994
diff --git a/metadata/md5-cache/dev-python/hiredis-0.1.1-r1 b/metadata/md5-cache/dev-python/hiredis-0.1.1-r1
index cac79c4ff58e..31413f91beb5 100644
--- a/metadata/md5-cache/dev-python/hiredis-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/hiredis-0.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-0.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2967c255400042ff8d925c7b3e07d107
+_md5_=c159f8481a501c208a572a0740081a70
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 2ac9d507f820..cd419c9be516 100644
--- a/metadata/md5-cache/dev-python/hiredis-0.1.1-r2
+++ b/metadata/md5-cache/dev-python/hiredis-0.1.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-0.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=db7a45f94ce5be430d7eaccbf5cfa24e
+_md5_=dc0078d61ce1dd02a1738d162e9803fb
diff --git a/metadata/md5-cache/dev-python/html2text-3.200.3-r1 b/metadata/md5-cache/dev-python/html2text-3.200.3-r1
index e7d458dcf815..269fa5b3d956 100644
--- a/metadata/md5-cache/dev-python/html2text-3.200.3-r1
+++ b/metadata/md5-cache/dev-python/html2text-3.200.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/html2text/html2text-3.200.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=71736d8b70d6ac59282d5adcadacd710
+_md5_=5ef1a94a6933ecc6208514be83845ec7
diff --git a/metadata/md5-cache/dev-python/html5lib-0.95-r1 b/metadata/md5-cache/dev-python/html5lib-0.95-r1
index 4d4dd0cd1944..e48f08e015d2 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.95-r1
+++ b/metadata/md5-cache/dev-python/html5lib-0.95-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://html5lib.googlecode.com/files/html5lib-0.95.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d0dc37a079e7771b9d651b0cf945dfaf
+_md5_=33bf65c121729885f3f84dfd1a8c769e
diff --git a/metadata/md5-cache/dev-python/html5lib-1.0_beta1 b/metadata/md5-cache/dev-python/html5lib-1.0_beta1
index 878b10858fb7..dee8a6c07b18 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.0_beta1
+++ b/metadata/md5-cache/dev-python/html5lib-1.0_beta1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-1.0b1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d0343a8bb8316cd20dd81522bf5bac77
+_md5_=65c4bdb25ba4f4b4c0415da8051d980d
diff --git a/metadata/md5-cache/dev-python/html5lib-1.0_beta3 b/metadata/md5-cache/dev-python/html5lib-1.0_beta3
index b8eee1f7bb6e..591d4a1fa964 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.0_beta3
+++ b/metadata/md5-cache/dev-python/html5lib-1.0_beta3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-1.0b3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=efa0f9f10d6bdacafd59b08e63fafa51
+_md5_=02d572cbd082863c953ea336c2d85700
diff --git a/metadata/md5-cache/dev-python/htmlgen-2.2.2-r1 b/metadata/md5-cache/dev-python/htmlgen-2.2.2-r1
index f9b039520bc2..8af33448c05a 100644
--- a/metadata/md5-cache/dev-python/htmlgen-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/htmlgen-2.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://starship.python.net/crew/friedrich/HTMLgen.tgz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1f83f9e3237d540fd6859da50afc8b7f
+_md5_=588c40198ef0b2178b52a7c5acbf46df
diff --git a/metadata/md5-cache/dev-python/http-parser-0.7.12 b/metadata/md5-cache/dev-python/http-parser-0.7.12
index 93ec6dbfd31c..fad929c1bd7a 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.7.12
+++ b/metadata/md5-cache/dev-python/http-parser-0.7.12
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/http-parser/http-parser-0.7.12.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2775eaee6f20eb755b70e13aee5b8ed6
+_md5_=2955e6160a6eaa85332b39e455a9a00a
diff --git a/metadata/md5-cache/dev-python/http-parser-0.8.1-r1 b/metadata/md5-cache/dev-python/http-parser-0.8.1-r1
index 87c26f4c1874..c03f4e52605d 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/http-parser-0.8.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/http-parser/http-parser-0.8.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=683b5483bda15cd99f658c0e00665649
+_md5_=6e494801e05cf09fe4055b2d3da0924e
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 9a3dc60d9106..52ea0412a316 100644
--- a/metadata/md5-cache/dev-python/http-parser-0.8.3
+++ b/metadata/md5-cache/dev-python/http-parser-0.8.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/http-parser/http-parser-0.8.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=55581c7d773755b4877df58b08b804f9
+_md5_=3cee036656fc8e5ef36c17f6d59cad27
diff --git a/metadata/md5-cache/dev-python/httplib2-0.7.7 b/metadata/md5-cache/dev-python/httplib2-0.7.7
index b1f1b6939555..cbd6092651dc 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.7.7
+++ b/metadata/md5-cache/dev-python/httplib2-0.7.7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://httplib2.googlecode.com/files/httplib2-0.7.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5557b6d001cb868776a595458d478667
+_md5_=2d57b9f9d09f93273a3a4b9d6d7efa6a
diff --git a/metadata/md5-cache/dev-python/httplib2-0.8 b/metadata/md5-cache/dev-python/httplib2-0.8
index e687fcd94ee6..0381d2fa3172 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.8
+++ b/metadata/md5-cache/dev-python/httplib2-0.8
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://httplib2.googlecode.com/files/httplib2-0.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0e695a3b0a7c9b481bcd578af4b6cc0e
+_md5_=25171af8d89b21a7333c9d37fea6699c
diff --git a/metadata/md5-cache/dev-python/icalendar-3.3 b/metadata/md5-cache/dev-python/icalendar-3.3
index d899db0cd092..d5ff74f53384 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.3
+++ b/metadata/md5-cache/dev-python/icalendar-3.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fa61bd76c1af998300d8c18a393b94b2
+_md5_=75f53f76df22cb490b8f721f89251241
diff --git a/metadata/md5-cache/dev-python/icalendar-3.4 b/metadata/md5-cache/dev-python/icalendar-3.4
index e97f9623e1e3..4fe97d29b0c4 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.4
+++ b/metadata/md5-cache/dev-python/icalendar-3.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a9324bbfadccaac58b8f7cb61d40ccd0
+_md5_=49329ff721233a3c385c8d5dda2fe644
diff --git a/metadata/md5-cache/dev-python/icalendar-3.5 b/metadata/md5-cache/dev-python/icalendar-3.5
index 4fe24460ca07..d4f0e686fc06 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.5
+++ b/metadata/md5-cache/dev-python/icalendar-3.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4eb8507686204d01fe2fbba7e3d9dc3a
+_md5_=33599082ec49e11d14d54040f8a0111f
diff --git a/metadata/md5-cache/dev-python/ijson-1.0-r1 b/metadata/md5-cache/dev-python/ijson-1.0-r1
index e5419f279811..7c88a35f69d3 100644
--- a/metadata/md5-cache/dev-python/ijson-1.0-r1
+++ b/metadata/md5-cache/dev-python/ijson-1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/ijson/ijson-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=74c56fcf00ec65fa36af5d89a597e348
+_md5_=85a0048743a22e12e1eac1f55be63610
diff --git a/metadata/md5-cache/dev-python/imaging-1.1.7-r2 b/metadata/md5-cache/dev-python/imaging-1.1.7-r2
index 6314d692de2f..3d42be5219bb 100644
--- a/metadata/md5-cache/dev-python/imaging-1.1.7-r2
+++ b/metadata/md5-cache/dev-python/imaging-1.1.7-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.effbot.org/downloads/Imaging-1.1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fa7c1e780f357e2c566a11c72bb42e68
+_md5_=21c8404e1f09afe3654535833f9b407d
diff --git a/metadata/md5-cache/dev-python/imaging-1.1.7-r4 b/metadata/md5-cache/dev-python/imaging-1.1.7-r4
index a1637c89fbd1..a0919da32d77 100644
--- a/metadata/md5-cache/dev-python/imaging-1.1.7-r4
+++ b/metadata/md5-cache/dev-python/imaging-1.1.7-r4
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( jpeg tiff zlib ) || ( python_targets_python2_6 python_targe
 SLOT=0
 SRC_URI=http://www.effbot.org/downloads/Imaging-1.1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=07032c140fa7843fa71a409863573a20
+_md5_=6ed49c3dfb614badfa39af7a6cab1302
diff --git a/metadata/md5-cache/dev-python/imdbpy-4.9-r1 b/metadata/md5-cache/dev-python/imdbpy-4.9-r1
index 51c6d3720eac..07c8ca974978 100644
--- a/metadata/md5-cache/dev-python/imdbpy-4.9-r1
+++ b/metadata/md5-cache/dev-python/imdbpy-4.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/I/IMDbPY/IMDbPY-4.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0c8550ee9bef53bba3f3635dfed35b35
+_md5_=a81f69ecfb03a71c8d013911ddd14fcd
diff --git a/metadata/md5-cache/dev-python/importing-1.10 b/metadata/md5-cache/dev-python/importing-1.10
index 3a6e1366e487..44dd7b776b1e 100644
--- a/metadata/md5-cache/dev-python/importing-1.10
+++ b/metadata/md5-cache/dev-python/importing-1.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/I/Importing/Importing-1.10.zip -> importing-1.10.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=837a8b3140928d9f9607e2ea64c96ff3
+_md5_=236fae914f6c0bb7e958eb2e2fed7fb3
diff --git a/metadata/md5-cache/dev-python/iniparse-0.4-r1 b/metadata/md5-cache/dev-python/iniparse-0.4-r1
index a2c787bcab39..567513cc770e 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.4-r1
+++ b/metadata/md5-cache/dev-python/iniparse-0.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://iniparse.googlecode.com/files/iniparse-0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ef0a6447834bab818ba3d793a7fd751d
+_md5_=05763b7e42177f8ae6fc5e7f1bdc4247
diff --git a/metadata/md5-cache/dev-python/inotifyx-0.2.0-r1 b/metadata/md5-cache/dev-python/inotifyx-0.2.0-r1
index dfac7889052d..a1e2b1a96505 100644
--- a/metadata/md5-cache/dev-python/inotifyx-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/inotifyx-0.2.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://launchpad.net/inotifyx/dev/v0.2.0/+download/inotifyx-0.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4034a4a1ca44346002e6f447b34e1dee
+_md5_=950ed60b458d1968613f9a621b405192
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.1.10-r1 b/metadata/md5-cache/dev-python/ipaddr-2.1.10-r1
index fd6ec1c58e08..d9ccbb60ab9c 100644
--- a/metadata/md5-cache/dev-python/ipaddr-2.1.10-r1
+++ b/metadata/md5-cache/dev-python/ipaddr-2.1.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ddb04ea2f19f8c0402902d28057d2ca7
+_md5_=2e10d0b93186365c5e32d711e4d88766
diff --git a/metadata/md5-cache/dev-python/ipy-0.76-r1 b/metadata/md5-cache/dev-python/ipy-0.76-r1
index 23dd3d1ff960..b442193beaa3 100644
--- a/metadata/md5-cache/dev-python/ipy-0.76-r1
+++ b/metadata/md5-cache/dev-python/ipy-0.76-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-0.76.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=616ee3d38b319ace03bed6acb335325d
+_md5_=6237393e508c165a524584e9ce90474d
diff --git a/metadata/md5-cache/dev-python/ipy-0.81 b/metadata/md5-cache/dev-python/ipy-0.81
index 405f5fcbdb41..8fa1a33f5815 100644
--- a/metadata/md5-cache/dev-python/ipy-0.81
+++ b/metadata/md5-cache/dev-python/ipy-0.81
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-0.81.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=71d454a79cfa7dc68ad15fb4aaece9ef
+_md5_=b5408d4050f3892953a683a59e65d14b
diff --git a/metadata/md5-cache/dev-python/ipython-0.13.2 b/metadata/md5-cache/dev-python/ipython-0.13.2
index 2010e71cdf63..9b2cc0f3eca8 100644
--- a/metadata/md5-cache/dev-python/ipython-0.13.2
+++ b/metadata/md5-cache/dev-python/ipython-0.13.2
@@ -11,4 +11,4 @@ REQUIRED_USE=mongodb? ( || ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://archive.ipython.org/release/0.13.2/ipython-0.13.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a99ec287889a25a1915a2f286c151c6d
+_md5_=db65d917e3443fdf862b0b34cbd7869c
diff --git a/metadata/md5-cache/dev-python/ipython-1.0.0 b/metadata/md5-cache/dev-python/ipython-1.0.0
index 23b480ee345d..0749b0916074 100644
--- a/metadata/md5-cache/dev-python/ipython-1.0.0
+++ b/metadata/md5-cache/dev-python/ipython-1.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=mongodb? ( || ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ipython/ipython/releases/download/rel-1.0.0/ipython-1.0.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=76c574e276df2cbe04943153f459a19f
+_md5_=d3b8ef1cb28781af349252dddbcac6df
diff --git a/metadata/md5-cache/dev-python/irc-8.3-r1 b/metadata/md5-cache/dev-python/irc-8.3-r1
index eeb0234e057d..98948387272a 100644
--- a/metadata/md5-cache/dev-python/irc-8.3-r1
+++ b/metadata/md5-cache/dev-python/irc-8.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-8.3.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ce4f6532fae1e053bdcceb21a42802d
+_md5_=a99b54bd68237700a3bd58525cb144df
diff --git a/metadata/md5-cache/dev-python/irc-8.3.1 b/metadata/md5-cache/dev-python/irc-8.3.1
index 1679254c0b6b..d40e67ee350d 100644
--- a/metadata/md5-cache/dev-python/irc-8.3.1
+++ b/metadata/md5-cache/dev-python/irc-8.3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-8.3.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e325b9f929d0f9a79eeb0affcdc4e6d6
+_md5_=34ee47b39ceb4eadfb8c1b1c0ea0e028
diff --git a/metadata/md5-cache/dev-python/irc-8.4 b/metadata/md5-cache/dev-python/irc-8.4
index 6be4b08b1d8e..afc405f2068f 100644
--- a/metadata/md5-cache/dev-python/irc-8.4
+++ b/metadata/md5-cache/dev-python/irc-8.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-8.4.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=faadc1d78f93c5846e6d2488ea1fe164
+_md5_=adb266a004f2dcddc4f2599d94296b7a
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 f55f001ea1d3..25d374f30a98 100644
--- a/metadata/md5-cache/dev-python/irman-python-0.1-r1
+++ b/metadata/md5-cache/dev-python/irman-python-0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://bluweb.com/chouser/proj/irman-python/irman-python-0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a47afb21c762d8909e0ede74d75b864
+_md5_=5f85993f0fb12fa4a44750d8dffcab75
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.4-r1 b/metadata/md5-cache/dev-python/iso8601-0.1.4-r1
index fcfa4e0db83b..a5889e28aca1 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=75f6aeb89896d21d556d99495c1a1508
+_md5_=3fcdf55284a8f9a99727f98f69148aa2
diff --git a/metadata/md5-cache/dev-python/isodate-0.4.9-r1 b/metadata/md5-cache/dev-python/isodate-0.4.9-r1
index bb81f2ae826d..e5dd4aa34f7a 100644
--- a/metadata/md5-cache/dev-python/isodate-0.4.9-r1
+++ b/metadata/md5-cache/dev-python/isodate-0.4.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.4.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7ee6fbc42d28fe5060cfb4e928cb640
+_md5_=67a2c86ef87f49fb2ab83ab9505a1bf7
diff --git a/metadata/md5-cache/dev-python/itsdangerous-0.21 b/metadata/md5-cache/dev-python/itsdangerous-0.21
index e42d55fc9944..d096b8a20b86 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-0.21
+++ b/metadata/md5-cache/dev-python/itsdangerous-0.21
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.21.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=502c7059ec07879cf776d3c6c48d90ac
+_md5_=fe9f8961f308b5f698a49703ff195f59
diff --git a/metadata/md5-cache/dev-python/itsdangerous-0.22 b/metadata/md5-cache/dev-python/itsdangerous-0.22
index 358e64aa8391..1e5139b2eb3f 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-0.22
+++ b/metadata/md5-cache/dev-python/itsdangerous-0.22
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.22.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=188a7533d1fbf312c65c7f98aad975c9
+_md5_=f4aef9cea76efda48f5301b73353b3e7
diff --git a/metadata/md5-cache/dev-python/jinja-2.6-r1 b/metadata/md5-cache/dev-python/jinja-2.6-r1
index 136a26f02759..31cc47d1bef7 100644
--- a/metadata/md5-cache/dev-python/jinja-2.6-r1
+++ b/metadata/md5-cache/dev-python/jinja-2.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=da52cc1f1e4c36ed9473ac90d1b5e0e8
+_md5_=a2c488af2d1ed16fe3f6d574cedcf4d3
diff --git a/metadata/md5-cache/dev-python/jinja-2.6-r100 b/metadata/md5-cache/dev-python/jinja-2.6-r100
index adb57bc31c90..a37d144b042c 100644
--- a/metadata/md5-cache/dev-python/jinja-2.6-r100
+++ b/metadata/md5-cache/dev-python/jinja-2.6-r100
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_2 )
 SLOT=compat
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c0bbfc43a8639b82332ed87a64cbcbfb
+_md5_=27ca74547eab3795d06c7db720d78092
diff --git a/metadata/md5-cache/dev-python/jinja-2.6-r2 b/metadata/md5-cache/dev-python/jinja-2.6-r2
index 164d48d9cd2b..30ec467471de 100644
--- a/metadata/md5-cache/dev-python/jinja-2.6-r2
+++ b/metadata/md5-cache/dev-python/jinja-2.6-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a0d5716e1a6775b18306ccabdb5f2a6
+_md5_=37b5541d3df250516670ddf73e901e85
diff --git a/metadata/md5-cache/dev-python/jinja-2.7 b/metadata/md5-cache/dev-python/jinja-2.7
index 380a1c0f3dfc..1fe6a9191615 100644
--- a/metadata/md5-cache/dev-python/jinja-2.7
+++ b/metadata/md5-cache/dev-python/jinja-2.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a601674f6569a9854a465019094d7200
+_md5_=7ebbf743137e507e5351f1f8e649b660
diff --git a/metadata/md5-cache/dev-python/jinja-2.7.1 b/metadata/md5-cache/dev-python/jinja-2.7.1
index 9e490b940e4d..9e6fd239ebf7 100644
--- a/metadata/md5-cache/dev-python/jinja-2.7.1
+++ b/metadata/md5-cache/dev-python/jinja-2.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.7.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ba9e3e2fe15fadd65895ce5ee9b9bb49
+_md5_=aa16d27c91521c011165f92d26f3aea3
diff --git a/metadata/md5-cache/dev-python/jonpy-0.10-r1 b/metadata/md5-cache/dev-python/jonpy-0.10-r1
index 1cc22ccb0a9e..c5dcfef3a2e6 100644
--- a/metadata/md5-cache/dev-python/jonpy-0.10-r1
+++ b/metadata/md5-cache/dev-python/jonpy-0.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/jonpy/jonpy-0.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9d5ff53e8123b7ea5ac678158e1ba1b7
+_md5_=c308997e06b83a5889f20ad723351b03
diff --git a/metadata/md5-cache/dev-python/jsmin-2.0.3 b/metadata/md5-cache/dev-python/jsmin-2.0.3
index ce5f74528715..b6bbe622ebf8 100644
--- a/metadata/md5-cache/dev-python/jsmin-2.0.3
+++ b/metadata/md5-cache/dev-python/jsmin-2.0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cedcf8edc2d16a1f5bb8d7ab0a2daa09
+_md5_=be365e1e0ad6e91d1fe4f45bef8cecc2
diff --git a/metadata/md5-cache/dev-python/jsonpickle-0.4.0-r1 b/metadata/md5-cache/dev-python/jsonpickle-0.4.0-r1
index 1e097c9944e8..95d138de24ef 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/jsonpickle-0.4.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-0.4.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=90da4273b63d48f6cd2c08a952e801b3
+_md5_=f57f56369f5415db4c8acd477ff96d11
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-9999 b/metadata/md5-cache/dev-python/jsonrpclib-9999
index 8f275bf498a8..f627a90bfe01 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-9999
+++ b/metadata/md5-cache/dev-python/jsonrpclib-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/joshmarshall/jsonrpclib
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson dev-lang/python
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=adca6f850807fa3fb286f7f41aaa8f27
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.0.0 b/metadata/md5-cache/dev-python/jsonschema-2.0.0
index 6ab1d28b3f23..49cacd600888 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.0.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.0.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3fb5729d027d9070a882b1e85fdadfed
+_md5_=b5c1d8ecb51752c1fcb577a1d9bfcb76
diff --git a/metadata/md5-cache/dev-python/keyring-1.0 b/metadata/md5-cache/dev-python/keyring-1.0
index 4d6809bc9789..4085b388bbaa 100644
--- a/metadata/md5-cache/dev-python/keyring-1.0
+++ b/metadata/md5-cache/dev-python/keyring-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-1.0.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be43954c7bcde6f8ceeb1e9f6415218d
+_md5_=1b4ebbbf6918d5156551543b427c3e5a
diff --git a/metadata/md5-cache/dev-python/keyring-1.5 b/metadata/md5-cache/dev-python/keyring-1.5
index 8077b30ce28c..433baa17c89f 100644
--- a/metadata/md5-cache/dev-python/keyring-1.5
+++ b/metadata/md5-cache/dev-python/keyring-1.5
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-1.5.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0c559379a73a428fb9f72fc2bb015322
+_md5_=3be34fa4a58b175bde2082f1960d0fac
diff --git a/metadata/md5-cache/dev-python/keyring-1.5-r1 b/metadata/md5-cache/dev-python/keyring-1.5-r1
index a0d32d78418a..3b0dae7dd518 100644
--- a/metadata/md5-cache/dev-python/keyring-1.5-r1
+++ b/metadata/md5-cache/dev-python/keyring-1.5-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-1.5.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=da8d4ce94019edcf4cdc8c1ce9596e2b
+_md5_=b567769d0774c817b0dbb479eba5e1c9
diff --git a/metadata/md5-cache/dev-python/libnatpmp-20120821-r1 b/metadata/md5-cache/dev-python/libnatpmp-20120821-r1
index 104fe08620f1..870cf35277ab 100644
--- a/metadata/md5-cache/dev-python/libnatpmp-20120821-r1
+++ b/metadata/md5-cache/dev-python/libnatpmp-20120821-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20120821.tar.gz -> libnatpmp-20120821.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=96d902cfc6948f5d6a377c715fa67c41
+_md5_=98ef297fd60e490e1cd473e0d50dbaea
diff --git a/metadata/md5-cache/dev-python/llfuse-0.39 b/metadata/md5-cache/dev-python/llfuse-0.39
index 1cfb06e164a6..0f30d10c77fa 100644
--- a/metadata/md5-cache/dev-python/llfuse-0.39
+++ b/metadata/md5-cache/dev-python/llfuse-0.39
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-0.39.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=694e5280cc71edfb11f3ef07a83a1d3c
+_md5_=745a65319bab278082156dce6e3c616d
diff --git a/metadata/md5-cache/dev-python/lockfile-0.9.1-r1 b/metadata/md5-cache/dev-python/lockfile-0.9.1-r1
index d50dcbe608f4..5a4b8af8c752 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.9.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://pylockfile.googlecode.com/files/lockfile-0.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=76a52ebbe88d384a75595ca4fca28ec8
+_md5_=fbd4b7b542bc9aad585ac0b60be79a5e
diff --git a/metadata/md5-cache/dev-python/logbook-0.4.1 b/metadata/md5-cache/dev-python/logbook-0.4.1
index 692a599327ef..f3b6fba4151d 100644
--- a/metadata/md5-cache/dev-python/logbook-0.4.1
+++ b/metadata/md5-cache/dev-python/logbook-0.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/L/Logbook/Logbook-0.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a7774303b8af24a6a45cc90d55f903d4
+_md5_=4afbc23ba9e4260a018994b56e2fe06f
diff --git a/metadata/md5-cache/dev-python/logbook-0.4.2 b/metadata/md5-cache/dev-python/logbook-0.4.2
index c5693d6834b1..1ca001f83341 100644
--- a/metadata/md5-cache/dev-python/logbook-0.4.2
+++ b/metadata/md5-cache/dev-python/logbook-0.4.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/mitsuhiko/logbook/archive/0.4.2.tar.gz -> logbook-0.4.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=054d7b966ef3776352cdb7dfe42e11e4
+_md5_=6ec11b76685a18d55a1d9e6483f6ad33
diff --git a/metadata/md5-cache/dev-python/logilab-common-0.59.1 b/metadata/md5-cache/dev-python/logilab-common-0.59.1
index 2c29d284ccc7..bdb8b638aeb2 100644
--- a/metadata/md5-cache/dev-python/logilab-common-0.59.1
+++ b/metadata/md5-cache/dev-python/logilab-common-0.59.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.59.1.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.59.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b2ea99d378835ee5f8433408a1e278ff
+_md5_=270820824f7c6d9c556e26ae8d60e9aa
diff --git a/metadata/md5-cache/dev-python/logilab-common-0.60.0 b/metadata/md5-cache/dev-python/logilab-common-0.60.0
index d6c8253966ce..a6f723ed432b 100644
--- a/metadata/md5-cache/dev-python/logilab-common-0.60.0
+++ b/metadata/md5-cache/dev-python/logilab-common-0.60.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.60.0.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.60.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=de53578a15ed909cd5337c205c889756
+_md5_=c8f6f07679a4b3d848aa02929b6ce74d
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 f77e9562b712..be1c5fd84d2c 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.logilab.org/pub/constraint/logilab-constraint-0.5.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=53b927bde86aac3946de0261de0be2ae
+_md5_=f621a1a053694f5a2a681c28a97b12d3
diff --git a/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1 b/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1
index 54d84bd8407f..b9cdcda0376e 100644
--- a/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1
+++ b/metadata/md5-cache/dev-python/lp_solve-5.5.2.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lpsolve/lp_solve_5.5.2.0_Python_source.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eeb55ffc7f8507738ba494722134e5b3
+_md5_=b3034a68e444564842caf57720b68c95
diff --git a/metadata/md5-cache/dev-python/lxml-3.0.1 b/metadata/md5-cache/dev-python/lxml-3.0.1
index 9d59e52d5c7c..0742eef0ae56 100644
--- a/metadata/md5-cache/dev-python/lxml-3.0.1
+++ b/metadata/md5-cache/dev-python/lxml-3.0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://codespeak.net/lxml/lxml-3.0.1.tgz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7bdac030b3c185c1ff7db130b359740c
+_md5_=e03a1653ed43d4f398055cf6cedfd602
diff --git a/metadata/md5-cache/dev-python/lxml-3.1.0 b/metadata/md5-cache/dev-python/lxml-3.1.0
index 21cf06b52906..880ed96692aa 100644
--- a/metadata/md5-cache/dev-python/lxml-3.1.0
+++ b/metadata/md5-cache/dev-python/lxml-3.1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc24a8ab5af7b9e02ceb9c768cff5fbe
+_md5_=38b96c5a52e4f53def1b39d02ba77635
diff --git a/metadata/md5-cache/dev-python/lxml-3.1.1 b/metadata/md5-cache/dev-python/lxml-3.1.1
index c3a88b5603fd..968469291320 100644
--- a/metadata/md5-cache/dev-python/lxml-3.1.1
+++ b/metadata/md5-cache/dev-python/lxml-3.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=20b0b2c351d7bd3eb9fc5c0395788501
+_md5_=ab3edc9f2cabd79c69889e5622596fa7
diff --git a/metadata/md5-cache/dev-python/lxml-3.1.2 b/metadata/md5-cache/dev-python/lxml-3.1.2
index cb045179cf70..9eedb229a359 100644
--- a/metadata/md5-cache/dev-python/lxml-3.1.2
+++ b/metadata/md5-cache/dev-python/lxml-3.1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.1.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b9f59ce983617d800b156b2081fa23e
+_md5_=87b6e5daac516779decad52226aebe96
diff --git a/metadata/md5-cache/dev-python/lxml-3.2.0 b/metadata/md5-cache/dev-python/lxml-3.2.0
index e292dc3868b6..4625508cf478 100644
--- a/metadata/md5-cache/dev-python/lxml-3.2.0
+++ b/metadata/md5-cache/dev-python/lxml-3.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=717dc1f2c93561c8e2aae3ffab0a8d73
+_md5_=83b9e9aaf32986ee78993b44cecac37c
diff --git a/metadata/md5-cache/dev-python/lxml-3.2.1 b/metadata/md5-cache/dev-python/lxml-3.2.1
index 9c14c16c9a00..ffb08b5474bb 100644
--- a/metadata/md5-cache/dev-python/lxml-3.2.1
+++ b/metadata/md5-cache/dev-python/lxml-3.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 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_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ecc719948ce670b67ed4efe965abfe92
+_md5_=bd158cb8578b4c6618b4117813b42db3
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.21.1-r1 b/metadata/md5-cache/dev-python/m2crypto-0.21.1-r1
index fccf517b3767..d976969463ad 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.21.1-r1
+++ b/metadata/md5-cache/dev-python/m2crypto-0.21.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.21.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d09d87db8ba70d073c4f23a85385566e
+_md5_=10b34809a187b04bef8784d688a12247
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 2604ce66daa9..d1d756fbefc9 100644
--- a/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/m2secret-0.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2secret/m2secret-0.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4996f9d805a8e4e84856cb3d7bf01a46
+_md5_=64ad021707710f3f3ad7be5eeea87bb7
diff --git a/metadata/md5-cache/dev-python/mako-0.7.3-r1 b/metadata/md5-cache/dev-python/mako-0.7.3-r1
index 2adfe0549bd0..dfb6e0eb5845 100644
--- a/metadata/md5-cache/dev-python/mako-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/mako-0.7.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.makotemplates.org/downloads/Mako-0.7.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0c72e6f4b9dc3feaba0f951bd27ca6dc
+_md5_=289b0b0a8905c3d985c0c54cab26615e
diff --git a/metadata/md5-cache/dev-python/manifestdestiny-0.5.6-r1 b/metadata/md5-cache/dev-python/manifestdestiny-0.5.6-r1
index e7c4a246d332..aeb86006ab11 100644
--- a/metadata/md5-cache/dev-python/manifestdestiny-0.5.6-r1
+++ b/metadata/md5-cache/dev-python/manifestdestiny-0.5.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/M/ManifestDestiny/ManifestDestiny-0.5.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a0e1e2bfe688abc36dc785266f1c3716
+_md5_=92c01f568a92742dff64f1ded4416d3d
diff --git a/metadata/md5-cache/dev-python/manuel-1.7.1 b/metadata/md5-cache/dev-python/manuel-1.7.1
index c9d293f9ef03..fb7677bf7dbe 100644
--- a/metadata/md5-cache/dev-python/manuel-1.7.1
+++ b/metadata/md5-cache/dev-python/manuel-1.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~idella4/tarballs/manuel-1.7.1-20130316.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7efa25d27a5f52c8760db142ab4b45c1
+_md5_=31cc3889d6c4f0397a7186b308ec49f0
diff --git a/metadata/md5-cache/dev-python/markdown-2.2.1-r1 b/metadata/md5-cache/dev-python/markdown-2.2.1-r1
index 8d30f654144f..2a96db59f2f4 100644
--- a/metadata/md5-cache/dev-python/markdown-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/markdown-2.2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8c78ca0eb8c6e76063c07e6414d9f60e
+_md5_=7c6d57eea0dab25947c2cac397d7f728
diff --git a/metadata/md5-cache/dev-python/markdown-2.3 b/metadata/md5-cache/dev-python/markdown-2.3
index c2123e249f0d..81fc22ca4f1d 100644
--- a/metadata/md5-cache/dev-python/markdown-2.3
+++ b/metadata/md5-cache/dev-python/markdown-2.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7d3806c9251dbf989a05e20eba1e7a56
+_md5_=45778605f7a0d6bf4e4cf51695c08eca
diff --git a/metadata/md5-cache/dev-python/markdown-2.3.1 b/metadata/md5-cache/dev-python/markdown-2.3.1
index 747b7d186edb..6c04a9f7f9ba 100644
--- a/metadata/md5-cache/dev-python/markdown-2.3.1
+++ b/metadata/md5-cache/dev-python/markdown-2.3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.3.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3982a2fe0cfda3a9735400a7d76445d0
+_md5_=ca8f8e6657fbc8facab4dd119ac42371
diff --git a/metadata/md5-cache/dev-python/markdown2-2.1.0-r1 b/metadata/md5-cache/dev-python/markdown2-2.1.0-r1
index c790a33ddc38..9029a3bd9412 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.1.0-r1
+++ b/metadata/md5-cache/dev-python/markdown2-2.1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/markdown2/markdown2-2.1.0.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=53b32109605054b477a28f5353f0ccd1
+_md5_=92ab7ce376121c68d908630f36e8a521
diff --git a/metadata/md5-cache/dev-python/markupsafe-0.15-r1 b/metadata/md5-cache/dev-python/markupsafe-0.15-r1
index ce9998812521..9e836d769e20 100644
--- a/metadata/md5-cache/dev-python/markupsafe-0.15-r1
+++ b/metadata/md5-cache/dev-python/markupsafe-0.15-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-0.15.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=98748f0d34a8e4032e13dace62c0c0b3
+_md5_=4ee99b2c3d167e3e93796773ef53308a
diff --git a/metadata/md5-cache/dev-python/markupsafe-0.18 b/metadata/md5-cache/dev-python/markupsafe-0.18
index fc840502492b..5d60f3927ae3 100644
--- a/metadata/md5-cache/dev-python/markupsafe-0.18
+++ b/metadata/md5-cache/dev-python/markupsafe-0.18
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-0.18.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=af228c392b4e59ef82e594d36da6cbc6
+_md5_=d3281e0727f51a7290fb08bae4562efc
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.2.0-r2 b/metadata/md5-cache/dev-python/matplotlib-1.2.0-r2
index da8bbad6a5e7..302eab9f9daa 100644
--- a/metadata/md5-cache/dev-python/matplotlib-1.2.0-r2
+++ b/metadata/md5-cache/dev-python/matplotlib-1.2.0-r2
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://github/matplotlib/matplotlib/matplotlib-1.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9b041d020eec8f940995b2975d4570c0
+_md5_=435608f972df25c4b2e4ae6dd41e0b2f
diff --git a/metadata/md5-cache/dev-python/matplotlib-1.2.1 b/metadata/md5-cache/dev-python/matplotlib-1.2.1
index 35cf974fa7ae..83ce68e934ab 100644
--- a/metadata/md5-cache/dev-python/matplotlib-1.2.1
+++ b/metadata/md5-cache/dev-python/matplotlib-1.2.1
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/matplotlib-1.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=93095a4ad19081e158057c6222a0a405
+_md5_=ce70431bacba52bd8944dea679a89fa2
diff --git a/metadata/md5-cache/dev-python/mccabe-0.2.1 b/metadata/md5-cache/dev-python/mccabe-0.2.1
index 6263f2a1282c..517b0d809e85 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.2.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df33decc735f5c8b2d7a516866b78653
+_md5_=a18dc5e3a668b0f68fbeb3df9ed6d8c6
diff --git a/metadata/md5-cache/dev-python/mecab-python-0.996 b/metadata/md5-cache/dev-python/mecab-python-0.996
index 3dc7e4a37546..365a26d2e5d7 100644
--- a/metadata/md5-cache/dev-python/mecab-python-0.996
+++ b/metadata/md5-cache/dev-python/mecab-python-0.996
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://mecab.googlecode.com/files/mecab-python-0.996.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c3138cb52601157c47d2e2aecd0e9d63
+_md5_=3647c06af0ca1480cfb5149770c18dc8
diff --git a/metadata/md5-cache/dev-python/mechanize-0.2.5-r1 b/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
index 312ae76db00e..90cda89ac939 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
+++ b/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://wwwsearch.sourceforge.net/mechanize/src/mechanize-0.2.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3d8ea3fbe0601e094fe0eeb9e3c3fed5
+_md5_=19a9a7e89382a34d19679be19ba82d4c
diff --git a/metadata/md5-cache/dev-python/medusa-0.5.4-r1 b/metadata/md5-cache/dev-python/medusa-0.5.4-r1
index 4b39c359c040..7211265f88f1 100644
--- a/metadata/md5-cache/dev-python/medusa-0.5.4-r1
+++ b/metadata/md5-cache/dev-python/medusa-0.5.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.amk.ca/files/python/medusa-0.5.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f48e44210f906e6a885cf762ab38913
+_md5_=d798bc7612faab395b17892ff2a86805
diff --git a/metadata/md5-cache/dev-python/meld3-0.6.10-r1 b/metadata/md5-cache/dev-python/meld3-0.6.10-r1
index 06b70fc11312..8a14e209218b 100644
--- a/metadata/md5-cache/dev-python/meld3-0.6.10-r1
+++ b/metadata/md5-cache/dev-python/meld3-0.6.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/meld3/meld3-0.6.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a6e037e134999fbb74d96a7698750f70
+_md5_=2f5d3362ab678f7ec7648f2305412372
diff --git a/metadata/md5-cache/dev-python/meld3-0.6.9-r1 b/metadata/md5-cache/dev-python/meld3-0.6.9-r1
index 2ac4e44fcbf4..a846995fe005 100644
--- a/metadata/md5-cache/dev-python/meld3-0.6.9-r1
+++ b/metadata/md5-cache/dev-python/meld3-0.6.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/meld3/meld3-0.6.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b6a7cd5d55752dd177004189feee2455
+_md5_=3dbaf9d3f2f3a5cee0b8efc99043bdfa
diff --git a/metadata/md5-cache/dev-python/mimeparse-0.1.3-r1 b/metadata/md5-cache/dev-python/mimeparse-0.1.3-r1
index 063862d54ca4..124bd1119f0e 100644
--- a/metadata/md5-cache/dev-python/mimeparse-0.1.3-r1
+++ b/metadata/md5-cache/dev-python/mimeparse-0.1.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://mimeparse.googlecode.com/files/mimeparse-0.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b2e9c6326d0491bf0d56119ed3429931
+_md5_=cb8912706b15bf1a248370018101baf5
diff --git a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1 b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
index e8179781c0b1..86ca2d0fbc5d 100644
--- a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-0.1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0c4f567685f1b6302e969ccb47e6c92c
+_md5_=eb01333a2b00e131e9e8f0b6bd2ae6e1
diff --git a/metadata/md5-cache/dev-python/miniupnpc-1.7-r1 b/metadata/md5-cache/dev-python/miniupnpc-1.7-r1
index b4475d6f95e8..a7e062360365 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-1.7-r1
+++ b/metadata/md5-cache/dev-python/miniupnpc-1.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d23ac3342e41aecfeebf23ae0e4673d5
+_md5_=a69a837a4bb26963ffe53c2911d2fb06
diff --git a/metadata/md5-cache/dev-python/miniupnpc-1.8 b/metadata/md5-cache/dev-python/miniupnpc-1.8
index ce6a82ea0f20..f3bea5fed31b 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-1.8
+++ b/metadata/md5-cache/dev-python/miniupnpc-1.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-1.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=79a1ab160129d279908045ff9173baf9
+_md5_=5dc140379e90ac96045ddb96215751d6
diff --git a/metadata/md5-cache/dev-python/mock-1.0.1-r1 b/metadata/md5-cache/dev-python/mock-1.0.1-r1
index b35673a39618..834f19facdb1 100644
--- a/metadata/md5-cache/dev-python/mock-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/mock-1.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2f18f5907c4f6e5c64056dd979790dd0
+_md5_=16295d97ec442b5c869e5d55991ba75b
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 fd28600a6e61..5287d762fdaa 100644
--- a/metadata/md5-cache/dev-python/mocker-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/mocker-1.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mocker/mocker-1.1.1.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b0965745af97a62b7db5a486a9f5cc26
+_md5_=11e58bddf88de8119ff941aea4f802f2
diff --git a/metadata/md5-cache/dev-python/mox-0.5.3-r1 b/metadata/md5-cache/dev-python/mox-0.5.3-r1
index 602913cd5e85..03364a618474 100644
--- a/metadata/md5-cache/dev-python/mox-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/mox-0.5.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox/mox-0.5.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7cdfbc6eb460cf97661538fd7c12ff00
+_md5_=3a9015dcccbd2c84768918dcf3867868
diff --git a/metadata/md5-cache/dev-python/mozfile-0.9 b/metadata/md5-cache/dev-python/mozfile-0.9
index d8b7b64d620c..3a5e8d920bcc 100644
--- a/metadata/md5-cache/dev-python/mozfile-0.9
+++ b/metadata/md5-cache/dev-python/mozfile-0.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozfile/mozfile-0.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9462c20a4c3b891c4efaf9f27eb2b38e
+_md5_=38e4f5a166852debd6df420009cea285
diff --git a/metadata/md5-cache/dev-python/mozinfo-0.5-r1 b/metadata/md5-cache/dev-python/mozinfo-0.5-r1
index cc0995833a51..c7842ef09f9e 100644
--- a/metadata/md5-cache/dev-python/mozinfo-0.5-r1
+++ b/metadata/md5-cache/dev-python/mozinfo-0.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozinfo/mozinfo-0.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=187818ba3f8852fbc9619c2ad0357b52
+_md5_=a33ec04bf0998d62ed161364b4f93759
diff --git a/metadata/md5-cache/dev-python/mozprocess-0.11-r1 b/metadata/md5-cache/dev-python/mozprocess-0.11-r1
index 34560c85bd0a..3be32240d782 100644
--- a/metadata/md5-cache/dev-python/mozprocess-0.11-r1
+++ b/metadata/md5-cache/dev-python/mozprocess-0.11-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozprocess/mozprocess-0.11.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2c2523a2110c6501e9d6b61d2449d2dd
+_md5_=bf9ba302d95b1851211711fe9d7e1025
diff --git a/metadata/md5-cache/dev-python/mozprofile-0.11-r1 b/metadata/md5-cache/dev-python/mozprofile-0.11-r1
index 462217d2226d..415f29fe18d5 100644
--- a/metadata/md5-cache/dev-python/mozprofile-0.11-r1
+++ b/metadata/md5-cache/dev-python/mozprofile-0.11-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozprofile/mozprofile-0.11.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b339c070929b8de50e7f00f21a4a22ce
+_md5_=861aec1b89873d3f61ebc535b3efdfdd
diff --git a/metadata/md5-cache/dev-python/mozprofile-0.12 b/metadata/md5-cache/dev-python/mozprofile-0.12
index 8fbef4d71c9c..182745d7204f 100644
--- a/metadata/md5-cache/dev-python/mozprofile-0.12
+++ b/metadata/md5-cache/dev-python/mozprofile-0.12
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozprofile/mozprofile-0.12.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1c91e82391a943ad637f963dbd5ab89b
+_md5_=35ab0a56e185d97beea53a8a3d21ff0a
diff --git a/metadata/md5-cache/dev-python/mozrunner-5.18-r1 b/metadata/md5-cache/dev-python/mozrunner-5.18-r1
index a99713f784fb..c789819432c1 100644
--- a/metadata/md5-cache/dev-python/mozrunner-5.18-r1
+++ b/metadata/md5-cache/dev-python/mozrunner-5.18-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozrunner/mozrunner-5.18.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d659a4630fca9312aaea75d8135ce820
+_md5_=d084bea083e718f355bf4c26a7c69be5
diff --git a/metadata/md5-cache/dev-python/mozrunner-5.23 b/metadata/md5-cache/dev-python/mozrunner-5.23
index 7d2221ca5090..bddac42e8299 100644
--- a/metadata/md5-cache/dev-python/mozrunner-5.23
+++ b/metadata/md5-cache/dev-python/mozrunner-5.23
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozrunner/mozrunner-5.23.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c39f839298a98fc368fdeb552ecf1b53
+_md5_=92e372b9690df0143bf107230be84c10
diff --git a/metadata/md5-cache/dev-python/mozrunner-5.24 b/metadata/md5-cache/dev-python/mozrunner-5.24
index 49c3021e6ffd..561a42a59582 100644
--- a/metadata/md5-cache/dev-python/mozrunner-5.24
+++ b/metadata/md5-cache/dev-python/mozrunner-5.24
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mozrunner/mozrunner-5.24.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ac7c4f2c5f9731a93769ac87fd78e0e
+_md5_=39222207114c05a6ef99feb1f7e8be34
diff --git a/metadata/md5-cache/dev-python/mpi4py-1.3-r1 b/metadata/md5-cache/dev-python/mpi4py-1.3-r1
index 9bb38d69edf6..670978c0dee1 100644
--- a/metadata/md5-cache/dev-python/mpi4py-1.3-r1
+++ b/metadata/md5-cache/dev-python/mpi4py-1.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://mpi4py.googlecode.com/files/mpi4py-1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=01f018151ac840495b7237fb57ab8647
+_md5_=321adf3f99c9bbd0dba43641ddf223ce
diff --git a/metadata/md5-cache/dev-python/mpmath-0.17 b/metadata/md5-cache/dev-python/mpmath-0.17
index 3fee531d3223..f726a1366f5c 100644
--- a/metadata/md5-cache/dev-python/mpmath-0.17
+++ b/metadata/md5-cache/dev-python/mpmath-0.17
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://mpmath.googlecode.com/files/mpmath-all-0.17.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8d97b08aa0cf9e9204a6b9377001aff7
+_md5_=73d1a5ea1609172a730816f3c425f08f
diff --git a/metadata/md5-cache/dev-python/mpmath-0.17-r1 b/metadata/md5-cache/dev-python/mpmath-0.17-r1
index 09c0c461904e..6f8faa8a441b 100644
--- a/metadata/md5-cache/dev-python/mpmath-0.17-r1
+++ b/metadata/md5-cache/dev-python/mpmath-0.17-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://mpmath.googlecode.com/files/mpmath-all-0.17.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a63800411e29b72acf16894abbe2e83b
+_md5_=cc4c6c8bdc17e20edde3f5ca297cc8ed
diff --git a/metadata/md5-cache/dev-python/msgpack-0.2.4 b/metadata/md5-cache/dev-python/msgpack-0.2.4
index df6ff1b4cbc1..815819ad8916 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.2.4
+++ b/metadata/md5-cache/dev-python/msgpack-0.2.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.2.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c55906fb748ae70802c7510cac71f272
+_md5_=6c3d631b11ae393c0b30535bbd87005e
diff --git a/metadata/md5-cache/dev-python/msgpack-0.3.0 b/metadata/md5-cache/dev-python/msgpack-0.3.0
index c8c316c178e8..c3d78504c2b3 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.3.0
+++ b/metadata/md5-cache/dev-python/msgpack-0.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c7f751d91421dcf551be878746b718c0
+_md5_=3b4d2c478ee6036aba0032bce8a5968d
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.7-r1 b/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
index 48f29f6a84f0..0d433b00001a 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=http://thp.io/2010/mygpoclient/mygpoclient-1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b0febfc4f282b391a331738358e4c4e
+_md5_=f767c67413aabc6214c4fbc13d24b1ee
diff --git a/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1 b/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1
index 3e466222da0e..6df31672095e 100644
--- a/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/mysql-python-1.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mysql-python/MySQL-python-1.2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7c2d2d41d7f6e214c302384445869cbc
+_md5_=8e8c1f4596c09c2bea6ca48f229a9c3f
diff --git a/metadata/md5-cache/dev-python/netifaces-0.8-r1 b/metadata/md5-cache/dev-python/netifaces-0.8-r1
index 60bb76244da2..def94bfb4308 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.8-r1
+++ b/metadata/md5-cache/dev-python/netifaces-0.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://alastairs-place.net/projects/netifaces/netifaces-0.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=456ce6fa5770fb78bb5149dcc14f0cf4
+_md5_=03e304521051aef282cbb427893b51ce
diff --git a/metadata/md5-cache/dev-python/nose-1.1.2-r1 b/metadata/md5-cache/dev-python/nose-1.1.2-r1
index 96b3cde3fbb6..9c60b76df3a9 100644
--- a/metadata/md5-cache/dev-python/nose-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/nose-1.1.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.1.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=76b3f0460a7c159eac40ac8c1cfe58b6
+_md5_=758a2ab5eebc751097f84c05ae58e23c
diff --git a/metadata/md5-cache/dev-python/nose-1.2.1 b/metadata/md5-cache/dev-python/nose-1.2.1
index 9d25a6e16ff6..fd54c815cfe7 100644
--- a/metadata/md5-cache/dev-python/nose-1.2.1
+++ b/metadata/md5-cache/dev-python/nose-1.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=444b97defb22fd42c721addc937212a9
+_md5_=a04bbee6f6ee76a40d1c8fb43f496213
diff --git a/metadata/md5-cache/dev-python/nose-1.2.1_p2012 b/metadata/md5-cache/dev-python/nose-1.2.1_p2012
index 8e8ce47fa294..2ffce371ee8c 100644
--- a/metadata/md5-cache/dev-python/nose-1.2.1_p2012
+++ b/metadata/md5-cache/dev-python/nose-1.2.1_p2012
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/nose-devs/nose/archive/e879960507d51a.tar.gz -> nose-1.2.1_p2012.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=dccfc950d1f437470226731b481b0254
+_md5_=b28108b4c4c639c50154ff8d5299b340
diff --git a/metadata/md5-cache/dev-python/nose-1.3.0 b/metadata/md5-cache/dev-python/nose-1.3.0
index 6f5eababe56c..59e59559a2c3 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.0
+++ b/metadata/md5-cache/dev-python/nose-1.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=999d82924cc3228d0aa3d526bc93558b
+_md5_=2c83a2b104cc654af9af3e340ff5501a
diff --git a/metadata/md5-cache/dev-python/nose-9999 b/metadata/md5-cache/dev-python/nose-9999
index 85e4371b3a7e..587abd7c628b 100644
--- a/metadata/md5-cache/dev-python/nose-9999
+++ b/metadata/md5-cache/dev-python/nose-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-python/coverage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be20a2421efa16d831e1b76675db3c86
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=15954bd6f7a6e985c6caa9aa62c72f5d
diff --git a/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1 b/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
index fe8f17108874..adc1f367730f 100644
--- a/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/nose-cover3-0.1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-cover3/nose-cover3-0.1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c6d36e36d71f0855e87aa52198e492cc
+_md5_=a2a1a11d66dd3d190056c2efb9fe5d1d
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 aba954acf604..e3d91b33a449 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.1.9
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.1.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-exclude/nose-exclude-0.1.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=51837e2e6f51ee115ec078ad4fad56aa
+_md5_=1d5ebd999be2abadfe04676ee042232b
diff --git a/metadata/md5-cache/dev-python/nosehtmloutput-0.0.4-r1 b/metadata/md5-cache/dev-python/nosehtmloutput-0.0.4-r1
index 1e025f59abbd..94b33b9599a9 100644
--- a/metadata/md5-cache/dev-python/nosehtmloutput-0.0.4-r1
+++ b/metadata/md5-cache/dev-python/nosehtmloutput-0.0.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nosehtmloutput/nosehtmloutput-0.0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9953dbea3c1d9038e6a1fd75bb472a05
+_md5_=6a9f5a70d91d8793441ecf5c58bda89a
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.7-r1 b/metadata/md5-cache/dev-python/nosexcover-1.0.7-r1
index c91a47b02fe4..0c44f8154037 100644
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.7-r1
+++ b/metadata/md5-cache/dev-python/nosexcover-1.0.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a3bdccd01a6e8dfd6ed0f4acb57eccb8
+_md5_=2e357bb54278298eb1b107e65238808f
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.8 b/metadata/md5-cache/dev-python/nosexcover-1.0.8
index 32276438fb7b..adceb0ef9ba8 100644
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.8
+++ b/metadata/md5-cache/dev-python/nosexcover-1.0.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=691065afe4f0e12734de6f17520e65f9
+_md5_=1ed54546b5531c3cb61145f9d4d4679a
diff --git a/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1 b/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1
index 7267b052b797..c4cf9178f962 100644
--- a/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1
+++ b/metadata/md5-cache/dev-python/numdisplay-1.6.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://stsdas.stsci.edu/download/numdisplay/numdisplay-1.6.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0ceb56a20d2b616491dd361769f77e81
+_md5_=c1db614fce7f8431148841eea5b5c1dc
diff --git a/metadata/md5-cache/dev-python/numpy-1.6.2-r2 b/metadata/md5-cache/dev-python/numpy-1.6.2-r2
index bee07a7cdcc7..5fa2518367f2 100644
--- a/metadata/md5-cache/dev-python/numpy-1.6.2-r2
+++ b/metadata/md5-cache/dev-python/numpy-1.6.2-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/numpy/numpy-1.6.2.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.6.0/numpy-html.zip -> numpy-1.6.0-html.zip http://docs.scipy.org/doc/numpy-1.6.0/numpy-ref.pdf -> numpy-1.6.0-ref.pdf http://docs.scipy.org/doc/numpy-1.6.0/numpy-user.pdf -> numpy-1.6.0-user.pdf )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9684878618a170e166f574c77a74d4c1
+_md5_=1e6bacf7556ed387625727d53d503b75
diff --git a/metadata/md5-cache/dev-python/numpy-1.7.1 b/metadata/md5-cache/dev-python/numpy-1.7.1
index 58df0effe3ef..7f5b7b861a70 100644
--- a/metadata/md5-cache/dev-python/numpy-1.7.1
+++ b/metadata/md5-cache/dev-python/numpy-1.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/numpy/numpy-1.7.1.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.7.1/numpy-html-1.7.0.zip http://docs.scipy.org/doc/numpy-1.7.1/numpy-ref-1.7.0.pdf http://docs.scipy.org/doc/numpy-1.7.1/numpy-user-1.7.0.pdf )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1827545a7dac88614ce51db9e274d547
+_md5_=d02f6982a1c54687e3fc8b887850ad8e
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 e49dbe25f3fd..1fdece86c7c2 100644
--- a/metadata/md5-cache/dev-python/oauth-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/oauth-1.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth/oauth-1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ebfbc964f2aba8fff4c324e0e5a4dbca
+_md5_=b31274d87536d2921e5a8d188bcc7138
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 29b7f02faefc..8b7084e5ceeb 100644
--- a/metadata/md5-cache/dev-python/oauth2-1.5.211-r1
+++ b/metadata/md5-cache/dev-python/oauth2-1.5.211-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth2/oauth2-1.5.211.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=630b213637d7a4ceb0bc3ccf89f6da60
+_md5_=62e385b1e4da523b69f6f2716462478c
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.3.6 b/metadata/md5-cache/dev-python/oauthlib-0.3.6
index 77c02befe6c4..8eddef6785d1 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.3.6
+++ b/metadata/md5-cache/dev-python/oauthlib-0.3.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.3.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b8147b9478b163fcf646316f9f1ef523
+_md5_=5ae0f9559008e3fcf82b72422d21a1ce
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.3.7 b/metadata/md5-cache/dev-python/oauthlib-0.3.7
index b0d6712d0729..cf8ebcad4b91 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.3.7
+++ b/metadata/md5-cache/dev-python/oauthlib-0.3.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.3.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=624684a297c986d28a720a0c6f00f68d
+_md5_=801b304f1ab9198cbaca17ebde034a76
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.3.8 b/metadata/md5-cache/dev-python/oauthlib-0.3.8
index a2bbb4d153a8..575d86fab761 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.3.8
+++ b/metadata/md5-cache/dev-python/oauthlib-0.3.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.3.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7ce205915958d0250f6b50f6b8d3476c
+_md5_=52eb7989f03372abd6547de873111452
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.4.0 b/metadata/md5-cache/dev-python/oauthlib-0.4.0
index 2a63ecfbeceb..8bf1ad3d116c 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.4.0
+++ b/metadata/md5-cache/dev-python/oauthlib-0.4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.4.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9fba1e97283e26fc2c7bb404e3b92949
+_md5_=0dcc956db2e336105d80b67991eb0a4a
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.4.1 b/metadata/md5-cache/dev-python/oauthlib-0.4.1
index cb827338e29a..fe0a8ebb762b 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.4.1
+++ b/metadata/md5-cache/dev-python/oauthlib-0.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7cad6fe6f1a5f7759390ab18b969c46
+_md5_=bd94f7abd2617a39d3858cd147db3505
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.4.2 b/metadata/md5-cache/dev-python/oauthlib-0.4.2
index 657e68936d2e..095a695713a3 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.4.2
+++ b/metadata/md5-cache/dev-python/oauthlib-0.4.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.4.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c0fe93cbed0dcb7b94d69d3db0b9b6b9
+_md5_=4c47a61786a73d382795599e267a97fb
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.5.0 b/metadata/md5-cache/dev-python/oauthlib-0.5.0
index dbe2f6ccd8fd..0f99b33c322d 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.5.0
+++ b/metadata/md5-cache/dev-python/oauthlib-0.5.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.5.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0f30ee715a53da11f114a5e1e28ea58b
+_md5_=2ddc642d3bc7517aae037eb21acc04f5
diff --git a/metadata/md5-cache/dev-python/oauthlib-0.5.1 b/metadata/md5-cache/dev-python/oauthlib-0.5.1
index 3f390dbbdfd3..4dd97ca58f54 100644
--- a/metadata/md5-cache/dev-python/oauthlib-0.5.1
+++ b/metadata/md5-cache/dev-python/oauthlib-0.5.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-0.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b66d6f1894528a08f07311336f283963
+_md5_=216e02044a80d6cc98a5c714942e8e41
diff --git a/metadata/md5-cache/dev-python/openpyxl-1.6.2 b/metadata/md5-cache/dev-python/openpyxl-1.6.2
index 669a679ae6bb..540644c9a667 100644
--- a/metadata/md5-cache/dev-python/openpyxl-1.6.2
+++ b/metadata/md5-cache/dev-python/openpyxl-1.6.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/ericgazoni/openpyxl/get/1.6.2.tar.bz2 -> openpyxl-1.6.2.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=47b837edbb683bfdcbf1ea0b38cdd670
+_md5_=d2d089a396007cbcae3a2e21c5341122
diff --git a/metadata/md5-cache/dev-python/optcomplete-1.2-r1 b/metadata/md5-cache/dev-python/optcomplete-1.2-r1
index a0aa72fb7f3e..fababbf04b8c 100644
--- a/metadata/md5-cache/dev-python/optcomplete-1.2-r1
+++ b/metadata/md5-cache/dev-python/optcomplete-1.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://furius.ca/downloads/optcomplete/releases/optcomplete-1.2.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a451a874dbe09de534d1d0aaa2b8c430
+_md5_=ced1bf21de581b19018c55cf4d569014
diff --git a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999 b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
index 66fec3aec68b..04b26cd64aa3 100644
--- a/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
+++ b/metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a6ec6751cb4dcbaee83c65102b7b5413
diff --git a/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-9999 b/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-9999
index cad584b47fd3..384add5218af 100644
--- a/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-9999
+++ b/metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b88a5bb6cd884962419d438e54ce7692
diff --git a/metadata/md5-cache/dev-python/paramiko-1.10.0 b/metadata/md5-cache/dev-python/paramiko-1.10.0
index 647e7f729c88..dd06578f7368 100644
--- a/metadata/md5-cache/dev-python/paramiko-1.10.0
+++ b/metadata/md5-cache/dev-python/paramiko-1.10.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paramiko/paramiko-1.10.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8eb492d6c506561ad6cbc1aec30aefe9
+_md5_=6b328a9dc6d63b2150d5f743c3fee163
diff --git a/metadata/md5-cache/dev-python/paramiko-1.10.1 b/metadata/md5-cache/dev-python/paramiko-1.10.1
index ca42ea7f784c..6a432cf911c6 100644
--- a/metadata/md5-cache/dev-python/paramiko-1.10.1
+++ b/metadata/md5-cache/dev-python/paramiko-1.10.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paramiko/paramiko-1.10.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae0e39510ceb8626224e959f9612d59b
+_md5_=5a3f0238959d98fce4ec261337ed645d
diff --git a/metadata/md5-cache/dev-python/paramiko-1.9.0-r1 b/metadata/md5-cache/dev-python/paramiko-1.9.0-r1
index 2dbb2f214b06..3394d4cc10e9 100644
--- a/metadata/md5-cache/dev-python/paramiko-1.9.0-r1
+++ b/metadata/md5-cache/dev-python/paramiko-1.9.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paramiko/paramiko-1.9.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2879478541cbed8158dceb3c6ca776ce
+_md5_=45643ff793db5f54f33abb485b6d2238
diff --git a/metadata/md5-cache/dev-python/passlib-1.6.1 b/metadata/md5-cache/dev-python/passlib-1.6.1
index 402d1cb8a518..995b684a89e4 100644
--- a/metadata/md5-cache/dev-python/passlib-1.6.1
+++ b/metadata/md5-cache/dev-python/passlib-1.6.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.6.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9b7375a741a9377b9b425f2ca41fd914
+_md5_=527d4a499e9359d6d9902b0f8454cd44
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 4fbe7dce19a4..8bc20a651081 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-1.7.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3103b014d333fa5a3f0950fa01803dbe
+_md5_=11eb33523585bc55ea784cfe7cabf8f7
diff --git a/metadata/md5-cache/dev-python/pastedeploy-1.5.0-r1 b/metadata/md5-cache/dev-python/pastedeploy-1.5.0-r1
index c554277e2311..9bb81a1cc1f1 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/pastedeploy-1.5.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteDeploy/PasteDeploy-1.5.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d519eaf22e9538d8d40b275c8e42c9c8
+_md5_=5c311fed0112a7522b044f9160816f05
diff --git a/metadata/md5-cache/dev-python/paver-1.1.1-r1 b/metadata/md5-cache/dev-python/paver-1.1.1-r1
index ddde18a61818..9d9d6d3c6a7e 100644
--- a/metadata/md5-cache/dev-python/paver-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/paver-1.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=888884893b8f1e94264f5598c659b8a9
+_md5_=b1478f47a1c2fc6e73dc73792d37fc56
diff --git a/metadata/md5-cache/dev-python/paver-1.2.0 b/metadata/md5-cache/dev-python/paver-1.2.0
index 82b776eca3db..5dced9b8be0a 100644
--- a/metadata/md5-cache/dev-python/paver-1.2.0
+++ b/metadata/md5-cache/dev-python/paver-1.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=50bc02677c4525439c76188148ef1aa6
+_md5_=177ac94f3fdb182dfcdc8547d2e1d3c3
diff --git a/metadata/md5-cache/dev-python/paver-1.2.1 b/metadata/md5-cache/dev-python/paver-1.2.1
index 66c9525a14f0..46206c08df9d 100644
--- a/metadata/md5-cache/dev-python/paver-1.2.1
+++ b/metadata/md5-cache/dev-python/paver-1.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f9ce2e99fccb254c2193661d40418ab3
+_md5_=e2bd3b785456330354310bc75ee92f1f
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.1 b/metadata/md5-cache/dev-python/pdfrw-0.1
index 561022d54449..8d99affb24fc 100644
--- a/metadata/md5-cache/dev-python/pdfrw-0.1
+++ b/metadata/md5-cache/dev-python/pdfrw-0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfrw/pdfrw-0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f1741c42ac7a6a4a33c828db094d1ef9
+_md5_=007c2d122d8e1de711fd72c4a22b35c0
diff --git a/metadata/md5-cache/dev-python/peak-rules-0.5 b/metadata/md5-cache/dev-python/peak-rules-0.5
index 10c5d4430ac7..1c9d76401c44 100644
--- a/metadata/md5-cache/dev-python/peak-rules-0.5
+++ b/metadata/md5-cache/dev-python/peak-rules-0.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://peak.telecommunity.com/snapshots/PEAK-Rules-0.5a1.dev-r2713.tar.gz -> peak-rules-0.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d90b777527f67d226f4c79ef12e7cc4
+_md5_=f9daac3170e1e797cfd921e5a714d452
diff --git a/metadata/md5-cache/dev-python/pep8-1.4.5 b/metadata/md5-cache/dev-python/pep8-1.4.5
index 1c41fbd65229..6eeb1ad06ca6 100644
--- a/metadata/md5-cache/dev-python/pep8-1.4.5
+++ b/metadata/md5-cache/dev-python/pep8-1.4.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.4.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cc92b009a4afdbdd47668b30505e85b4
+_md5_=4379b233b0d3c7d8d3292985a1055e27
diff --git a/metadata/md5-cache/dev-python/pep8-1.4.6 b/metadata/md5-cache/dev-python/pep8-1.4.6
index 6568feb7a056..a0d8097daab7 100644
--- a/metadata/md5-cache/dev-python/pep8-1.4.6
+++ b/metadata/md5-cache/dev-python/pep8-1.4.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.4.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fe944c2c20607f6bdd0b14d2ca54c7fe
+_md5_=9fe1c6e6b0407ea30b182cdfbc9bd605
diff --git a/metadata/md5-cache/dev-python/peppercorn-0.4-r1 b/metadata/md5-cache/dev-python/peppercorn-0.4-r1
index d08d2a13200c..f7bba8054884 100644
--- a/metadata/md5-cache/dev-python/peppercorn-0.4-r1
+++ b/metadata/md5-cache/dev-python/peppercorn-0.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/peppercorn/peppercorn-0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=628fdc82e7caf0e0abeb3d3a15565006
+_md5_=92528c7aeccda56a33188bbd04ad0af2
diff --git a/metadata/md5-cache/dev-python/pexpect-2.4-r1 b/metadata/md5-cache/dev-python/pexpect-2.4-r1
index 61f30b53e43e..dfffd2c67387 100644
--- a/metadata/md5-cache/dev-python/pexpect-2.4-r1
+++ b/metadata/md5-cache/dev-python/pexpect-2.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-2.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5db1f535b3f30e481cfdde59e44c5423
+_md5_=9794e3282617cda562371d771ca5137d
diff --git a/metadata/md5-cache/dev-python/pgmagick-0.5.6 b/metadata/md5-cache/dev-python/pgmagick-0.5.6
index e457a1bde686..72eb8902b212 100644
--- a/metadata/md5-cache/dev-python/pgmagick-0.5.6
+++ b/metadata/md5-cache/dev-python/pgmagick-0.5.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgmagick/pgmagick-0.5.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5dd6b8637e14e3b5a65eadf3872f399a
+_md5_=2e9775c9a6298a6541a950aa8ca91623
diff --git a/metadata/md5-cache/dev-python/pip-1.3.1 b/metadata/md5-cache/dev-python/pip-1.3.1
index d59dfe686a93..08886f36378c 100644
--- a/metadata/md5-cache/dev-python/pip-1.3.1
+++ b/metadata/md5-cache/dev-python/pip-1.3.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-1.3.1.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7a4b45b2011f8fc99a9101cf52d574ff
+_md5_=074fc8cc188f3d07bcd267adfae18b6b
diff --git a/metadata/md5-cache/dev-python/pip-1.4 b/metadata/md5-cache/dev-python/pip-1.4
index b70c67fbf09c..f41ecdb5c59a 100644
--- a/metadata/md5-cache/dev-python/pip-1.4
+++ b/metadata/md5-cache/dev-python/pip-1.4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-1.4.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9c80187fc032a027550280af37a834dc
+_md5_=0c9b6988c7d32bd453db1ff9ec833ffb
diff --git a/metadata/md5-cache/dev-python/ply-3.4-r1 b/metadata/md5-cache/dev-python/ply-3.4-r1
index b46a5ca3bf64..115a8d8083e6 100644
--- a/metadata/md5-cache/dev-python/ply-3.4-r1
+++ b/metadata/md5-cache/dev-python/ply-3.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.dabeaz.com/ply/ply-3.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1e9f0a93677f99c176b738b80b125e5f
+_md5_=6064f282e8db4282b32de19f8d538a8b
diff --git a/metadata/md5-cache/dev-python/pmw-1.3.3 b/metadata/md5-cache/dev-python/pmw-1.3.3
index 9bff91792f76..937b95fe8adf 100644
--- a/metadata/md5-cache/dev-python/pmw-1.3.3
+++ b/metadata/md5-cache/dev-python/pmw-1.3.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=py2
 SRC_URI=mirror://sourceforge/pmw/Pmw.1.3.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f6ea708ad9eec37ba8869b5ae0639ce6
+_md5_=bacd5c4325558eed8b818d85e792832f
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.0 b/metadata/md5-cache/dev-python/pmw-2.0.0
index cd42dddfdf25..1b0bbccebbcc 100644
--- a/metadata/md5-cache/dev-python/pmw-2.0.0
+++ b/metadata/md5-cache/dev-python/pmw-2.0.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://sourceforge/pmw/Pmw.2.0.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=16168ed407fa5e92406ab6a987c9ea28
+_md5_=7d0e64e48cff6428c3cc0c50315b32c0
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.1 b/metadata/md5-cache/dev-python/prettytable-0.7.1
index 2bac1fde5c27..e7c659f0d84e 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://prettytable.googlecode.com/files/prettytable-0.7.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=229bab1511c42b1d81b935c2582c52db
+_md5_=4be4d9fc1843b64b8be604580e593e4f
diff --git a/metadata/md5-cache/dev-python/progressbar-2.3-r1 b/metadata/md5-cache/dev-python/progressbar-2.3-r1
index 98e1b3235624..0124fd1c82ed 100644
--- a/metadata/md5-cache/dev-python/progressbar-2.3-r1
+++ b/metadata/md5-cache/dev-python/progressbar-2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://python-progressbar.googlecode.com/files/progressbar-2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b99e1abb83f80dc12f52a118952b9109
+_md5_=8c94ae878bbb8a09993ce62a05cd3eb1
diff --git a/metadata/md5-cache/dev-python/pry-0.2.1-r1 b/metadata/md5-cache/dev-python/pry-0.2.1-r1
index 8e5e9d4ff569..9a4d6d94b773 100644
--- a/metadata/md5-cache/dev-python/pry-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/pry-0.2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pry/pry-0.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=855bbc97147e3e063e5bf6085cebfb09
+_md5_=10d4061806c4f65820de316c771b9bbc
diff --git a/metadata/md5-cache/dev-python/psutil-0.7.1 b/metadata/md5-cache/dev-python/psutil-0.7.1
index 29e455c6eb3b..e7ff0ed39414 100644
--- a/metadata/md5-cache/dev-python/psutil-0.7.1
+++ b/metadata/md5-cache/dev-python/psutil-0.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://psutil.googlecode.com/files/psutil-0.7.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8aead30a216a969847925763355c36ca
+_md5_=4c65f34b924c2115243534708d86c58d
diff --git a/metadata/md5-cache/dev-python/psutil-1.0.0 b/metadata/md5-cache/dev-python/psutil-1.0.0
index 20177d0a9f3d..5903f607a42d 100644
--- a/metadata/md5-cache/dev-python/psutil-1.0.0
+++ b/metadata/md5-cache/dev-python/psutil-1.0.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://psutil.googlecode.com/files/psutil-1.0.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=426f54ac94909a5ebbb26ca3c6e955c2
+_md5_=827f44d1e18cad38ccb6762ef8ee519a
diff --git a/metadata/md5-cache/dev-python/psutil-1.0.1 b/metadata/md5-cache/dev-python/psutil-1.0.1
index 4b0d453b5b5a..b5b5f63f8207 100644
--- a/metadata/md5-cache/dev-python/psutil-1.0.1
+++ b/metadata/md5-cache/dev-python/psutil-1.0.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e258d6560bd10a8b1c5540b9f32893e7
+_md5_=a7152f2a484806194bd33603697b1b38
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 f17dd9257081..55be92aa2d47 100644
--- a/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
+++ b/metadata/md5-cache/dev-python/psycopg-1.1.21-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/egenix-mx-base-2.0.3[python_targets_python2_6(-)?,python_ta
 SLOT=0
 SRC_URI=http://initd.org/pub/software/psycopg/psycopg-1.1.21.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6dc0b4b2a5e7a80c3f94b8adab6f263e
+_md5_=c4edf6142d4c2f48ab5387c58aed077b
diff --git a/metadata/md5-cache/dev-python/psycopg-2.4.6-r1 b/metadata/md5-cache/dev-python/psycopg-2.4.6-r1
index e908564a8c77..d3a2f831cfeb 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.4.6-r1
+++ b/metadata/md5-cache/dev-python/psycopg-2.4.6-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.4.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7f1047ac2bf35f1df1bab0eb88b1e1ba
+_md5_=2a8e93b1cd4b24a57aa55e30bc64bb15
diff --git a/metadata/md5-cache/dev-python/psycopg-2.4.6-r2 b/metadata/md5-cache/dev-python/psycopg-2.4.6-r2
index 4e1ca62583be..3ac01470e40e 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.4.6-r2
+++ b/metadata/md5-cache/dev-python/psycopg-2.4.6-r2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.4.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df224685aedb0848aad152968145dfbf
+_md5_=216133c637ed16289110783c018b7a60
diff --git a/metadata/md5-cache/dev-python/psycopg-2.5 b/metadata/md5-cache/dev-python/psycopg-2.5
index bbbf5fcec636..5a4980f2e3a7 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.5
+++ b/metadata/md5-cache/dev-python/psycopg-2.5
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2109a7ae2b1d65abed44e28e69012db7
+_md5_=3d9980af230b845533f589e91bfa0449
diff --git a/metadata/md5-cache/dev-python/psycopg-2.5.1 b/metadata/md5-cache/dev-python/psycopg-2.5.1
index df3af41d8844..d5cec51f1d7c 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.5.1
+++ b/metadata/md5-cache/dev-python/psycopg-2.5.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8484809bcd2b36c75577668840694275
+_md5_=dd4f13ceb80336f71346edda9a2b56c3
diff --git a/metadata/md5-cache/dev-python/pudb-2012.3-r1 b/metadata/md5-cache/dev-python/pudb-2012.3-r1
index 8189e57a1486..90175bd389ad 100644
--- a/metadata/md5-cache/dev-python/pudb-2012.3-r1
+++ b/metadata/md5-cache/dev-python/pudb-2012.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2012.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fd8a8f6d76f8903225dde64ebe071d7f
+_md5_=071d35b815cb3e3d5858c1e4bff4930d
diff --git a/metadata/md5-cache/dev-python/pudb-2013.1 b/metadata/md5-cache/dev-python/pudb-2013.1
index 0f0b52eebf48..b8bb34f9195e 100644
--- a/metadata/md5-cache/dev-python/pudb-2013.1
+++ b/metadata/md5-cache/dev-python/pudb-2013.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2013.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=437e6b1d12fd0210a429af58e4496aae
+_md5_=30e78fedfe94ff8d95826a96d93d91e5
diff --git a/metadata/md5-cache/dev-python/pudb-2013.2 b/metadata/md5-cache/dev-python/pudb-2013.2
index e691aebd4f3e..09f760647b40 100644
--- a/metadata/md5-cache/dev-python/pudb-2013.2
+++ b/metadata/md5-cache/dev-python/pudb-2013.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2013.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e2625032bb0bc9bdb4bd3398386718d
+_md5_=d5080b82965f5b713ecfd92f6ad4ed4e
diff --git a/metadata/md5-cache/dev-python/pudb-2013.3.2 b/metadata/md5-cache/dev-python/pudb-2013.3.2
index 4c06e608ef51..d97698d2bcd3 100644
--- a/metadata/md5-cache/dev-python/pudb-2013.3.2
+++ b/metadata/md5-cache/dev-python/pudb-2013.3.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2013.3.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=572e2532b68a1bb50363e67cde612f6b
+_md5_=b2fe0b8ef96cd70691a13b3e37e56935
diff --git a/metadata/md5-cache/dev-python/pudb-2013.3.3 b/metadata/md5-cache/dev-python/pudb-2013.3.3
index ac963c66e9a1..d460daeaa1e0 100644
--- a/metadata/md5-cache/dev-python/pudb-2013.3.3
+++ b/metadata/md5-cache/dev-python/pudb-2013.3.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2013.3.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8af69c102dac77c840c5a9d1e3ee8aa1
+_md5_=d9b4e31f681ae2effb5de6cdc15a53f8
diff --git a/metadata/md5-cache/dev-python/pudb-2013.3.4 b/metadata/md5-cache/dev-python/pudb-2013.3.4
index 5162badc9c00..3a3ba16a299b 100644
--- a/metadata/md5-cache/dev-python/pudb-2013.3.4
+++ b/metadata/md5-cache/dev-python/pudb-2013.3.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2013.3.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=297ac4457b8053405df55354077a5a80
+_md5_=2a882a822f9bfc295ecccb5edfb716c8
diff --git a/metadata/md5-cache/dev-python/py-1.4.12-r1 b/metadata/md5-cache/dev-python/py-1.4.12-r1
index d5ab05e067bf..de0aa77aa086 100644
--- a/metadata/md5-cache/dev-python/py-1.4.12-r1
+++ b/metadata/md5-cache/dev-python/py-1.4.12-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.12.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4d43a20165d2230ba79e844c4d4b8108
+_md5_=99671a38f535fe033a643f9ab7ed95c3
diff --git a/metadata/md5-cache/dev-python/py-1.4.13 b/metadata/md5-cache/dev-python/py-1.4.13
index 61add35d92b2..5cfdaa8038a7 100644
--- a/metadata/md5-cache/dev-python/py-1.4.13
+++ b/metadata/md5-cache/dev-python/py-1.4.13
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.13.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e68b4c0365a83b1d7d31f7e99378719d
+_md5_=9ae76387cfbbd0f21933cd7135b1e30f
diff --git a/metadata/md5-cache/dev-python/py-1.4.14 b/metadata/md5-cache/dev-python/py-1.4.14
index a74f4349adda..71c4a7d43f96 100644
--- a/metadata/md5-cache/dev-python/py-1.4.14
+++ b/metadata/md5-cache/dev-python/py-1.4.14
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.14.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=00af7d2a374425797ab53971cc9a4cfe
+_md5_=02d1fc342fd9cc5f560e91955af2f615
diff --git a/metadata/md5-cache/dev-python/py-1.4.15 b/metadata/md5-cache/dev-python/py-1.4.15
index ac6263b12e55..18881f633aa1 100644
--- a/metadata/md5-cache/dev-python/py-1.4.15
+++ b/metadata/md5-cache/dev-python/py-1.4.15
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.15.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2e300cb862ce31a0448beb1336aa1cb0
+_md5_=6348a3d1184c74f651ca329036e2371e
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.0.11 b/metadata/md5-cache/dev-python/py-amqp-1.0.11
index c31690fc0535..eb492f35c78a 100644
--- a/metadata/md5-cache/dev-python/py-amqp-1.0.11
+++ b/metadata/md5-cache/dev-python/py-amqp-1.0.11
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-1.0.11.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=49995232fdc9d0af9ee91388c9c6d42a
+_md5_=a9509299aa450ddd2956d1ef470a8070
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.0.12 b/metadata/md5-cache/dev-python/py-amqp-1.0.12
index 359257351f9e..87e0aacd1322 100644
--- a/metadata/md5-cache/dev-python/py-amqp-1.0.12
+++ b/metadata/md5-cache/dev-python/py-amqp-1.0.12
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-1.0.12.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=91c9125529cc2908ebcec15a9fe29003
+_md5_=286e0d6dc4fb6bd512b4f40ce2ac75bf
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.0.13 b/metadata/md5-cache/dev-python/py-amqp-1.0.13
index 294176828e75..b7f79963e992 100644
--- a/metadata/md5-cache/dev-python/py-amqp-1.0.13
+++ b/metadata/md5-cache/dev-python/py-amqp-1.0.13
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-1.0.13.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a7c2954d34a02fb07aa43f4b141d7e25
+_md5_=d5c0284879cc4dd656deb83d485b1440
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.0.9 b/metadata/md5-cache/dev-python/py-amqp-1.0.9
index 5b72d5ec8258..f0a6142d6011 100644
--- a/metadata/md5-cache/dev-python/py-amqp-1.0.9
+++ b/metadata/md5-cache/dev-python/py-amqp-1.0.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-1.0.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=827943b89ac970dbc240e9ab54800f27
+_md5_=9e18630d8084fdf60770ef6626468693
diff --git a/metadata/md5-cache/dev-python/py-amqp-1.2.1 b/metadata/md5-cache/dev-python/py-amqp-1.2.1
index 0b4f334be058..327cf29f422e 100644
--- a/metadata/md5-cache/dev-python/py-amqp-1.2.1
+++ b/metadata/md5-cache/dev-python/py-amqp-1.2.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-1.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=789a5e31826384ee67d6aadbbb755bfa
+_md5_=456f86ae91ace9582af1c2c175d11b56
diff --git a/metadata/md5-cache/dev-python/py-gnupg-0.3.2-r1 b/metadata/md5-cache/dev-python/py-gnupg-0.3.2-r1
index 415027af4e8f..40ed1643c3c3 100644
--- a/metadata/md5-cache/dev-python/py-gnupg-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/py-gnupg-0.3.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/py-gnupg/GnuPGInterface-0.3.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6847e8d0da8af5bb4d0c3d95ef43e221
+_md5_=2291c24c170fa77ffee681260f0fce1b
diff --git a/metadata/md5-cache/dev-python/pyGPG-9999 b/metadata/md5-cache/dev-python/pyGPG-9999
index 5156f25908a9..5680615b75d4 100644
--- a/metadata/md5-cache/dev-python/pyGPG-9999
+++ b/metadata/md5-cache/dev-python/pyGPG-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=app-crypt/gnupg-2.0.0 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7e95b1ff2e440431dafbcfd27767cb27
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6e1f6ed1d6ba270eae5c471793704461
diff --git a/metadata/md5-cache/dev-python/pyPdf-1.13-r1 b/metadata/md5-cache/dev-python/pyPdf-1.13-r1
index bd41fa3a06dc..1da2304203c1 100644
--- a/metadata/md5-cache/dev-python/pyPdf-1.13-r1
+++ b/metadata/md5-cache/dev-python/pyPdf-1.13-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pybrary.net/pyPdf/pyPdf-1.13.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=75054383df7ce13f4c1ab950583a6ac9
+_md5_=fdbe436f83e7483a439e09621af09dbe
diff --git a/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r1 b/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r1
index 86daea50345f..8645cc91894a 100644
--- a/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r1
+++ b/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r1
@@ -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	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e36a19d1759b3738e9d1bdaddfcd9da7
+_md5_=8eb3f66bdbf39afd377dc8fbf3432c61
diff --git a/metadata/md5-cache/dev-python/pyamg-2.0.5 b/metadata/md5-cache/dev-python/pyamg-2.0.5
index 358086e9e143..586c66b04c3b 100644
--- a/metadata/md5-cache/dev-python/pyamg-2.0.5
+++ b/metadata/md5-cache/dev-python/pyamg-2.0.5
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://pyamg.googlecode.com/files/pyamg-2.0.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b5224f8909e510c56fe0ccafd0214cbf
+_md5_=a9001759295eaded39bb13ef9965b207
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.1.6 b/metadata/md5-cache/dev-python/pyasn1-0.1.6
index 363ed0b8c49d..281b6aab0b3c 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.1.6
+++ b/metadata/md5-cache/dev-python/pyasn1-0.1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.1.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a9139fc5eae2d5e23c88f72ee0ca342
+_md5_=32e6da85c9968c0c5949d0fa930f6356
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.1.7 b/metadata/md5-cache/dev-python/pyasn1-0.1.7
index 1e47b686c674..0e8f250d489a 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.1.7
+++ b/metadata/md5-cache/dev-python/pyasn1-0.1.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1a4c5a438394642a0e5ea89ad8efb79e
+_md5_=37c3788a874acc4256305ebcedecb16a
diff --git a/metadata/md5-cache/dev-python/pycairo-1.10.0-r4 b/metadata/md5-cache/dev-python/pycairo-1.10.0-r4
index 97271f4dc5c2..2304b8f03a6d 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.10.0-r4
+++ b/metadata/md5-cache/dev-python/pycairo-1.10.0-r4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://cairographics.org/releases/py2cairo-1.10.0.tar.bz2 http://cairographics.org/releases/pycairo-1.10.0.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=b07d24d5991e000f4fad66d5f7176bee
+_md5_=df1343cdcd7531fc77983581d88dcc2d
diff --git a/metadata/md5-cache/dev-python/pycountry-0.14.7-r1 b/metadata/md5-cache/dev-python/pycountry-0.14.7-r1
index c403a8a64cfd..39c10b16695c 100644
--- a/metadata/md5-cache/dev-python/pycountry-0.14.7-r1
+++ b/metadata/md5-cache/dev-python/pycountry-0.14.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-0.14.7.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3c5c1b91104ab839454107224cfaddd8
+_md5_=530235c21e010d1fdc0c8ef825cafe41
diff --git a/metadata/md5-cache/dev-python/pycountry-0.14.8 b/metadata/md5-cache/dev-python/pycountry-0.14.8
index 3ef4f25941da..00bfd4bbeee1 100644
--- a/metadata/md5-cache/dev-python/pycountry-0.14.8
+++ b/metadata/md5-cache/dev-python/pycountry-0.14.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-0.14.8.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2c9ee8040a6b4e2f1e7e3d93f3b7f9a3
+_md5_=229290ff395b4b860c1a4df8a6e76ff8
diff --git a/metadata/md5-cache/dev-python/pycparser-2.09.1-r1 b/metadata/md5-cache/dev-python/pycparser-2.09.1-r1
index 532694433284..880033fee17f 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.09.1-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.09.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://bitbucket.org/eliben/pycparser/get/release_v2.09.1.tar.bz2 -> pycparser-2.09.1.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=289bbe5a49b4cf9de3a42fbbefe42836
+_md5_=8fafa9af04c136483e35637df7cdfe4c
diff --git a/metadata/md5-cache/dev-python/pycparser-2.10 b/metadata/md5-cache/dev-python/pycparser-2.10
index 2467e2ebbc1a..f4e23ede525a 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.10
+++ b/metadata/md5-cache/dev-python/pycparser-2.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=4d0e647631b4bc1df3ef6773d354e2f5
+_md5_=fd57e947525cf0a6f3d24f9bd1098a30
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6-r2 b/metadata/md5-cache/dev-python/pycrypto-2.6-r2
index 7e539e078f7d..d8418686147f 100644
--- a/metadata/md5-cache/dev-python/pycrypto-2.6-r2
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e665c02d677b14f2895800a38c036d00
+_md5_=a5d6fa00bc70d4247e7ef2c9cb84bb9d
diff --git a/metadata/md5-cache/dev-python/pycryptopp-0.6.0 b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
index a9fc6fa359e8..d8d955cd8afb 100644
--- a/metadata/md5-cache/dev-python/pycryptopp-0.6.0
+++ b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptopp/pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=5307cdd648efa7e28193d2cc737a9072
+_md5_=27351265213786b3b913dc2ce5bf1e98
diff --git a/metadata/md5-cache/dev-python/pycuda-9999 b/metadata/md5-cache/dev-python/pycuda-9999
index 4d0194628715..caaf33eaa896 100644
--- a/metadata/md5-cache/dev-python/pycuda-9999
+++ b/metadata/md5-cache/dev-python/pycuda-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/boost[python,python_targets_python2_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 RESTRICT=userpriv
 SLOT=0
-_eclasses_=cuda	9be39ddb95b9b07ec931f30628d40757	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cuda	9be39ddb95b9b07ec931f30628d40757	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=39b1c2ef9431bc915b2c13b8b222ea53
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.63 b/metadata/md5-cache/dev-python/pycups-1.9.63
index 59ee7d7bbb40..079e2a8102c5 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.63
+++ b/metadata/md5-cache/dev-python/pycups-1.9.63
@@ -11,4 +11,4 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) |
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.63.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c34cd80f06d9aad97ed5e035f3d95d01
+_md5_=c292edc04f2a7f849477ba2f140cd0a9
diff --git a/metadata/md5-cache/dev-python/pycurl-7.19.0-r2 b/metadata/md5-cache/dev-python/pycurl-7.19.0-r2
index a12b304565a5..737a5b5e7406 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.19.0-r2
+++ b/metadata/md5-cache/dev-python/pycurl-7.19.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pycurl.sourceforge.net/download/pycurl-7.19.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0e5773507f89b40794c6829869e74b4c
+_md5_=48c17690e98b83e8f3dc042b3a45389c
diff --git a/metadata/md5-cache/dev-python/pycurl-7.19.0-r3 b/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
index 5ae0219fe4b3..36e999e1f630 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
+++ b/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=python binding for curl/libcurl
 EAPI=5
 HOMEPAGE=http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-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
+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
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=http://pycurl.sourceforge.net/download/pycurl-7.19.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b957e5706700eb4ff9da705748813e82
+_md5_=a3b151988693770f9b06688c98f65e62
diff --git a/metadata/md5-cache/dev-python/pydns-2.3.6-r1 b/metadata/md5-cache/dev-python/pydns-2.3.6-r1
index 0a828620b468..c3c1ca649476 100644
--- a/metadata/md5-cache/dev-python/pydns-2.3.6-r1
+++ b/metadata/md5-cache/dev-python/pydns-2.3.6-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=http://downloads.sourceforge.net/project/pydns/pydns/pydns-2.3.6/pydns-2.3.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3095ee6c2de79582bef245d889b3ac55
+_md5_=8b375899d0c418da049a8643feb01116
diff --git a/metadata/md5-cache/dev-python/pydns-3.0.2-r1 b/metadata/md5-cache/dev-python/pydns-3.0.2-r1
index 7f41d9bed5cc..08894b8ee261 100644
--- a/metadata/md5-cache/dev-python/pydns-3.0.2-r1
+++ b/metadata/md5-cache/dev-python/pydns-3.0.2-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=http://downloads.sourceforge.net/project/pydns/py3dns/py3dns-3.0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7cc6a3225ed92743731b6e0e6451ea13
+_md5_=0d71cb7dbbc72b06df545c8148676794
diff --git a/metadata/md5-cache/dev-python/pyev-0.8.1 b/metadata/md5-cache/dev-python/pyev-0.8.1
index cb023c99fb1b..ecc41c0a7610 100644
--- a/metadata/md5-cache/dev-python/pyev-0.8.1
+++ b/metadata/md5-cache/dev-python/pyev-0.8.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyev/pyev-0.8.1-4.04.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5292fa20917798b61470120ae5e0495d
+_md5_=d53fecfa42288aa62db31670ad8cc21d
diff --git a/metadata/md5-cache/dev-python/pyfits-3.1.1-r1 b/metadata/md5-cache/dev-python/pyfits-3.1.1-r1
index 3d2dbcaf1d33..a6dbcf6be8e5 100644
--- a/metadata/md5-cache/dev-python/pyfits-3.1.1-r1
+++ b/metadata/md5-cache/dev-python/pyfits-3.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfits/pyfits-3.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6bc11d46c23749f164c555c6c9e9988e
+_md5_=b89faf54dd9a174dd33042eeffb0bf29
diff --git a/metadata/md5-cache/dev-python/pyfits-3.1.2 b/metadata/md5-cache/dev-python/pyfits-3.1.2
index 5695aad1d1b6..88283afcf8ee 100644
--- a/metadata/md5-cache/dev-python/pyfits-3.1.2
+++ b/metadata/md5-cache/dev-python/pyfits-3.1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfits/pyfits-3.1.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b5fdc3aeb501448c26dee43310655fef
+_md5_=068d336f71549e3b80ba7cdfc44a6968
diff --git a/metadata/md5-cache/dev-python/pyflakes-0.7.2 b/metadata/md5-cache/dev-python/pyflakes-0.7.2
index e041655bd2fb..59697334ceb7 100644
--- a/metadata/md5-cache/dev-python/pyflakes-0.7.2
+++ b/metadata/md5-cache/dev-python/pyflakes-0.7.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-0.7.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7c277ef802071ecac9576a34544e1d03
+_md5_=7af2e524978e8294523d2f45db66d273
diff --git a/metadata/md5-cache/dev-python/pyflakes-0.7.3 b/metadata/md5-cache/dev-python/pyflakes-0.7.3
index 473816334e82..94c65527fb77 100644
--- a/metadata/md5-cache/dev-python/pyflakes-0.7.3
+++ b/metadata/md5-cache/dev-python/pyflakes-0.7.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-0.7.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2142bc3ae848540c428fbf9bbe6b69ae
+_md5_=b1d70898de1d1bd7e5842b25b9b78e4c
diff --git a/metadata/md5-cache/dev-python/pyflann-1.8.4 b/metadata/md5-cache/dev-python/pyflann-1.8.4
index 74610e166001..762bc2524c79 100644
--- a/metadata/md5-cache/dev-python/pyflann-1.8.4
+++ b/metadata/md5-cache/dev-python/pyflann-1.8.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip test? ( http://dev.gentoo.org/~bicatali/distfiles/flann-1.8.4-testdata.tar.xz )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=59e44c4f6200afaf5086d20ab93b980c
+_md5_=13834d27c2cb4dafaaba1882af115823
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.0-r1 b/metadata/md5-cache/dev-python/pyfltk-1.3.0-r1
index b223932e86ff..40d2ca680439 100644
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/pyfltk-1.3.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyfltk/pyFltk-1.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f03833e9e30e1d8de563f6b02c9802b6
+_md5_=ce3c66981699e371d837764940c4368c
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1 b/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1
index 10ffc173307b..0ecc1369b994 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://pyftpdlib.googlecode.com/files/pyftpdlib-1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0f689c69844c6c338b5d678688b2bcd5
+_md5_=8bb0200468b33e4c6d86d3d4a328e4dd
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2 b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
index 8b826e97c6a2..abbffa5babde 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
+++ b/metadata/md5-cache/dev-python/pygame-1.9.2_pre20120101-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://people.apache.org/~Arfrever/gentoo/pygame-1.9.2_pre20120101.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d4be5b2a730ba63089517c0420343597
+_md5_=d2caab0be0aa8b26cda4f168a8d51591
diff --git a/metadata/md5-cache/dev-python/pygeocoder-1.1.4 b/metadata/md5-cache/dev-python/pygeocoder-1.1.4
index e95278e1d712..19b810e69b84 100644
--- a/metadata/md5-cache/dev-python/pygeocoder-1.1.4
+++ b/metadata/md5-cache/dev-python/pygeocoder-1.1.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://code.xster.net/pygeocoder/downloads/pygeocoder-1.1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4e5800b6fbb60444e004ba9b92ccc01e
+_md5_=006aa85f2cce5bf685e0c94f0204bf8d
diff --git a/metadata/md5-cache/dev-python/pygit2-0.17.3-r1 b/metadata/md5-cache/dev-python/pygit2-0.17.3-r1
index a3df3daa76ba..30df69d3286f 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.17.3-r1
+++ b/metadata/md5-cache/dev-python/pygit2-0.17.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/libgit2/pygit2/tarball/v0.17.3 -> pygit2-0.17.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=69959e926e2b77f0de868764dec97189
+_md5_=4814aae08d7231e6b60dea71d15d2b8f
diff --git a/metadata/md5-cache/dev-python/pygit2-0.18.1 b/metadata/md5-cache/dev-python/pygit2-0.18.1
index 7b0d00b31fdf..15f3fbea819d 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.18.1
+++ b/metadata/md5-cache/dev-python/pygit2-0.18.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/libgit2/pygit2/archive/v0.18.1.tar.gz -> pygit2-0.18.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ccbe3771184d20a468ea7a1ab19a38c2
+_md5_=81bb562e71a176c40b1a801d93894c48
diff --git a/metadata/md5-cache/dev-python/pygit2-0.19.0 b/metadata/md5-cache/dev-python/pygit2-0.19.0
index 953eb79cac19..e69a392c57ba 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.19.0
+++ b/metadata/md5-cache/dev-python/pygit2-0.19.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/libgit2/pygit2/archive/v0.19.0.tar.gz -> pygit2-0.19.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a2dd6acaf8a35dedb3db0cdea8edfeb6
+_md5_=03485057382fa7195a11b45b1a4c8516
diff --git a/metadata/md5-cache/dev-python/pyglet-1.1.4-r2 b/metadata/md5-cache/dev-python/pyglet-1.1.4-r2
index b82e81f7e84c..5e69da8eebf0 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.1.4-r2
+++ b/metadata/md5-cache/dev-python/pyglet-1.1.4-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pyglet.googlecode.com/files/pyglet-1.1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a17e6eb9803c204d97ad0412e7dbf31d
+_md5_=01c303440130e026417edfe95cc85ca2
diff --git a/metadata/md5-cache/dev-python/pygments-1.5-r1 b/metadata/md5-cache/dev-python/pygments-1.5-r1
index d8585b5d04e1..58105431235e 100644
--- a/metadata/md5-cache/dev-python/pygments-1.5-r1
+++ b/metadata/md5-cache/dev-python/pygments-1.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-1.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7d5f5eb593dbd5627e2db514f183e40
+_md5_=2dfc8bd5986c8fd4a022dde3f2e9418d
diff --git a/metadata/md5-cache/dev-python/pygments-1.6 b/metadata/md5-cache/dev-python/pygments-1.6
index 5768b7a8f813..5b11ab8e21c2 100644
--- a/metadata/md5-cache/dev-python/pygments-1.6
+++ b/metadata/md5-cache/dev-python/pygments-1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-1.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=32c662432dceb356cec4772af4af17bc
+_md5_=6b4b00d5138f1b7c0cdeb042f6e066d2
diff --git a/metadata/md5-cache/dev-python/pygobject-3.2.2-r1 b/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
index 189d85e072da..a6e37f4510a6 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.2/pygobject-3.2.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6947384e9b687a7c997c3ccd3907bec2
+_md5_=5cfb215b84a549996435da199acef413
diff --git a/metadata/md5-cache/dev-python/pygobject-3.4.2-r1 b/metadata/md5-cache/dev-python/pygobject-3.4.2-r1
index b55349a17436..6fe3d2d690bc 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.4.2-r1
+++ b/metadata/md5-cache/dev-python/pygobject-3.4.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.4/pygobject-3.4.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=db1b89e26099487f3f7ae71e5e66dcb5
+_md5_=fb1b79ce015ada702a77cc5f3832d2c1
diff --git a/metadata/md5-cache/dev-python/pygobject-3.8.3 b/metadata/md5-cache/dev-python/pygobject-3.8.3
index 7e6b5cacedf4..74e433a03c94 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.8.3
+++ b/metadata/md5-cache/dev-python/pygobject-3.8.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.8/pygobject-3.8.3.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6c38e74b49c6475d6aff63447a848cf6
+_md5_=06960342f651877660a05bf1a8800085
diff --git a/metadata/md5-cache/dev-python/pyh2o-9999 b/metadata/md5-cache/dev-python/pyh2o-9999
index c5f15907c493..f5b3dfdba60b 100644
--- a/metadata/md5-cache/dev-python/pyh2o-9999
+++ b/metadata/md5-cache/dev-python/pyh2o-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sci-libs/libh2o-0.2.1 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0b7afcda60a0e310e2fda22815ec3dae
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=54d588f49063573af44efaa901741dc1
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.4-r1 b/metadata/md5-cache/dev-python/pyinotify-0.9.4-r1
index 25e2863f46f0..0ee2cb2886d4 100644
--- a/metadata/md5-cache/dev-python/pyinotify-0.9.4-r1
+++ b/metadata/md5-cache/dev-python/pyinotify-0.9.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c4ad729edf1d50aa4982e7baf0fb3a9c
+_md5_=634c2dd914ca3faf9758b651b9eb135a
diff --git a/metadata/md5-cache/dev-python/pylast-0.5.11-r1 b/metadata/md5-cache/dev-python/pylast-0.5.11-r1
index de769c19cdb1..18512a7a68e8 100644
--- a/metadata/md5-cache/dev-python/pylast-0.5.11-r1
+++ b/metadata/md5-cache/dev-python/pylast-0.5.11-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pylast/pylast-0.5.11.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ad8a39f83ffda6a7bccbf28da628ad12
+_md5_=4dda698b25a6e65c1c2f2ded24a57ebd
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.2.3 b/metadata/md5-cache/dev-python/pylibmc-1.2.3
index 71a82fad25d9..e625fe3e3fa4 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.2.3
+++ b/metadata/md5-cache/dev-python/pylibmc-1.2.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pylibmc/pylibmc-1.2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4cd7f853a5004b84d69ca051255763f9
+_md5_=8039a3fad6bedcc3d7a65f6e1055dc82
diff --git a/metadata/md5-cache/dev-python/pylirc-0.0.5-r1 b/metadata/md5-cache/dev-python/pylirc-0.0.5-r1
index b657e61384ab..bfa742ada810 100644
--- a/metadata/md5-cache/dev-python/pylirc-0.0.5-r1
+++ b/metadata/md5-cache/dev-python/pylirc-0.0.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pylirc/pylirc-0.0.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3fd5dec44d9c3cf2be80e5b1c3531d30
+_md5_=334888d1652d3aaa60850d822b5ef6db
diff --git a/metadata/md5-cache/dev-python/pymongo-2.5.2 b/metadata/md5-cache/dev-python/pymongo-2.5.2
index 5103a3e99290..39b95a984246 100644
--- a/metadata/md5-cache/dev-python/pymongo-2.5.2
+++ b/metadata/md5-cache/dev-python/pymongo-2.5.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-2.5.2.tar.gz
 _eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=36c6ae665247515df735b5ee93feb310
+_md5_=cd4d2e75a43a05334a5c065e9c58addc
diff --git a/metadata/md5-cache/dev-python/pymongo-2.6.1 b/metadata/md5-cache/dev-python/pymongo-2.6.1
index 142fc3457278..4f56619fa680 100644
--- a/metadata/md5-cache/dev-python/pymongo-2.6.1
+++ b/metadata/md5-cache/dev-python/pymongo-2.6.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-2.6.1.tar.gz
 _eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=91bd5263c367eb57c902b0fc6275db80
+_md5_=02b7ca115f131748a0f4e2430d7f2bd6
diff --git a/metadata/md5-cache/dev-python/pymountboot-0.2.1 b/metadata/md5-cache/dev-python/pymountboot-0.2.1
index 34cdee2309cd..bc8e0ca5a491 100644
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.1
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/pymountboot/downloads/pymountboot-0.2.1.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4a6faae29e4f8a3a8c4b36f2bc09491a
+_md5_=2e8b5ac767a336e9b1ba870d5f04cebe
diff --git a/metadata/md5-cache/dev-python/pymountboot-0.2.2 b/metadata/md5-cache/dev-python/pymountboot-0.2.2
index 46570a3c8b7c..cbe145e36626 100644
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.2
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/pymountboot/downloads/pymountboot-0.2.2.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4d379daef9bce2d90c3343e2cf99c347
+_md5_=7d8c19d76d3b6b3079f24625442de52c
diff --git a/metadata/md5-cache/dev-python/pymountboot-9999 b/metadata/md5-cache/dev-python/pymountboot-9999
index b8c0fe9cd2b2..88d34ccb2297 100644
--- a/metadata/md5-cache/dev-python/pymountboot-9999
+++ b/metadata/md5-cache/dev-python/pymountboot-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=sys-apps/util-linux-2.20 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f6252f53c28b607c300c928a07912b57
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=372eb17c66f0a4106a11821159dd4cfa
diff --git a/metadata/md5-cache/dev-python/pymssql-1.0.2-r1 b/metadata/md5-cache/dev-python/pymssql-1.0.2-r1
index 847fe45e6c30..2c21863da6d2 100644
--- a/metadata/md5-cache/dev-python/pymssql-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/pymssql-1.0.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/pymssql/pymssql-1.0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=97a1f26fde046aa3b4fb6300942436a6
+_md5_=6fe7a8c97579729f44ef2ae54b449178
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 6a26ffac9b8b..2512bd366701 100644
--- a/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/pynzb-0.1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pynzb/pynzb-0.1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2363cecd5cab166171655c6017295a66
+_md5_=794ccaa426c0c08e2ca0a78f60c4b4ec
diff --git a/metadata/md5-cache/dev-python/pyogg-1.3-r2 b/metadata/md5-cache/dev-python/pyogg-1.3-r2
index 7d2651d431b1..8fb0d8fba34c 100644
--- a/metadata/md5-cache/dev-python/pyogg-1.3-r2
+++ b/metadata/md5-cache/dev-python/pyogg-1.3-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/pyogg-1.3-r1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e82e263a7883faa4215f4a74cb2f90b
+_md5_=b3ece873107e0620562ab43ae5bda132
diff --git a/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1 b/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1
index 3458c6c0484b..67bbdc3018ba 100644
--- a/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1
+++ b/metadata/md5-cache/dev-python/pyopenal-0.1.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/pyopenal/PyOpenAL-0.1.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b91246194c7a3bd314e3b776c8ea9107
+_md5_=22d5ee8286cd198791ef33130ed3273f
diff --git a/metadata/md5-cache/dev-python/pyopencl-9999 b/metadata/md5-cache/dev-python/pyopencl-9999
index 89b728324921..337d282156b5 100644
--- a/metadata/md5-cache/dev-python/pyopencl-9999
+++ b/metadata/md5-cache/dev-python/pyopencl-9999
@@ -7,5 +7,5 @@ IUSE=examples opengl
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.48[python] dev-python/decorator dev-python/numpy dev-python/mako =dev-python/pytools-9999 >=virtual/opencl-0-r1 =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=e0adc037988e8413c65966a67b9db7e2
diff --git a/metadata/md5-cache/dev-python/pyopenssl-0.13-r1 b/metadata/md5-cache/dev-python/pyopenssl-0.13-r1
index ddc71a7e5b82..508b56d443c4 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-0.13-r1
+++ b/metadata/md5-cache/dev-python/pyopenssl-0.13-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) |
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-0.13.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=732b1d291fa4d11358af1f5d71022249
+_md5_=06de3a26de04fdd5847ca34dd026162e
diff --git a/metadata/md5-cache/dev-python/pyorbit-2.24.0-r1 b/metadata/md5-cache/dev-python/pyorbit-2.24.0-r1
index 7622376c6d8b..f1d14843bc11 100644
--- a/metadata/md5-cache/dev-python/pyorbit-2.24.0-r1
+++ b/metadata/md5-cache/dev-python/pyorbit-2.24.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyorbit/2.24/pyorbit-2.24.0.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=656d8a358517d7e845a385b11225e526
+_md5_=d6a88fdaa89cb396173e886e1685c4bb
diff --git a/metadata/md5-cache/dev-python/pypam-0.5.0-r2 b/metadata/md5-cache/dev-python/pypam-0.5.0-r2
index 9489a6ecd01e..202b949de973 100644
--- a/metadata/md5-cache/dev-python/pypam-0.5.0-r2
+++ b/metadata/md5-cache/dev-python/pypam-0.5.0-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=691f0f1660aab3eeefa01f33f2c24c22
+_md5_=6a93009e22a8ea7e64098b67327d24e0
diff --git a/metadata/md5-cache/dev-python/pyparsing-1.5.6-r2 b/metadata/md5-cache/dev-python/pyparsing-1.5.6-r2
index 32fd2bd17a3e..202abc06f9c6 100644
--- a/metadata/md5-cache/dev-python/pyparsing-1.5.6-r2
+++ b/metadata/md5-cache/dev-python/pyparsing-1.5.6-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/pyparsing/pyparsing-1.5.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cd9d8f659af88cd4a74ad4fe52aff76a
+_md5_=dd3cb45b315d3aae723e265349bdfe82
diff --git a/metadata/md5-cache/dev-python/pyparsing-1.5.7 b/metadata/md5-cache/dev-python/pyparsing-1.5.7
index 130fa45df3df..300381246f4b 100644
--- a/metadata/md5-cache/dev-python/pyparsing-1.5.7
+++ b/metadata/md5-cache/dev-python/pyparsing-1.5.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=py2
 SRC_URI=mirror://sourceforge/pyparsing/pyparsing-1.5.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=68f1fc3ba6c42c5f4a3eb25623e7a3a8
+_md5_=a2fe8f081a2a8bd76100301a0e9eca92
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.0.0 b/metadata/md5-cache/dev-python/pyparsing-2.0.0
index 8d8221671ef4..e67d76dd3a3b 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.0.0
+++ b/metadata/md5-cache/dev-python/pyparsing-2.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_2 python_targets_python3_3 )
 SLOT=py3
 SRC_URI=mirror://sourceforge/pyparsing/pyparsing-2.0.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d00307d8ed431e4decb0027cd6a878c5
+_md5_=cbdbc8aac0594e299a6df9c33239e72e
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.0.1 b/metadata/md5-cache/dev-python/pyparsing-2.0.1
index 23241945a535..4a271a8fc58c 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.0.1
+++ b/metadata/md5-cache/dev-python/pyparsing-2.0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/pyparsing/pyparsing-2.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d563692bb4979c282f91a3a17134756c
+_md5_=07953fcf0153338f6b31a18666bb7948
diff --git a/metadata/md5-cache/dev-python/pypax-0.8.1-r1 b/metadata/md5-cache/dev-python/pypax-0.8.1-r1
index 5107f8c00388..e11ed3322e9a 100644
--- a/metadata/md5-cache/dev-python/pypax-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/pypax-0.8.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_6 python_targets_pyt
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/elfix/elfix-0.8.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7d212c01ca02badaa2d5d32dd9b8d488
+_md5_=f1911ff3704946f6601740317d7dffe9
diff --git a/metadata/md5-cache/dev-python/pypax-0.8.3 b/metadata/md5-cache/dev-python/pypax-0.8.3
index da4e9cea537d..01750616da3b 100644
--- a/metadata/md5-cache/dev-python/pypax-0.8.3
+++ b/metadata/md5-cache/dev-python/pypax-0.8.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_6 python_targets_pyt
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/elfix/elfix-0.8.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f3b0413d9f872bfe1a5521c694ea4024
+_md5_=37ca65ae74056fcdb226a73f00631b45
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 db378ecfeeb5..1578dc289602 100644
--- a/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
+++ b/metadata/md5-cache/dev-python/pyprotocols-1.0_pre2306-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/PyProtocols-1.0a0dev_r2306.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3de504c7b5dd746a18c6c9d72a17663d
+_md5_=02d1ccd2e50066a8a98ebcb6f3e591f3
diff --git a/metadata/md5-cache/dev-python/pypy-2.0.2 b/metadata/md5-cache/dev-python/pypy-2.0.2
index 67f98cb7a5a7..b8aa011d2c4a 100644
--- a/metadata/md5-cache/dev-python/pypy-2.0.2
+++ b/metadata/md5-cache/dev-python/pypy-2.0.2
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl dev-libs/expat dev-
 SLOT=2.0
 SRC_URI=mirror://bitbucket/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2
 _eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3c15054be4ab15d7dccab8697846a880
+_md5_=1fbdc804d0adfb6c10e856c6c9aa81b1
diff --git a/metadata/md5-cache/dev-python/pypy-9999 b/metadata/md5-cache/dev-python/pypy-9999
index 8fbe2aeb375b..6bcdec4ff336 100644
--- a/metadata/md5-cache/dev-python/pypy-9999
+++ b/metadata/md5-cache/dev-python/pypy-9999
@@ -9,4 +9,4 @@ PDEPEND=app-admin/python-updater
 RDEPEND=>=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl dev-libs/expat dev-libs/openssl bzip2? ( app-arch/bzip2 ) ncurses? ( sys-libs/ncurses ) sqlite? ( dev-db/sqlite:3 )
 SLOT=2.1
 _eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6f1965d821ad5f8b202aeb337a07d95b
+_md5_=d96918d9667123b29bbbd7586ea6fe42
diff --git a/metadata/md5-cache/dev-python/pypy-bin-2.0.2 b/metadata/md5-cache/dev-python/pypy-bin-2.0.2
index 2ac2c86630a5..f088f3043ba0 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-2.0.2
+++ b/metadata/md5-cache/dev-python/pypy-bin-2.0.2
@@ -12,4 +12,4 @@ REQUIRED_USE=!jit? ( !shadowstack ) x86? ( !sse2? ( !jit !shadowstack ) )
 SLOT=2.0
 SRC_URI=mirror://bitbucket/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2 amd64? ( jit? ( shadowstack? ( http://dev.gentoo.org/~mgorny/dist/pypy-bin/pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz ) ) jit? ( !shadowstack? ( http://dev.gentoo.org/~mgorny/dist/pypy-bin/pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz ) ) !jit? ( !shadowstack? ( http://dev.gentoo.org/~mgorny/dist/pypy-bin/pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz ) ) ) x86? ( sse2? ( jit? ( shadowstack? ( http://dev.gentoo.org/~mgorny/dist/pypy-bin/pypy-bin-2.0.2-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz ) ) jit? ( !shadowstack? ( http://dev.gentoo.org/~mgorny/dist/pypy-bin/pypy-bin-2.0.2-x86+bzip2+jit+ncurses+sse2.tar.xz ) ) !jit? ( !shadowstack? ( http://dev.gentoo.org/~mgorny/dist/pypy-bin/pypy-bin-2.0.2-x86+bzip2+ncurses+sse2.tar.xz ) ) ) !sse2? ( !jit? ( !shadowstack? ( http://dev.gentoo.org/~mgorny/dist/pypy-bin/pypy-bin-2.0.2-x86+bzip2+ncurses.tar.xz ) ) ) )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=421520a82c09434db606a0da65fef05c
+_md5_=2dd44ae73da5d3193c5155109ef2a62c
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 139169e2ec79..b8ac683f0bc5 100644
--- a/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
+++ b/metadata/md5-cache/dev-python/pyqwt-5.2.0-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/qwt:5[svg?] dev-python/PyQt4[python_targets_python2_6(-)?,pytho
 SLOT=5
 SRC_URI=mirror://sourceforge/pyqwt/PyQwt-5.2.0.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b4a1281f3d31b457034991c95ac379d4
+_md5_=0f344aada098ef50c4ed89b5ccdb261f
diff --git a/metadata/md5-cache/dev-python/pyrax-9999 b/metadata/md5-cache/dev-python/pyrax-9999
index dce34c76eb0a..23f3c272d9d0 100644
--- a/metadata/md5-cache/dev-python/pyrax-9999
+++ b/metadata/md5-cache/dev-python/pyrax-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/prettytable >=dev-python/python-novaclient-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rackspace-novaclient[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 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c3fdb0705a9f32a756f3310e843aaef
diff --git a/metadata/md5-cache/dev-python/pyrex-0.9.9-r1 b/metadata/md5-cache/dev-python/pyrex-0.9.9-r1
index fda8093d98c5..7bdb068b4d9c 100644
--- a/metadata/md5-cache/dev-python/pyrex-0.9.9-r1
+++ b/metadata/md5-cache/dev-python/pyrex-0.9.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-0.9.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9986c7e8c74b3eb523ede69fda44f0da
+_md5_=b1ae9bf61f12237b954247917e98e5f7
diff --git a/metadata/md5-cache/dev-python/pyro-3.16-r1 b/metadata/md5-cache/dev-python/pyro-3.16-r1
index 36e0ccb23027..a59c843c6f97 100644
--- a/metadata/md5-cache/dev-python/pyro-3.16-r1
+++ b/metadata/md5-cache/dev-python/pyro-3.16-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=3
 SRC_URI=mirror://pypi/P/Pyro/Pyro-3.16.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cfef05890668e0558e75021c67acfa3c
+_md5_=99b9932e025a30a823073affac551053
diff --git a/metadata/md5-cache/dev-python/pyro-4.17-r1 b/metadata/md5-cache/dev-python/pyro-4.17-r1
index 62b06590048e..bde20ac49bc6 100644
--- a/metadata/md5-cache/dev-python/pyro-4.17-r1
+++ b/metadata/md5-cache/dev-python/pyro-4.17-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.17.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=98a2d3b437ab908e3885c7d830ef5567
+_md5_=4c3f9617614de9b997b667262d07d4e0
diff --git a/metadata/md5-cache/dev-python/pyro-4.20 b/metadata/md5-cache/dev-python/pyro-4.20
index 0f815c93f194..5be155375b23 100644
--- a/metadata/md5-cache/dev-python/pyro-4.20
+++ b/metadata/md5-cache/dev-python/pyro-4.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-python/pyro:0 dev-python/serpent[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( dev-python/coverage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] ) python_targets_python3_1? ( dev-python/unittest2[python_targets_python3_1] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DEPEND=!dev-python/pyro:0 dev-python/serpent[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( dev-python/coverage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Advanced and powerful Distributed Object Technology system written entirely in Python
 EAPI=5
 HOMEPAGE=http://www.xs4all.nl/~irmen/pyro/ http://pypi.python.org/pypi/Pyro4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.20.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=98414a6a5ec64a10ab681a6a37ece8b6
+_md5_=eced947bb2eff2376dd73a2ab0433b93
diff --git a/metadata/md5-cache/dev-python/pysctp-0.6 b/metadata/md5-cache/dev-python/pysctp-0.6
index 373200d64bc2..bb7ac31a3b61 100644
--- a/metadata/md5-cache/dev-python/pysctp-0.6
+++ b/metadata/md5-cache/dev-python/pysctp-0.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/philpraxis/pysctp/archive/v0.6.tar.gz -> pysctp-0.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c812e239a5ed1653e931a0a79e4a5999
+_md5_=5aec744f4c16a3322cb2980657bafe42
diff --git a/metadata/md5-cache/dev-python/pyserial-2.6-r1 b/metadata/md5-cache/dev-python/pyserial-2.6-r1
index 6ef63a9d9253..499f918843c7 100644
--- a/metadata/md5-cache/dev-python/pyserial-2.6-r1
+++ b/metadata/md5-cache/dev-python/pyserial-2.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e37dfea50318e083686beea268c75178
+_md5_=f9e5ab29f6391d3d2d39e86bbd4213d3
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.2.2-r1 b/metadata/md5-cache/dev-python/pysnmp-4.2.2-r1
index 9f35b5c51e0b..452739935e4b 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.2.2-r1
+++ b/metadata/md5-cache/dev-python/pysnmp-4.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.2.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c74a03e979b259bd908fd5cbd59c1fae
+_md5_=48b552efeb7f0f914274f3f451fd063b
diff --git a/metadata/md5-cache/dev-python/pysvn-1.7.7 b/metadata/md5-cache/dev-python/pysvn-1.7.7
index 6836cc97faf0..6cc6f8987a98 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.7.7
+++ b/metadata/md5-cache/dev-python/pysvn-1.7.7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8ab7f1a3fe0d93a1734175ab6e2fb064
+_md5_=eafbd14b240af10e0f65259ee4585fe3
diff --git a/metadata/md5-cache/dev-python/pysvn-1.7.8 b/metadata/md5-cache/dev-python/pysvn-1.7.8
index 9bd34b54cb1b..728bde54b7d2 100644
--- a/metadata/md5-cache/dev-python/pysvn-1.7.8
+++ b/metadata/md5-cache/dev-python/pysvn-1.7.8
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b5ccc46b9b8de3701da48594f315654a
+_md5_=5478a6b834511f5adcfe23a7cb82190b
diff --git a/metadata/md5-cache/dev-python/pytest-2.3.4 b/metadata/md5-cache/dev-python/pytest-2.3.4
index cfcd0eefc7d5..2a45fdb9ac4d 100644
--- a/metadata/md5-cache/dev-python/pytest-2.3.4
+++ b/metadata/md5-cache/dev-python/pytest-2.3.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-2.3.4.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d489169629f941201251b8f91a4a5d6b
+_md5_=387d4c53efc14a63e9b32b80f2884c9d
diff --git a/metadata/md5-cache/dev-python/pytest-2.3.5 b/metadata/md5-cache/dev-python/pytest-2.3.5
index 1ab188850ed2..f5b5a19b6cef 100644
--- a/metadata/md5-cache/dev-python/pytest-2.3.5
+++ b/metadata/md5-cache/dev-python/pytest-2.3.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-2.3.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=509be6ade506e42032ff5b8f9ce616a9
+_md5_=36509b54e908f0dcda0f48f25957bd4a
diff --git a/metadata/md5-cache/dev-python/pytest-runner-1.1-r1 b/metadata/md5-cache/dev-python/pytest-runner-1.1-r1
index cc24546739ed..8901dd52d7f7 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-1.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-runner-1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-1.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bfc5ba8cfe8a09e2b4b7c156b78ee0ab
+_md5_=ce3220c82a92fe6005df9bedfc9bba08
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.1-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.1-r1
index 47c91a18e036..e108e8252e59 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.1-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d530a9e6b75a651f5025c5aa7d1a2788
+_md5_=5109ecb5708bd30c2e1ab525c3af94e2
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.21_p2 b/metadata/md5-cache/dev-python/python-debian-0.1.21_p2
index 273559a2e5d7..6b242cb2f2e5 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.21_p2
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.21_p2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.21+nmu2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=46157db0f52568a5c35ab83b5df8505b
+_md5_=36b88b2b96d565342e40c8770f8115a0
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 58317e155493..6f2a5f7f1de6 100644
--- a/metadata/md5-cache/dev-python/python-digest-1.7-r1
+++ b/metadata/md5-cache/dev-python/python-digest-1.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-digest/python-digest-1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2d6e8817b744cde78fc4079c6f0731a6
+_md5_=4e2a62cb5927973a945b47438af344e3
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.33-r1 b/metadata/md5-cache/dev-python/python-distutils-extra-2.33-r1
index a989c360dfc5..193cc7bcc5d6 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.33-r1
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.33-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://launchpad.net/python-distutils-extra/trunk/2.33/+download/python-distutils-extra-2.33.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f4bb85fcd06bbf39202dc81a32ea323e
+_md5_=89c7e5d8d6cb4b34f01fb65fafb8a741
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.37-r1 b/metadata/md5-cache/dev-python/python-distutils-extra-2.37-r1
index 3b6450b48160..bbd9dd7d3011 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.37-r1
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.37-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://launchpad.net/python-distutils-extra/trunk/2.37/+download/python-distutils-extra-2.37.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d201316825c3bd075657c3ab8c9bf24b
+_md5_=dab77dc98c897d583636eaac9fd1b22e
diff --git a/metadata/md5-cache/dev-python/python-exec-9999 b/metadata/md5-cache/dev-python/python-exec-9999
index 4dbb0cf9f09d..25bb265d7476 100644
--- a/metadata/md5-cache/dev-python/python-exec-9999
+++ b/metadata/md5-cache/dev-python/python-exec-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
 IUSE=python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy2_0 python_targets_python3_2 python_targets_python3_3 python_targets_python2_6 python_targets_python2_7
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63e4a3760ba5d661149e8326ce08f049
diff --git a/metadata/md5-cache/dev-python/python-gflags-2.0 b/metadata/md5-cache/dev-python/python-gflags-2.0
index 34e36528b20b..8b56855c3ab7 100644
--- a/metadata/md5-cache/dev-python/python-gflags-2.0
+++ b/metadata/md5-cache/dev-python/python-gflags-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://python-gflags.googlecode.com/files/python-gflags-2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f656fad3490fa281070173d45de48e22
+_md5_=24986461650ea3e624df548d1b688bfb
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1 b/metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1
index 9cd28192e1c5..82c92da067f5 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://python-gnupg.googlecode.com/files/python-gnupg-0.3.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e5a6b8415c0868be98ec4b738721eb43
+_md5_=7d82e721212b0bf4d8e1e3f417a61882
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.3.2 b/metadata/md5-cache/dev-python/python-gnupg-0.3.2
index 157108f7c087..2a6bf2c672ca 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.3.2
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.3.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://python-gnupg.googlecode.com/files/python-gnupg-0.3.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e30ce8ee58ca935d399a4c29ade3bc1f
+_md5_=aa900b56a31e14769ee49f6822ccca7e
diff --git a/metadata/md5-cache/dev-python/python-heatclient-9999 b/metadata/md5-cache/dev-python/python-heatclient-9999
index da6d9b796a86..f591b3cba6a3 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-9999
+++ b/metadata/md5-cache/dev-python/python-heatclient-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/d2to1-0.2.10[python_targets_python2_7(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0b25b19c0e0a659179f1d006b68b5d91
diff --git a/metadata/md5-cache/dev-python/python-irclib-0.4.8-r1 b/metadata/md5-cache/dev-python/python-irclib-0.4.8-r1
index 007bf7d1c734..9d2c1f3bd385 100644
--- a/metadata/md5-cache/dev-python/python-irclib-0.4.8-r1
+++ b/metadata/md5-cache/dev-python/python-irclib-0.4.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/python-irclib/python-irclib-0.4.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0eb484c4a7ad9d89d423a8aff34c81f4
+_md5_=af353bf222fe95fcc950f983c4412a37
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-9999 b/metadata/md5-cache/dev-python/python-keystoneclient-9999
index df586779dc3c..91379c25a024 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-9999
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/iso8601[python_targets_python2_7(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6879c642f0b36fe06f6bb82e22e33bd1
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1 b/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1
index 0528cbe22679..9e577405a9ba 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=112925b40824faab4f2b596970310496
+_md5_=e03195a871983b8fd62712917e803149
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.12 b/metadata/md5-cache/dev-python/python-ldap-2.4.12
index b6f4bdfa9ff5..dd54b71da85a 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.12
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.12
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.12.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f9e629f9ef593099bc372ca4222d9ceb
+_md5_=64894f3676c3393faf32e9d3ba07120e
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.13 b/metadata/md5-cache/dev-python/python-ldap-2.4.13
index 69f9ab26bbc5..00dbacd74a0e 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.13
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.13
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.13.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f6a641762006ef37fe16064d10b65319
+_md5_=779551c4eb1cae3e29d5f16ffb9315b5
diff --git a/metadata/md5-cache/dev-python/python-ldap-9999 b/metadata/md5-cache/dev-python/python-ldap-9999
index b1ae05a08bdf..12242a1ef735 100644
--- a/metadata/md5-cache/dev-python/python-ldap-9999
+++ b/metadata/md5-cache/dev-python/python-ldap-9999
@@ -9,5 +9,5 @@ RDEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1[python_targets_python2_6(-)?,py
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b820f0338447ff31b20ae58ec609f2e5
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d5cc3adaf1bb777adac46a9bd76f336d
diff --git a/metadata/md5-cache/dev-python/python-levenshtein-0.10.2-r1 b/metadata/md5-cache/dev-python/python-levenshtein-0.10.2-r1
index ca83ca70755f..68950878dd8d 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.10.2-r1
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.10.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.10.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c6894c07edeb7937abd6f0d16afecc41
+_md5_=a042fb6efb81285623de2eb66f8eab6b
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6 b/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
index dd5fb7e870b7..7ffdca3b378f 100644
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
+++ b/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/python-linux-procfs-0.4.6.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0cea8e1f695020b1af5b52c765eef570
+_md5_=f26d637065908ae0fe45b3ab842d56a6
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-9999 b/metadata/md5-cache/dev-python/python-linux-procfs-9999
index 17d074855827..9a6da0a71710 100644
--- a/metadata/md5-cache/dev-python/python-linux-procfs-9999
+++ b/metadata/md5-cache/dev-python/python-linux-procfs-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=76784aa5e76664d8ed49874d6a1e60ab
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a28450f0c84e908b68600013a6a995b3
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.3 b/metadata/md5-cache/dev-python/python-magic-0.4.3
index db3e0d8ef2b6..300c08d31aa4 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.3
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-magic/python-magic-0.4.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5f35cc4d8f325b680591a7b9f4fdae5b
+_md5_=b06f7b29156c6df3131eac03434b0060
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.48-r1 b/metadata/md5-cache/dev-python/python-memcached-1.48-r1
index 480e2d2fc014..b6dc682eb7da 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.48-r1
+++ b/metadata/md5-cache/dev-python/python-memcached-1.48-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=ftp://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.48.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e3237c57aafb572f09cd4affb7efec6d
+_md5_=679e743e5ddf01ca13aed3e1b581b5b1
diff --git a/metadata/md5-cache/dev-python/python-mhash-1.4-r1 b/metadata/md5-cache/dev-python/python-mhash-1.4-r1
index 4ed6dc494700..833aa3358c92 100644
--- a/metadata/md5-cache/dev-python/python-mhash-1.4-r1
+++ b/metadata/md5-cache/dev-python/python-mhash-1.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mhash/python-mhash-1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7efcb73d01269176ae18c0a805a98c16
+_md5_=5eeefc13d73b1b68eb8db19f85d5b51e
diff --git a/metadata/md5-cache/dev-python/python-mpd-0.4.6 b/metadata/md5-cache/dev-python/python-mpd-0.4.6
index 10852341e514..22e3a90d7a9f 100644
--- a/metadata/md5-cache/dev-python/python-mpd-0.4.6
+++ b/metadata/md5-cache/dev-python/python-mpd-0.4.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/Mic92/python-mpd2/tarball/v0.4.6 -> python-mpd-0.4.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=0703f19ae8571528703d3e7caf94a4ea
+_md5_=deea51b4bb317a42de2fafa7326bb080
diff --git a/metadata/md5-cache/dev-python/python-mpd-0.5.1 b/metadata/md5-cache/dev-python/python-mpd-0.5.1
index f9ae5f5cef46..78e7814acc54 100644
--- a/metadata/md5-cache/dev-python/python-mpd-0.5.1
+++ b/metadata/md5-cache/dev-python/python-mpd-0.5.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/Mic92/python-mpd2/archive/v0.5.1.tar.gz -> python-mpd-0.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=b94dd32e268522f427efd7be9b0dba7b
+_md5_=d7ac57cfb2f3635d85ecc4a997d10823
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 e515297351c0..d3a53c72c85d 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/python-musicbrainz2-0.7.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5d81d85f823105df3d09fe2cb4f6698e
+_md5_=2fcd057c7c978c14ee0113d0032cd9ea
diff --git a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.4 b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.4
index 444b1a2805f3..d6408ea29d82 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.4
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/alastair/python-musicbrainz-ngs/tarball/v0.4 -> python-musicbrainz-ngs-0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=a1ce167909418f1af32fff56bfee028d
+_md5_=cef3220d2f5eea1abaa0a921653085b1
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-2.3.0 b/metadata/md5-cache/dev-python/python-neutronclient-2.3.0
new file mode 100644
index 000000000000..c2460e476a11
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-neutronclient-2.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A client for the OpenStack Quantum API
+EAPI=5
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=virtual/python-argparse[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/cliff-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-2.3.0.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=71100ca5d51f36b7a1f09599f1c1a1e7
diff --git a/metadata/md5-cache/dev-python/python-novaclient-9999 b/metadata/md5-cache/dev-python/python-novaclient-9999
index 186768885843..ab3940124e3d 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-9999
+++ b/metadata/md5-cache/dev-python/python-novaclient-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/httplib2 dev-python/prettytable dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4d3096a4345c3239acaaa6abcf5bf90b
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 c614701dd90f..582f9f3e5b47 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/python-openid-2.2.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f24dd76c931c7b7e741d1ef0209ca6bb
+_md5_=0866e205d5837a9e1ff008d958e7a260
diff --git a/metadata/md5-cache/dev-python/python-pam-0.1.4 b/metadata/md5-cache/dev-python/python-pam-0.1.4
index 3151e1237fa2..b8ce6836bf7b 100644
--- a/metadata/md5-cache/dev-python/python-pam-0.1.4
+++ b/metadata/md5-cache/dev-python/python-pam-0.1.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pam/pam-0.1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e76f3d1eb22e08b4480b3e29081c6a3c
+_md5_=3493a1721e3d5816b39e27f0ea43fffc
diff --git a/metadata/md5-cache/dev-python/python-tvrage-0.4.1 b/metadata/md5-cache/dev-python/python-tvrage-0.4.1
index 10cc3fbce600..649202c4ca10 100644
--- a/metadata/md5-cache/dev-python/python-tvrage-0.4.1
+++ b/metadata/md5-cache/dev-python/python-tvrage-0.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-tvrage/python-tvrage-0.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=248629e432cb31383bc5a40e8ee1949b
+_md5_=9ca3f29042b5a7e5f05bd4e4932e55c0
diff --git a/metadata/md5-cache/dev-python/python-twitter-1.0 b/metadata/md5-cache/dev-python/python-twitter-1.0
index b4a46f1fc424..c1a501336bfe 100644
--- a/metadata/md5-cache/dev-python/python-twitter-1.0
+++ b/metadata/md5-cache/dev-python/python-twitter-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://python-twitter.googlecode.com/files/python-twitter-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e60843d7aa3d0cd6820a3b3707d4d10e
+_md5_=3fe1cb3223cf21e97ff385e4e1a9d02a
diff --git a/metadata/md5-cache/dev-python/python-uinput-0.9 b/metadata/md5-cache/dev-python/python-uinput-0.9
index ee51c8916f38..54c3ba3672a5 100644
--- a/metadata/md5-cache/dev-python/python-uinput-0.9
+++ b/metadata/md5-cache/dev-python/python-uinput-0.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/python-uinput/python-uinput-0.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=758aec6dc91ef0dcc483426c18eee783
+_md5_=538a2c33d6c461a7baefa5330b090cc7
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2 b/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2
index f083729d125a..84e2ca1e1163 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2
+++ b/metadata/md5-cache/dev-python/python-xlib-0.15_rc1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/python-xlib/python-xlib-0.15rc1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4aa783389127e41ca63134a30c83cee4
+_md5_=151efcb3f0cc049eca1d92245d7446b6
diff --git a/metadata/md5-cache/dev-python/pytools-2012.1 b/metadata/md5-cache/dev-python/pytools-2012.1
index abb6b9372ede..7f63edb1ce6f 100644
--- a/metadata/md5-cache/dev-python/pytools-2012.1
+++ b/metadata/md5-cache/dev-python/pytools-2012.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2012.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d72cb0e2f6fb72590bbd85a606e72026
+_md5_=b06a6778bf2f3bae0d8d6f2999e386fc
diff --git a/metadata/md5-cache/dev-python/pytools-2013.1 b/metadata/md5-cache/dev-python/pytools-2013.1
index 77456346f7df..cb59bd1621c4 100644
--- a/metadata/md5-cache/dev-python/pytools-2013.1
+++ b/metadata/md5-cache/dev-python/pytools-2013.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2013.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3d7a619df44e884b7e5ff8d07bf5774b
+_md5_=d4630195452bb66129c9dcd2fa6c9765
diff --git a/metadata/md5-cache/dev-python/pytools-2013.2 b/metadata/md5-cache/dev-python/pytools-2013.2
index c884b88dd390..17d1bffac022 100644
--- a/metadata/md5-cache/dev-python/pytools-2013.2
+++ b/metadata/md5-cache/dev-python/pytools-2013.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2013.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8117b3d7a21f3676197a87dee07bc3e9
+_md5_=e1550e9b6db5041abac739e2ab32c53d
diff --git a/metadata/md5-cache/dev-python/pytools-2013.5 b/metadata/md5-cache/dev-python/pytools-2013.5
index 8adf5f4d5456..b3bc9aefb666 100644
--- a/metadata/md5-cache/dev-python/pytools-2013.5
+++ b/metadata/md5-cache/dev-python/pytools-2013.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2013.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9e489f865dd1c111f6712f61a2329006
+_md5_=e93429fb7adead1626117031aa7bac03
diff --git a/metadata/md5-cache/dev-python/pytools-2013.5.3 b/metadata/md5-cache/dev-python/pytools-2013.5.3
index 61ef587569e9..206d3f6afedf 100644
--- a/metadata/md5-cache/dev-python/pytools-2013.5.3
+++ b/metadata/md5-cache/dev-python/pytools-2013.5.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2013.5.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0a0ab4386ae59fd23ff93e0315173534
+_md5_=7c139361056bdc27247351286803e948
diff --git a/metadata/md5-cache/dev-python/pytools-2013.5.5 b/metadata/md5-cache/dev-python/pytools-2013.5.5
index d7590e749891..b1262c90b9fd 100644
--- a/metadata/md5-cache/dev-python/pytools-2013.5.5
+++ b/metadata/md5-cache/dev-python/pytools-2013.5.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2013.5.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f18a5e10f37f4475aeab3883b9977752
+_md5_=348686a8aa8032589ec8ecaf2254bde5
diff --git a/metadata/md5-cache/dev-python/pytools-2013.5.6 b/metadata/md5-cache/dev-python/pytools-2013.5.6
index c5eb2e932638..4fce74a1aed8 100644
--- a/metadata/md5-cache/dev-python/pytools-2013.5.6
+++ b/metadata/md5-cache/dev-python/pytools-2013.5.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2013.5.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9f196d77fd6e86d9f85848e128fef13d
+_md5_=bfda5b4a3d46c72fd6f29c30af972696
diff --git a/metadata/md5-cache/dev-python/pytools-9999 b/metadata/md5-cache/dev-python/pytools-9999
index 537f64d3dfd1..835c362c8f13 100644
--- a/metadata/md5-cache/dev-python/pytools-9999
+++ b/metadata/md5-cache/dev-python/pytools-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=735b1e18393262540d08062b7accf355
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0170a314680ef7e9b48e1f7e59824328
diff --git a/metadata/md5-cache/dev-python/pytz-2012j b/metadata/md5-cache/dev-python/pytz-2012j
index d3d8dc392861..e40537817b21 100644
--- a/metadata/md5-cache/dev-python/pytz-2012j
+++ b/metadata/md5-cache/dev-python/pytz-2012j
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2012j.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9fc72710bd27cee4bcd67d9ffab10362
+_md5_=b78a54fa4ba226f8bd3017c8f39bccc8
diff --git a/metadata/md5-cache/dev-python/pytz-2013b b/metadata/md5-cache/dev-python/pytz-2013b
index 91f41794513d..9c4a8b592ad2 100644
--- a/metadata/md5-cache/dev-python/pytz-2013b
+++ b/metadata/md5-cache/dev-python/pytz-2013b
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2013b.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42c0f44b4188c739196f31a2e33b9adc
+_md5_=9e29181773c376b628d3ed1e9f7852d7
diff --git a/metadata/md5-cache/dev-python/pyvorbis-1.4-r4 b/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
index 6bb188830425..6b2ebb6b7d5b 100644
--- a/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
+++ b/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://ekyo.nerim.net/software/pyogg/pyvorbis-1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=25bc51a7a4325a416d2ead0ddb36875d
+_md5_=6ed38ff28af8341336e5b0cddfaf1b94
diff --git a/metadata/md5-cache/dev-python/pyx-0.12.1-r1 b/metadata/md5-cache/dev-python/pyx-0.12.1-r1
index 490b5f708c33..5e4fea59df22 100644
--- a/metadata/md5-cache/dev-python/pyx-0.12.1-r1
+++ b/metadata/md5-cache/dev-python/pyx-0.12.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/pyx/PyX-0.12.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=509fef495f6cf21a15506f547bf06e7f
+_md5_=43d003d138c42655bd78a7adeb92fd82
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1 b/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1
index b32d67c03510..187a1fff7dd7 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyxattr/pyxattr-0.5.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=51e3a4c07e3a2047241b908d1e32acbb
+_md5_=8720cd447d93e5e0045ccbfb7c16a28a
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.1 b/metadata/md5-cache/dev-python/pyxattr-0.5.1
index 27ad6a8aa991..8bc544117e48 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=01c2e99b3747f63d9725526c23c58b58
+_md5_=d872803e70515dbe2123fcfb1fbddbfa
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.2 b/metadata/md5-cache/dev-python/pyxattr-0.5.2
index 340b22503ae7..02a5b7bb7b26 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.2
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.5.2.tar.gz http://pyxattr.k1024.org/downloads/pyxattr-0.5.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6743cecb31d843d19bc9fd8262bbb3e2
+_md5_=504750cf7cf39b7a631ef487305d7693
diff --git a/metadata/md5-cache/dev-python/pyxattr-9999 b/metadata/md5-cache/dev-python/pyxattr-9999
index ea7189e8ccd2..06cf377457d5 100644
--- a/metadata/md5-cache/dev-python/pyxattr-9999
+++ b/metadata/md5-cache/dev-python/pyxattr-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/attr python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy2_0 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=63fae865359d15f6a6665714e7711c01
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=48e8a5b6012d9bb2fb5221e0e2a7a6c5
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.25 b/metadata/md5-cache/dev-python/pyxdg-0.25
index e0acd4aa07d5..02452fa0e673 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.25
+++ b/metadata/md5-cache/dev-python/pyxdg-0.25
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~takluyver/pyxdg-0.25.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2321a29a5977596111d8c04c5b559dee
+_md5_=100e376be94c87f817769bd903e6a7ef
diff --git a/metadata/md5-cache/dev-python/pyxml-0.8.4-r3 b/metadata/md5-cache/dev-python/pyxml-0.8.4-r3
index 12a2e9693d55..c6cb9406969f 100644
--- a/metadata/md5-cache/dev-python/pyxml-0.8.4-r3
+++ b/metadata/md5-cache/dev-python/pyxml-0.8.4-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyxml/PyXML-0.8.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=80d8e95c64e5d0ed1432e014f0091058
+_md5_=f6c81d0a6987b77222d49d74a157df21
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.10-r1 b/metadata/md5-cache/dev-python/pyyaml-3.10-r1
index c8c44e383a09..92d416d8daee 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.10-r1
+++ b/metadata/md5-cache/dev-python/pyyaml-3.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://pyyaml.org/download/pyyaml/PyYAML-3.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fa7a40482fc28c19e791ade4beb80908
+_md5_=e0372c63b43e3f507f4316cd81c22f3a
diff --git a/metadata/md5-cache/dev-python/pyzmq-13.1.0 b/metadata/md5-cache/dev-python/pyzmq-13.1.0
index ef3013ab3e8e..5a970404214f 100644
--- a/metadata/md5-cache/dev-python/pyzmq-13.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-13.1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( !arm ) || ( python_targets_python2_6 python_targets_python2
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-13.1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=53b84733cf4ce0226bbed6f919e45d6a
+_md5_=e3c40e7c39dbf44e003fc6308100a12d
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 1eac345b2036..a46e4343de69 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-2.2.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=53a9fa3dda4478d09a56b6f791b308f6
+_md5_=2a38a39697ab2762d2f8869c2837a79a
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.7.1 b/metadata/md5-cache/dev-python/qscintilla-python-2.7.1
index f216de074454..5490c25d2845 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.7.1
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.7.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a4eab13f5413625521fd04a859c91264
+_md5_=9561af19946fa14a49b7f24d5ff11faa
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.7.2 b/metadata/md5-cache/dev-python/qscintilla-python-2.7.2
index 116de215f6fa..089ccdb5443c 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.7.2
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Qscintilla
 EAPI=5
 HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
 IUSE=debug python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/sip-4.12:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/PyQt4-4.8[X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.7.2:=
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.7.2.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=35c7b787012426b30fc01c1b751ae8a9
+_md5_=b11c43fb7db56e86f76e82fadea253d3
diff --git a/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.0 b/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.0
index 43723515ef47..042c300ed62b 100644
--- a/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.0
+++ b/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-auth-openstack/rackspace-auth-openstack-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2bee7972655443f39f35da8d942fb7c2
+_md5_=e9da9ce14b68de61d757b9fe213b8790
diff --git a/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999 b/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
index c2ce335f7957..1109ff63bccc 100644
--- a/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
+++ b/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9223ec68c66760d9378764ee4bd9b315
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=64029c9f70f53f0fd3f8ffc1f3ed7ca3
diff --git a/metadata/md5-cache/dev-python/rackspace-novaclient-9999 b/metadata/md5-cache/dev-python/rackspace-novaclient-9999
index 6dc78f233597..6b1bcfb52c17 100644
--- a/metadata/md5-cache/dev-python/rackspace-novaclient-9999
+++ b/metadata/md5-cache/dev-python/rackspace-novaclient-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/python-novaclient[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rackspace-auth-openstack[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/os-diskconfig-python-novaclient-ext[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rax-backup-schedule-python-novaclient-ext[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/os-networksv2-python-novaclient-ext[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/rax-default-network-flags-python-novaclient-ext[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a7f6cd06e7d4217d6958686e6ea68e97
diff --git a/metadata/md5-cache/dev-python/rarfile-2.6 b/metadata/md5-cache/dev-python/rarfile-2.6
index 5b117abd5d3a..337cbcaeaf49 100644
--- a/metadata/md5-cache/dev-python/rarfile-2.6
+++ b/metadata/md5-cache/dev-python/rarfile-2.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/rarfile/rarfile-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=82509842c35bea83a2f0f093f7118064
+_md5_=8b716d53ebdb690ba60001068db9821d
diff --git a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-9999 b/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-9999
index d7e93cff4333..fb749d9aee69 100644
--- a/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-9999
+++ b/metadata/md5-cache/dev-python/rax-backup-schedule-python-novaclient-ext-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9b9425bf0f0aba226462078d2eb4af25
diff --git a/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-9999 b/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-9999
index bdd31253d00c..67051cbc4a22 100644
--- a/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-9999
+++ b/metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=24ded36e7d2ae41ba1f0ad1829edd506
diff --git a/metadata/md5-cache/dev-python/rdflib-3.2.3-r1 b/metadata/md5-cache/dev-python/rdflib-3.2.3-r1
index 17bd0d5939b9..9224de718d37 100644
--- a/metadata/md5-cache/dev-python/rdflib-3.2.3-r1
+++ b/metadata/md5-cache/dev-python/rdflib-3.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-3.2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=020e95593063307476723a1b23bcc936
+_md5_=739c0875f237a7326df63572f3daeb46
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 754646e25899..1bc961acff1b 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/recaptcha-client/recaptcha-client-1.0.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2f73e3b52ad11b40af168a587d506b38
+_md5_=eb733630ce508aa75d6b247a53d03bec
diff --git a/metadata/md5-cache/dev-python/redis-py-2.7.2-r1 b/metadata/md5-cache/dev-python/redis-py-2.7.2-r1
index 0213774e447e..d094072e01b0 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.7.2-r1
+++ b/metadata/md5-cache/dev-python/redis-py-2.7.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.7.2.tar.gz -> redis-py-2.7.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=39c2c67cb5a5b40e09550b3b9d2c0367
+_md5_=d9bf264399cf5332d4204dac8c97e2af
diff --git a/metadata/md5-cache/dev-python/redis-py-2.7.4 b/metadata/md5-cache/dev-python/redis-py-2.7.4
index 932b2c6f10d0..6bbd73bcd016 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.7.4
+++ b/metadata/md5-cache/dev-python/redis-py-2.7.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.7.4.tar.gz -> redis-py-2.7.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e5bfb2318e900862fd4ace57ba747721
+_md5_=2dfab14b1221b109e9b316bb47fbd061
diff --git a/metadata/md5-cache/dev-python/redis-py-2.7.5 b/metadata/md5-cache/dev-python/redis-py-2.7.5
index 1ba72db364c3..b3684949ac1f 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.7.5
+++ b/metadata/md5-cache/dev-python/redis-py-2.7.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.7.5.tar.gz -> redis-py-2.7.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=27db4017a41dc69552010c192c95621a
+_md5_=d4b15f2d74ea124c353bbe370e52e7ac
diff --git a/metadata/md5-cache/dev-python/redis-py-2.7.6 b/metadata/md5-cache/dev-python/redis-py-2.7.6
index bf8c91ae4db5..e58f97bebc34 100644
--- a/metadata/md5-cache/dev-python/redis-py-2.7.6
+++ b/metadata/md5-cache/dev-python/redis-py-2.7.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-2.7.6.tar.gz -> redis-py-2.7.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=16b38af0b234a7e5b9db80554b164b86
+_md5_=91f641b3dccb3dd599ba2c38bfa46a71
diff --git a/metadata/md5-cache/dev-python/remoteobjects-99999999 b/metadata/md5-cache/dev-python/remoteobjects-99999999
index 86e76335137b..f071d51f44cb 100644
--- a/metadata/md5-cache/dev-python/remoteobjects-99999999
+++ b/metadata/md5-cache/dev-python/remoteobjects-99999999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=BSD
 RDEPEND=dev-python/simplejson dev-python/httplib2 =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=d59886d5cd8a2810483a52531fa77ccc
diff --git a/metadata/md5-cache/dev-python/reportlab-2.6 b/metadata/md5-cache/dev-python/reportlab-2.6
index 8d3b50f18be2..ce00459bacf6 100644
--- a/metadata/md5-cache/dev-python/reportlab-2.6
+++ b/metadata/md5-cache/dev-python/reportlab-2.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.reportlab.com/ftp/reportlab-2.6.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	prefix	21058c21ca48453d771df15500873ede	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bfe1250b097c4507a6320fcb9fd8a593
+_md5_=f0141c8b0c3b9956d24e77d5dc7e36ea
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 ff05edda66de..c422732c63bb 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.6-r1
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ed0f1453477265523b41bc00e31dfb9b
+_md5_=e63290ec6b2148981c028e54fb711b10
diff --git a/metadata/md5-cache/dev-python/requests-1.0.4 b/metadata/md5-cache/dev-python/requests-1.0.4
index 29188f54ddcf..bdb821ed0e59 100644
--- a/metadata/md5-cache/dev-python/requests-1.0.4
+++ b/metadata/md5-cache/dev-python/requests-1.0.4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-1.0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c595efdac15eb9856787142c60d8a76b
+_md5_=2a532abd2196322015d0a59da6c6866f
diff --git a/metadata/md5-cache/dev-python/requests-1.1.0 b/metadata/md5-cache/dev-python/requests-1.1.0
index 9303b36c1eab..b4ccda4b3e26 100644
--- a/metadata/md5-cache/dev-python/requests-1.1.0
+++ b/metadata/md5-cache/dev-python/requests-1.1.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-1.1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=87a6f3a340cf9c8c7c0c34086b52ab56
+_md5_=f363e84f53c8a1eccfa987ca0a70c52b
diff --git a/metadata/md5-cache/dev-python/requests-1.2.0 b/metadata/md5-cache/dev-python/requests-1.2.0
index 8e4d13bfc9c5..86e1967dd643 100644
--- a/metadata/md5-cache/dev-python/requests-1.2.0
+++ b/metadata/md5-cache/dev-python/requests-1.2.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-1.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=34f1496e8f9a94524fc2ee850830f7d3
+_md5_=f06b42a7338f37a554a563f8228d1dca
diff --git a/metadata/md5-cache/dev-python/requests-1.2.1 b/metadata/md5-cache/dev-python/requests-1.2.1
index f2c4afd77b6c..5797fb937f68 100644
--- a/metadata/md5-cache/dev-python/requests-1.2.1
+++ b/metadata/md5-cache/dev-python/requests-1.2.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-1.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1a02d5d8cd847500789dfd5cd097fce8
+_md5_=1fd15fa90036a8e18302b2e0877a3c26
diff --git a/metadata/md5-cache/dev-python/requests-1.2.2 b/metadata/md5-cache/dev-python/requests-1.2.2
index efd07ba3cb36..8c93933cde83 100644
--- a/metadata/md5-cache/dev-python/requests-1.2.2
+++ b/metadata/md5-cache/dev-python/requests-1.2.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-1.2.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d5fbbc5a5bd17c114e666049447c127
+_md5_=409ba1e30311494ab47906a3bb1744d1
diff --git a/metadata/md5-cache/dev-python/requests-1.2.3 b/metadata/md5-cache/dev-python/requests-1.2.3
index 84d33ca92ec5..6d3b15d6231c 100644
--- a/metadata/md5-cache/dev-python/requests-1.2.3
+++ b/metadata/md5-cache/dev-python/requests-1.2.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-1.2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3710a3061cbac6eecf670a491739e914
+_md5_=9222629878d107670cf418e612c62724
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.3.0 b/metadata/md5-cache/dev-python/requests-cache-0.3.0
index fee485f7098d..d7f3875abb93 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.3.0
+++ b/metadata/md5-cache/dev-python/requests-cache-0.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-cache/requests-cache-0.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a303dc032bd2c1726fc60850c960f0e1
+_md5_=21332840e38da3bf742e31012b79ebdf
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.4.0 b/metadata/md5-cache/dev-python/requests-cache-0.4.0
index 0a95975ee91d..31c779b8c42e 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.4.0
+++ b/metadata/md5-cache/dev-python/requests-cache-0.4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-cache/requests-cache-0.4.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0004bfd5398a6b882df259eae9ff5822
+_md5_=d5cda33fb8f51eba600a1abe2b531ab8
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.4.2 b/metadata/md5-cache/dev-python/requests-cache-0.4.2
index c627ee8ca989..363f5d71b708 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.4.2
+++ b/metadata/md5-cache/dev-python/requests-cache-0.4.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-cache/requests-cache-0.4.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3ad83107ad10351e6f8ec6c98bfc64df
+_md5_=669906d1356807937fa83dab18b1b3af
diff --git a/metadata/md5-cache/dev-python/restkit-4.2.1-r1 b/metadata/md5-cache/dev-python/restkit-4.2.1-r1
index 04749f5cbfc8..1365189e186b 100644
--- a/metadata/md5-cache/dev-python/restkit-4.2.1-r1
+++ b/metadata/md5-cache/dev-python/restkit-4.2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/r/restkit/restkit-4.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b8fa1158c174a24e950765df62339fb3
+_md5_=66574a1b7c2a6a41ff0323eeee1b4ba8
diff --git a/metadata/md5-cache/dev-python/robotframework-selenium2library-9999 b/metadata/md5-cache/dev-python/robotframework-selenium2library-9999
index 0723566fc761..721a89b4b051 100644
--- a/metadata/md5-cache/dev-python/robotframework-selenium2library-9999
+++ b/metadata/md5-cache/dev-python/robotframework-selenium2library-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/selenium-2.12.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/decorator-3.3.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/robotframework-2.6.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=36ecba2d1a6569392ee2e83b4d92ae59
diff --git a/metadata/md5-cache/dev-python/rope-0.9.4-r1 b/metadata/md5-cache/dev-python/rope-0.9.4-r1
index aa355801809b..65e68c318093 100644
--- a/metadata/md5-cache/dev-python/rope-0.9.4-r1
+++ b/metadata/md5-cache/dev-python/rope-0.9.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-0.9.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b48ebd4013a448001ffe29d8f488e244
+_md5_=15ae8e4e9e1ad23092de733c59e46b76
diff --git a/metadata/md5-cache/dev-python/routes-1.12.3-r1 b/metadata/md5-cache/dev-python/routes-1.12.3-r1
index 682c38d4bb75..60c9f395cae3 100644
--- a/metadata/md5-cache/dev-python/routes-1.12.3-r1
+++ b/metadata/md5-cache/dev-python/routes-1.12.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Routes/Routes-1.12.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=018607c302e89cdbb4ac6f3f162c113d
+_md5_=87e9f1d24c39ee1ddcea90160eba65be
diff --git a/metadata/md5-cache/dev-python/rst2pdf-0.93-r1 b/metadata/md5-cache/dev-python/rst2pdf-0.93-r1
index 7b93ac7241c4..edf42ff2bf7f 100644
--- a/metadata/md5-cache/dev-python/rst2pdf-0.93-r1
+++ b/metadata/md5-cache/dev-python/rst2pdf-0.93-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://rst2pdf.googlecode.com/files/rst2pdf-0.93.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a0c59ea40563fb352e74e8bb8ee2ce0a
+_md5_=9a939077fc6950e6a7c6d97a041773d0
diff --git a/metadata/md5-cache/dev-python/rtslib-9999 b/metadata/md5-cache/dev-python/rtslib-9999
index 57346a88742d..e4a2e7986445 100644
--- a/metadata/md5-cache/dev-python/rtslib-9999
+++ b/metadata/md5-cache/dev-python/rtslib-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://linux-iscsi.org/
 LICENSE=AGPL-3
 RDEPEND=dev-python/configobj dev-python/ipaddr dev-python/netifaces =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9491aae69522e24f2bce21c368bdb57e
diff --git a/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2 b/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2
index f2075866b62b..e3d3579caa67 100644
--- a/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2
+++ b/metadata/md5-cache/dev-python/ruledispatch-0.5_pre2306-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/RuleDispatch-0.5a0.dev-r2306.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3bd2bd85b78318a665e754b2b040d7ad
+_md5_=a97691c9928b2b6d7938e297e9e793d5
diff --git a/metadata/md5-cache/dev-python/selenium-2.29.0 b/metadata/md5-cache/dev-python/selenium-2.29.0
index 3730ac25ddd4..d459a87a7e3f 100644
--- a/metadata/md5-cache/dev-python/selenium-2.29.0
+++ b/metadata/md5-cache/dev-python/selenium-2.29.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-2.29.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b53a4643fa87294c2658a4ec2cb53118
+_md5_=27f72cb9bb3057d8001dbf7437b2caba
diff --git a/metadata/md5-cache/dev-python/serpent-1.2 b/metadata/md5-cache/dev-python/serpent-1.2
index 210341de9385..80db0fda9b2c 100644
--- a/metadata/md5-cache/dev-python/serpent-1.2
+++ b/metadata/md5-cache/dev-python/serpent-1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=014833a16a73f59ce7c440607c9065bd
+_md5_=095ab415482c9cc6415ec5764ccadc5f
diff --git a/metadata/md5-cache/dev-python/serpent-1.3 b/metadata/md5-cache/dev-python/serpent-1.3
index 840003a4af0f..8bb1d829e997 100644
--- a/metadata/md5-cache/dev-python/serpent-1.3
+++ b/metadata/md5-cache/dev-python/serpent-1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e11de2a906b6bfa1ec71c086a9f8898
+_md5_=e1be1d72df208f703e7a8b9190c74354
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.6-r1 b/metadata/md5-cache/dev-python/setproctitle-1.1.6-r1
index 333bd9c2b010..5f6bd38834d1 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.6-r1
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d42d202f6e10c86e9ad37d8b13853808
+_md5_=449658e198ae85a2451ecc8353024806
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.7 b/metadata/md5-cache/dev-python/setproctitle-1.1.7
index 0aa3c2e5e631..239d8aa99eb5 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.7
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c9431f7848269e7d65ddebe90cb83d94
+_md5_=f39276190d9e063d8315f2c70f862da9
diff --git a/metadata/md5-cache/dev-python/setuptools-0.6.30-r1 b/metadata/md5-cache/dev-python/setuptools-0.6.30-r1
index ac69c27037ed..5324ef8646b2 100644
--- a/metadata/md5-cache/dev-python/setuptools-0.6.30-r1
+++ b/metadata/md5-cache/dev-python/setuptools-0.6.30-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/distribute/distribute-0.6.30.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cf0a8a5de7f52a86693436c3b2535d6f
+_md5_=d3c96ce3f8577cc20c1df55a77b7347d
diff --git a/metadata/md5-cache/dev-python/setuptools-0.6.33 b/metadata/md5-cache/dev-python/setuptools-0.6.33
index dd155e921ffc..020638645a2e 100644
--- a/metadata/md5-cache/dev-python/setuptools-0.6.33
+++ b/metadata/md5-cache/dev-python/setuptools-0.6.33
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/distribute/distribute-0.6.33.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=85706f81ebff5ce1c185c2dba0439399
+_md5_=22c76d4cd41fbd057d84ccbef9ab72d2
diff --git a/metadata/md5-cache/dev-python/setuptools-0.6.45-r1 b/metadata/md5-cache/dev-python/setuptools-0.6.45-r1
index 9606aeacbec8..3ddf02b5d7a5 100644
--- a/metadata/md5-cache/dev-python/setuptools-0.6.45-r1
+++ b/metadata/md5-cache/dev-python/setuptools-0.6.45-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/d/distribute/distribute-0.6.45.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=314467f523370371fd9b03f7b21175c9
+_md5_=285e4a2eec4e73124e512ef54642bf07
diff --git a/metadata/md5-cache/dev-python/setuptools-0.8-r1 b/metadata/md5-cache/dev-python/setuptools-0.8-r1
index a6bf21718ce8..68eadaa46c6d 100644
--- a/metadata/md5-cache/dev-python/setuptools-0.8-r1
+++ b/metadata/md5-cache/dev-python/setuptools-0.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-0.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=02e611c3c1b5a72b8ca41f041a8b1b89
+_md5_=ef618e6eaa42e916d080747a3918cd6f
diff --git a/metadata/md5-cache/dev-python/setuptools-0.9.8-r1 b/metadata/md5-cache/dev-python/setuptools-0.9.8-r1
index bdd749a267eb..144175ef1716 100644
--- a/metadata/md5-cache/dev-python/setuptools-0.9.8-r1
+++ b/metadata/md5-cache/dev-python/setuptools-0.9.8-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-0.9.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=364aa44d00d1da29b6a84511bf4f4a3d
+_md5_=b60b23cb338a54da3e9f64e1d96dc1e8
diff --git a/metadata/md5-cache/dev-python/setuptools-1.0 b/metadata/md5-cache/dev-python/setuptools-1.0
index 82dc1b0a9717..96717473b696 100644
--- a/metadata/md5-cache/dev-python/setuptools-1.0
+++ b/metadata/md5-cache/dev-python/setuptools-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2e9f5501690276b6011efa60c9170f41
+_md5_=75df7b40489dbbe71faefa7974b49b02
diff --git a/metadata/md5-cache/dev-python/setuptools-1.1 b/metadata/md5-cache/dev-python/setuptools-1.1
index e629d810cd69..912b0e75d252 100644
--- a/metadata/md5-cache/dev-python/setuptools-1.1
+++ b/metadata/md5-cache/dev-python/setuptools-1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2cdb1ad2436df145b18b7568eec1dce8
+_md5_=b078c60d72c1791074e1f1ef5551c776
diff --git a/metadata/md5-cache/dev-python/setuptools-9999 b/metadata/md5-cache/dev-python/setuptools-9999
index dde5056d8919..fc364f99c3d4 100644
--- a/metadata/md5-cache/dev-python/setuptools-9999
+++ b/metadata/md5-cache/dev-python/setuptools-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=46ea204a3cbc395dc8c44ec15640e816
+_md5_=6bca8f76920cdb86f5b73cf96248a49c
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.0_beta1 b/metadata/md5-cache/dev-python/setuptools-git-1.0_beta1
index 442cb47517ff..58165cf04b75 100644
--- a/metadata/md5-cache/dev-python/setuptools-git-1.0_beta1
+++ b/metadata/md5-cache/dev-python/setuptools-git-1.0_beta1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-git/setuptools-git-1.0b1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=96bb287d9d45fe5d065901cf63d5e2d7
+_md5_=c3f15fd5eafd592ef2ba02b0c4a74fd2
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 49d41cf60e63..09929712ac78 100644
--- a/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
+++ b/metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_hg/setuptools_hg-0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=63780e8abe1381055728035905620907
+_md5_=979c59a5fe91870f41449ecd49c48ee6
diff --git a/metadata/md5-cache/dev-python/sh-1.07 b/metadata/md5-cache/dev-python/sh-1.07
index 1831f22cf9a0..81bf8e9ab153 100644
--- a/metadata/md5-cache/dev-python/sh-1.07
+++ b/metadata/md5-cache/dev-python/sh-1.07
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/amoffat/sh/archive/1.07.tar.gz -> sh-1.07.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f725e2c2fa1620130793c06f31f57ce9
+_md5_=195f695c9ba80d54d78703421e79b590
diff --git a/metadata/md5-cache/dev-python/sh-1.08 b/metadata/md5-cache/dev-python/sh-1.08
index 6f7db57a9ef5..b2588d782fb8 100644
--- a/metadata/md5-cache/dev-python/sh-1.08
+++ b/metadata/md5-cache/dev-python/sh-1.08
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/amoffat/sh/archive/1.08.tar.gz -> sh-1.08.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5858bbf3be6d6f3a93551c58739d7419
+_md5_=52d72139b455ff146d30523e651c80dd
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index 5de50c005ce2..0d030b8d3522 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=025437da4579bf41f869de9b977f9a9f
+_md5_=c6d4b04a0cebe00f0cd6671ebad99a56
diff --git a/metadata/md5-cache/dev-python/simplejson-3.0.7 b/metadata/md5-cache/dev-python/simplejson-3.0.7
index 453a10bca6d6..88d9f43bfe32 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.0.7
+++ b/metadata/md5-cache/dev-python/simplejson-3.0.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.0.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=06a1398132bcac4824b9848cd103674d
+_md5_=dbef4ebaf8737f4d37be1305a2151b06
diff --git a/metadata/md5-cache/dev-python/simplejson-3.1.3 b/metadata/md5-cache/dev-python/simplejson-3.1.3
index e4b302a3d91b..22d35564b1a2 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.1.3
+++ b/metadata/md5-cache/dev-python/simplejson-3.1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7036d4e711ab2ddf4e020516d6459b3e
+_md5_=e4e53cc850f012b5e5e58443f03091f3
diff --git a/metadata/md5-cache/dev-python/simplejson-3.2.0 b/metadata/md5-cache/dev-python/simplejson-3.2.0
index 3c256c063f35..08732945a51c 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.2.0
+++ b/metadata/md5-cache/dev-python/simplejson-3.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aa0ea49a2fdcc757a4267ff8b4b13939
+_md5_=3587d8cecb0a6470efc1dc33b533f8a3
diff --git a/metadata/md5-cache/dev-python/simplejson-3.3.0 b/metadata/md5-cache/dev-python/simplejson-3.3.0
index 690b35587155..326c9350462b 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.3.0
+++ b/metadata/md5-cache/dev-python/simplejson-3.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a558e4aa45cf20d5f5f7eac7137e11d6
+_md5_=70b5d16233b33d7faa0ed2051f003b46
diff --git a/metadata/md5-cache/dev-python/simples3-1.0 b/metadata/md5-cache/dev-python/simples3-1.0
index a31da9da9604..92c9c04eae8f 100644
--- a/metadata/md5-cache/dev-python/simples3-1.0
+++ b/metadata/md5-cache/dev-python/simples3-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/simples3/simples3-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3ffaa1ded004583e82b355a057ee300b
+_md5_=7c1c2924dcd57e29e53bcbd8c334a2c7
diff --git a/metadata/md5-cache/dev-python/sip-4.14.3 b/metadata/md5-cache/dev-python/sip-4.14.3
index 1f71fd8d96f7..7db3581be047 100644
--- a/metadata/md5-cache/dev-python/sip-4.14.3
+++ b/metadata/md5-cache/dev-python/sip-4.14.3
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 SLOT=0/9
 SRC_URI=mirror://sourceforge/pyqt/sip-4.14.3.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a45b10910b4d4e111fd460c770ae9a12
+_md5_=9dc63c57cbfc9cd4b55c366804b625eb
diff --git a/metadata/md5-cache/dev-python/sip-4.14.6 b/metadata/md5-cache/dev-python/sip-4.14.6
index 56a16fe4e851..035c74681f0e 100644
--- a/metadata/md5-cache/dev-python/sip-4.14.6
+++ b/metadata/md5-cache/dev-python/sip-4.14.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0/9
 SRC_URI=mirror://sourceforge/pyqt/sip-4.14.6.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=79ecd610b814f1a8c19b0b616d9af6c2
+_md5_=946a9864726fc860c545b5532aa9bcfe
diff --git a/metadata/md5-cache/dev-python/sip-4.14.7 b/metadata/md5-cache/dev-python/sip-4.14.7
index cc1e9577e7aa..1daa07f5a769 100644
--- a/metadata/md5-cache/dev-python/sip-4.14.7
+++ b/metadata/md5-cache/dev-python/sip-4.14.7
@@ -4,11 +4,11 @@ DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=5
 HOMEPAGE=http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP
 IUSE=debug doc python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 sip )
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0/10
 SRC_URI=mirror://sourceforge/pyqt/sip-4.14.7.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dfb3ba2aedeac16b0426547d2a0a14e1
+_md5_=f54246512392c0ad45256650b9a2b908
diff --git a/metadata/md5-cache/dev-python/six-1.2.0-r1 b/metadata/md5-cache/dev-python/six-1.2.0-r1
index 2f654081ddeb..4f73556f3c69 100644
--- a/metadata/md5-cache/dev-python/six-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/six-1.2.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a347ca3c4c2c13ab2d68542ec59b537
+_md5_=713592ef72fb88d8d8f97e9fd796dc96
diff --git a/metadata/md5-cache/dev-python/six-1.3.0 b/metadata/md5-cache/dev-python/six-1.3.0
index 4e873e951604..1a21418498fe 100644
--- a/metadata/md5-cache/dev-python/six-1.3.0
+++ b/metadata/md5-cache/dev-python/six-1.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4fb09d7bce04e17727318feaf7e744bb
+_md5_=0dfd459e5ee4a78bf93be6c51edc8140
diff --git a/metadata/md5-cache/dev-python/six-9999 b/metadata/md5-cache/dev-python/six-9999
index 94e6799811da..f020df1a96d0 100644
--- a/metadata/md5-cache/dev-python/six-9999
+++ b/metadata/md5-cache/dev-python/six-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=94213294a0b56789dfd66707877d9333
+_md5_=60bf477c22a5fef27a859e61d0de60f5
diff --git a/metadata/md5-cache/dev-python/skype4py-1.0.32.1-r1 b/metadata/md5-cache/dev-python/skype4py-1.0.32.1-r1
index f029633e7039..8ba0e7a49aae 100644
--- a/metadata/md5-cache/dev-python/skype4py-1.0.32.1-r1
+++ b/metadata/md5-cache/dev-python/skype4py-1.0.32.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Skype4Py/Skype4Py-1.0.32.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=535b7bab221bf72811111733ca5cac0f
+_md5_=ac187bb3e129ab9fcba33b8296a6038b
diff --git a/metadata/md5-cache/dev-python/skype4py-1.0.34 b/metadata/md5-cache/dev-python/skype4py-1.0.34
index abb0396b95cc..99f70a977594 100644
--- a/metadata/md5-cache/dev-python/skype4py-1.0.34
+++ b/metadata/md5-cache/dev-python/skype4py-1.0.34
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/awahlig/skype4py/archive/1.0.34.tar.gz -> skype4py-1.0.34.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8ecb14ee329198e0dc132de510293c53
+_md5_=4932328f2fe24e9889edabeff4bcfc35
diff --git a/metadata/md5-cache/dev-python/skype4py-1.0.35 b/metadata/md5-cache/dev-python/skype4py-1.0.35
index 773aca3dc545..8dd02a47f209 100644
--- a/metadata/md5-cache/dev-python/skype4py-1.0.35
+++ b/metadata/md5-cache/dev-python/skype4py-1.0.35
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/awahlig/skype4py/archive/1.0.35.tar.gz -> skype4py-1.0.35.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b59f18bf5fddc34b413530a68df5bac7
+_md5_=9c56e1e03dc92bce8dea6b63707e9180
diff --git a/metadata/md5-cache/dev-python/sleekxmpp-1.1.11 b/metadata/md5-cache/dev-python/sleekxmpp-1.1.11
index f364c167725c..f296400a50d1 100644
--- a/metadata/md5-cache/dev-python/sleekxmpp-1.1.11
+++ b/metadata/md5-cache/dev-python/sleekxmpp-1.1.11
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/sleekxmpp/sleekxmpp-1.1.11.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a7ac12c0f8f525a63a053156cb258df7
+_md5_=9e8c84858f173d1bd43204b3241f20ef
diff --git a/metadata/md5-cache/dev-python/smmap-0.8.2-r1 b/metadata/md5-cache/dev-python/smmap-0.8.2-r1
index 49eea331d326..d03aa10131fb 100644
--- a/metadata/md5-cache/dev-python/smmap-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/smmap-0.8.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap/smmap-0.8.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a6d3555177ae267b872c116455729e7e
+_md5_=6d6f07893473d279b11fe36f8c289c17
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index abc33ae9018f..ef3aaa59ddf0 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!<sys-apps/pkgcore-0.4.7.8 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7563e5dd42e2a33d80e67289c32a6b45
diff --git a/metadata/md5-cache/dev-python/soappy-0.12.5-r2 b/metadata/md5-cache/dev-python/soappy-0.12.5-r2
index ca3dbe993f7b..866b96bf19fb 100644
--- a/metadata/md5-cache/dev-python/soappy-0.12.5-r2
+++ b/metadata/md5-cache/dev-python/soappy-0.12.5-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SOAPpy/SOAPpy-0.12.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc3e7b050a84972a2964f3e3e10f3754
+_md5_=c4a02bd2619fc53cbc75feadf8f354c8
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.2 b/metadata/md5-cache/dev-python/socketpool-0.5.2
index 0e902766a690..b0e355cccf1a 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.2
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aa9dc98c74d7dbf64e770cd178a30b7d
+_md5_=dd2acf76391dc9cea04e5a4b84f74022
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.2-r1 b/metadata/md5-cache/dev-python/socketpool-0.5.2-r1
index fd843b5d4470..5f1717c92227 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.2-r1
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=47a02017e04aef4d9d6b726e3386459e
+_md5_=ce0da06c180253f33751541b6502345f
diff --git a/metadata/md5-cache/dev-python/socksipy-1.00 b/metadata/md5-cache/dev-python/socksipy-1.00
index f690a566c655..01f2eed37f1e 100644
--- a/metadata/md5-cache/dev-python/socksipy-1.00
+++ b/metadata/md5-cache/dev-python/socksipy-1.00
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/socksipy/socksipy/SocksiPy%201.00/SocksiPy.tar.gz -> socksipy-1.00.tar.gz
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=eb5c482bf0b7682ca2534a3921063639
+_md5_=ed3f44d6cb3391a2e6594d0f98674703
diff --git a/metadata/md5-cache/dev-python/soya-0.14-r1 b/metadata/md5-cache/dev-python/soya-0.14-r1
index 0e09845dc60c..10e10118c952 100644
--- a/metadata/md5-cache/dev-python/soya-0.14-r1
+++ b/metadata/md5-cache/dev-python/soya-0.14-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/soya/Soya-0.14.tar.bz2 doc? ( http://download.gna.org/soya/SoyaTutorial-0.14.tar.bz2 ) examples? ( http://download.gna.org/soya/SoyaTutorial-0.14.tar.bz2 )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3e9dd70e2794149de4c1918c733ca1eb
+_md5_=028b220f6899b06a8b2f7d8b4de0d936
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 4b1b174f7a23..6d3f5f1735db 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3e92df6ebd7c7a74738e087a135bc551
+_md5_=fb2d2a5ded4c2a296141a443dcc5f182
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r5 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r5
index cb56a8e929ec..e149afc17758 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r5
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a52da268393b0b5cf693d32bf04ed8ad
+_md5_=f74202f6afc6895a0ac0e146490a6764
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r6 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
index 9e0022dc49d0..0d0ede0e6b0a 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=52e17e8e6d4f9c5bcce3264870cfbdf8
+_md5_=d1f69f240801d01c5c2d9060ae978d40
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r7 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
index b37d316cc552..7ff51636df96 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=249f37471c1c8eacbbc0c5651cbd3294
+_md5_=d74610f67ee765135f274eb42cdf4b15
diff --git a/metadata/md5-cache/dev-python/sphinx-1.2_pre20130530 b/metadata/md5-cache/dev-python/sphinx-1.2_pre20130530
index f4c8b7ade330..951297e388e1 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.2_pre20130530
+++ b/metadata/md5-cache/dev-python/sphinx-1.2_pre20130530
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~xarthisius/distfiles/Sphinx-1.2_pre20130530.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4537ee4e0462839f10487acec7c45f70
+_md5_=3c5a2dfb93f4c5d2b0b559a02cba6567
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.8 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.8
index eec6ad72f1fa..74eb5c672da0 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.8
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=63ab1c246a17da952713af66a2a136a8
+_md5_=d9946a14570177872469028e3bdd9c88
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.9 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.9
index dae8c18e0930..f5b0ec2e565a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.9
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.1.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.1.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dd52cc5a3924f8fe9d4f38db42b01320
+_md5_=0afaa7ffe5c0bf4f2a314371a0f22896
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
index 8d9e77a4b04c..c76b1ec7f469 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7a6b416b5df0c5c47dcbe9a3a9900008
+_md5_=1e1259976106ddd3770f7affe94e140d
diff --git a/metadata/md5-cache/dev-python/sphinxtogithub-1.0.0 b/metadata/md5-cache/dev-python/sphinxtogithub-1.0.0
index fc101212df81..8b8ebc98f6e9 100644
--- a/metadata/md5-cache/dev-python/sphinxtogithub-1.0.0
+++ b/metadata/md5-cache/dev-python/sphinxtogithub-1.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxtogithub/sphinxtogithub-1.0.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e882396379034c4b2aca7693d8f13225
+_md5_=641d3eadf50d48100192bec170cf460a
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.8.0 b/metadata/md5-cache/dev-python/sqlalchemy-0.8.0
index 7b67989ac31b..914fdd5141e4 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.8.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.8.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ff24c9230f3a5484141919fc224c0d9e
+_md5_=662989a1147e7bd4734085e837226a6a
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.8.1 b/metadata/md5-cache/dev-python/sqlalchemy-0.8.1
index 366ce919d8ae..f74b6b4fe640 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.8.1
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.8.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.8.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4c7f7b8f27177025303d9f9597cad1bf
+_md5_=267e45fe52aa9c7456237defd06ec3a7
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.8.2 b/metadata/md5-cache/dev-python/sqlalchemy-0.8.2
index e0d6e4910307..dad97d60a09c 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.8.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.8.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.8.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=330edae81cd0626194c9792bca479491
+_md5_=a18237fbea3bd4b4f88f95389516a8a2
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 8e3d39ffa6bf..63206d168f71 100644
--- a/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/sqlitecachec-1.1.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://yum.baseurl.org/download/yum-metadata-parser/yum-metadata-parser-1.1.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=319f2a9345649969a199a9f9481965c4
+_md5_=7e50e7a7039030d383869a4dcbb0983a
diff --git a/metadata/md5-cache/dev-python/sqlobject-1.4.1-r1 b/metadata/md5-cache/dev-python/sqlobject-1.4.1-r1
index fda62ed374f9..47aae71f25e3 100644
--- a/metadata/md5-cache/dev-python/sqlobject-1.4.1-r1
+++ b/metadata/md5-cache/dev-python/sqlobject-1.4.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLObject/SQLObject-1.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9ed269601908f7a4f5216969d974cae1
+_md5_=ae428750b7d1b8f12ac4ff684076e2f5
diff --git a/metadata/md5-cache/dev-python/ssh-1.8.0-r1 b/metadata/md5-cache/dev-python/ssh-1.8.0-r1
index 597c9517dc04..b9bd829c9ad5 100644
--- a/metadata/md5-cache/dev-python/ssh-1.8.0-r1
+++ b/metadata/md5-cache/dev-python/ssh-1.8.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/ssh/ssh-1.8.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=29aecf65b6e785c8dd74e01f606b85e3
+_md5_=e81f9a1c6557591ac52ff954e95a094c
diff --git a/metadata/md5-cache/dev-python/stevedore-0.9.1 b/metadata/md5-cache/dev-python/stevedore-0.9.1
index 6e9cdd95aa23..8a62c6de1825 100644
--- a/metadata/md5-cache/dev-python/stevedore-0.9.1
+++ b/metadata/md5-cache/dev-python/stevedore-0.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-0.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=93f7652f77e970a2820b92b2a4926468
+_md5_=34f84e2bb6414f3f159266334e101b12
diff --git a/metadata/md5-cache/dev-python/stsci-distutils-0.3.2-r1 b/metadata/md5-cache/dev-python/stsci-distutils-0.3.2-r1
index 1554726f9fb5..866d58f28e5b 100644
--- a/metadata/md5-cache/dev-python/stsci-distutils-0.3.2-r1
+++ b/metadata/md5-cache/dev-python/stsci-distutils-0.3.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/stsci.distutils/stsci.distutils-0.3.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ceb3fbbfab2584b52ae5fe95fa5bbe4a
+_md5_=beaa8981a3f8118f64c56911019afbf0
diff --git a/metadata/md5-cache/dev-python/stsci-distutils-0.3.4 b/metadata/md5-cache/dev-python/stsci-distutils-0.3.4
index 38666e2f83b1..3154e565d9e7 100644
--- a/metadata/md5-cache/dev-python/stsci-distutils-0.3.4
+++ b/metadata/md5-cache/dev-python/stsci-distutils-0.3.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/stsci.distutils/stsci.distutils-0.3.4.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=349d8f8e9283a92ced26199d30418d4f
+_md5_=b9b184574b64506ce4662abbf610f4f6
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.10-r1 b/metadata/md5-cache/dev-python/subunit-0.0.10-r1
index 601a8fad070c..235c34b0eb44 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.10-r1
+++ b/metadata/md5-cache/dev-python/subunit-0.0.10-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-python/testtools-0.9.23[python_targets_python2_6(-)?,python_target
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/0.0.10/+download/subunit-0.0.10.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d6e72a998cd847969d7406bbe434f703
+_md5_=08804818c97091cb42bc3341b4ae4da3
diff --git a/metadata/md5-cache/dev-python/sudsds-1.0.1-r1 b/metadata/md5-cache/dev-python/sudsds-1.0.1-r1
index 1ac156db7133..5febad7d713a 100644
--- a/metadata/md5-cache/dev-python/sudsds-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sudsds-1.0.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.nic.cz/public_media/datove_schranky/releases/src/sudsds-1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=04bb348da03dfc547037aa58cc727b94
+_md5_=6611e23b3d2f66082a0b7c5f0cc8401c
diff --git a/metadata/md5-cache/dev-python/symboltype-1.0 b/metadata/md5-cache/dev-python/symboltype-1.0
index 2aa863f9414a..3836b4011213 100644
--- a/metadata/md5-cache/dev-python/symboltype-1.0
+++ b/metadata/md5-cache/dev-python/symboltype-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/SymbolType/SymbolType-1.0.zip -> symboltype-1.0.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6b5e2fb0a72a8948ac29a1ad360e64f7
+_md5_=ef3e35191905873504088357535f2898
diff --git a/metadata/md5-cache/dev-python/tagpy-2013.1 b/metadata/md5-cache/dev-python/tagpy-2013.1
index d75808d1f943..d70323da2f72 100644
--- a/metadata/md5-cache/dev-python/tagpy-2013.1
+++ b/metadata/md5-cache/dev-python/tagpy-2013.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/tagpy/tagpy-2013.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7e12279e2225bb21903ac7a148ebc1c9
+_md5_=411d6185a14b823222ee9ec643691b4c
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.1-r1 b/metadata/md5-cache/dev-python/tempita-0.5.1-r1
index 2260f4453a5d..1ef1dea6d0ab 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/tempita-0.5.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/T/Tempita/Tempita-0.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7427832a45b9898c8cdac5cb0b1ed7c
+_md5_=32358fd0eca973ddcce664fc3d150b32
diff --git a/metadata/md5-cache/dev-python/testtools-0.9.24-r1 b/metadata/md5-cache/dev-python/testtools-0.9.24-r1
index d8bff5c893dd..40a418f52e30 100644
--- a/metadata/md5-cache/dev-python/testtools-0.9.24-r1
+++ b/metadata/md5-cache/dev-python/testtools-0.9.24-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://launchpad.net/testtools/0.9/0.9.24/+download/testtools-0.9.24.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=59e9485c6db88221efe05de0a16a65dc
+_md5_=4983a14e77b01aea1064d9a16c7e8297
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 f02030ca0abc..cd83984c9567 100644
--- a/metadata/md5-cache/dev-python/timelib-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/timelib-0.2.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/timelib/timelib-0.2.4.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f45bd77200d79d3e858c8d5b4aea21fb
+_md5_=aade5fd57a8a80f671ac136286da26d1
diff --git a/metadata/md5-cache/dev-python/tlslite-0.4.3-r1 b/metadata/md5-cache/dev-python/tlslite-0.4.3-r1
index 9f9763c4cb21..2dd77bb02946 100644
--- a/metadata/md5-cache/dev-python/tlslite-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/tlslite-0.4.3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://github.com/trevp/tlslite/downloads/tlslite-0.4.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42a30fbffa909fac2ef4e94537190489
+_md5_=d98e66a76cdbc8c62781b7a1496f96a6
diff --git a/metadata/md5-cache/dev-python/translationstring-1.1-r1 b/metadata/md5-cache/dev-python/translationstring-1.1-r1
index 89c9a04af95a..78ab75d39d37 100644
--- a/metadata/md5-cache/dev-python/translationstring-1.1-r1
+++ b/metadata/md5-cache/dev-python/translationstring-1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/translationstring/translationstring-1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3f248526bbd66df0bcb9e07fcf0fbd7d
+_md5_=d3eb3a9fdb95acd5cb019dc7d2842d3f
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.10 b/metadata/md5-cache/dev-python/transmissionrpc-0.10
index 832cadb8f1b8..82582b0546ff 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-0.10
+++ b/metadata/md5-cache/dev-python/transmissionrpc-0.10
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/transmissionrpc/transmissionrpc-0.10.tar.gz https://bitbucket.org/blueluna/transmissionrpc/src/release-0.10/test/data/ubuntu-12.04.2-alternate-amd64.iso.torrent
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=22af04e907d809dd228de5268fe5bb05
+_md5_=ab9ba775cfe48aebcb239ba9cd766905
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.9 b/metadata/md5-cache/dev-python/transmissionrpc-0.9
index 176181cdbba5..cd43ddb8a12a 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-0.9
+++ b/metadata/md5-cache/dev-python/transmissionrpc-0.9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/transmissionrpc/transmissionrpc-0.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=577135db61bc9d7fb5e7dd0494b3cba5
+_md5_=15f277258a1ca0bf6b5bca64dfcbd60a
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-9999 b/metadata/md5-cache/dev-python/transmissionrpc-9999
index eecfd36b7867..980e3e6db593 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-9999
+++ b/metadata/md5-cache/dev-python/transmissionrpc-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-python/six-1.1.0[python_targets_python2_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b8ff3fa1d7dfa2d203fef93ef05f0f16
+_md5_=9acb09b2694a47f6ce3259228418a467
diff --git a/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1 b/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1
index e2e41df6ea22..fd98caec03d9 100644
--- a/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/ttfquery-1.0.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/T/TTFQuery/TTFQuery-1.0.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=325c239fd0ca7b48d31559b566892417
+_md5_=264b0820c06b3cde990faf48f1fd0eb2
diff --git a/metadata/md5-cache/dev-python/turbojson-1.3-r1 b/metadata/md5-cache/dev-python/turbojson-1.3-r1
index e140188e1f33..30193de7700e 100644
--- a/metadata/md5-cache/dev-python/turbojson-1.3-r1
+++ b/metadata/md5-cache/dev-python/turbojson-1.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboJson/TurboJson-1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=78cdd5656fcb4a4ee05bce8e66dd5c1c
+_md5_=c0870c00c610ab6b668872028980b816
diff --git a/metadata/md5-cache/dev-python/tweepy-2.0 b/metadata/md5-cache/dev-python/tweepy-2.0
index fb01dd00fa00..c38189eed890 100644
--- a/metadata/md5-cache/dev-python/tweepy-2.0
+++ b/metadata/md5-cache/dev-python/tweepy-2.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tweepy/tweepy/tarball/2.0 -> tweepy-2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=4e606dcca5e64231b4343730d558adae
+_md5_=71e8b998e3013a1b2d160b3bacd3db13
diff --git a/metadata/md5-cache/dev-python/twill-0.9-r1 b/metadata/md5-cache/dev-python/twill-0.9-r1
index 55070cf68ed2..f8bfd6c8f6fd 100644
--- a/metadata/md5-cache/dev-python/twill-0.9-r1
+++ b/metadata/md5-cache/dev-python/twill-0.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://darcs.idyll.org/~t/projects/twill-0.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3a6c91a9607d59ad1c7c945dfb467a8e
+_md5_=0a28366b9265fe2f60ca68f775bbb2e8
diff --git a/metadata/md5-cache/dev-python/twitter-1.10.0 b/metadata/md5-cache/dev-python/twitter-1.10.0
index b6cc977b511a..cbb5898207b4 100644
--- a/metadata/md5-cache/dev-python/twitter-1.10.0
+++ b/metadata/md5-cache/dev-python/twitter-1.10.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/twitter/twitter-1.10.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b57d7e50baddf076b529feaeabc30061
+_md5_=db893c3452131ab4ef8b550563be31f8
diff --git a/metadata/md5-cache/dev-python/twitter-1.9.2-r1 b/metadata/md5-cache/dev-python/twitter-1.9.2-r1
index adc472b9685d..2ef4439dacf5 100644
--- a/metadata/md5-cache/dev-python/twitter-1.9.2-r1
+++ b/metadata/md5-cache/dev-python/twitter-1.9.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/twitter/twitter-1.9.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7feb3398c14c1301ad3e2dc4b2eeacf4
+_md5_=b8d388fad22c06f1b2865acee81b7ba0
diff --git a/metadata/md5-cache/dev-python/twitter-1.9.4 b/metadata/md5-cache/dev-python/twitter-1.9.4
index 2c3f710c2c0b..ebb40d60827b 100644
--- a/metadata/md5-cache/dev-python/twitter-1.9.4
+++ b/metadata/md5-cache/dev-python/twitter-1.9.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/twitter/twitter-1.9.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bf1cc31bb7e46c86b9e5b2f258664a6b
+_md5_=14fb3f3b5b99aea6a5d9e7d2e2717d90
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.6.2 b/metadata/md5-cache/dev-python/txAMQP-0.6.2
index 34540d9bc3b9..7239394255f8 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.6.2
+++ b/metadata/md5-cache/dev-python/txAMQP-0.6.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/t/txAMQP/txAMQP-0.6.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=62375dbb3e3fab4c79c69d48861998fc
+_md5_=678347a7625719fd02618ba327adcfaa
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.9-r1 b/metadata/md5-cache/dev-python/unidecode-0.04.9-r1
index daf771d4fae3..391b28ccae8f 100644
--- a/metadata/md5-cache/dev-python/unidecode-0.04.9-r1
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-0.04.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=135ff9abdebdf9c6e4a7bf330d3efe7a
+_md5_=366a98670d5664bb77d6160a12e9ebd7
diff --git a/metadata/md5-cache/dev-python/unittest2-0.5.1-r1 b/metadata/md5-cache/dev-python/unittest2-0.5.1-r1
index 497e9deb7434..2431dda4e0e7 100644
--- a/metadata/md5-cache/dev-python/unittest2-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/unittest2-0.5.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/u/unittest2/unittest2-0.5.1.tar.gz mirror://pypi/u/unittest2/unittest2py3k-0.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=109a69f9a6cb6016bd70cba4edb51bee
+_md5_=5f69500336258fdfcd0cac838e1cd80f
diff --git a/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2 b/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2
index b549fdc7eb37..be583072a3f9 100644
--- a/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2
+++ b/metadata/md5-cache/dev-python/urlgrabber-3.9.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://urlgrabber.baseurl.org/download/urlgrabber-3.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=558517fda8295b155c30feb9ed18ee0f
+_md5_=ee328342126b7dd8ba6b59d4aac8eaa6
diff --git a/metadata/md5-cache/dev-python/urllib3-1.6 b/metadata/md5-cache/dev-python/urllib3-1.6
index 74ed48d83258..9d8a97c5cfe4 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.6
+++ b/metadata/md5-cache/dev-python/urllib3-1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=17a797334d9942444933eb999f2103c4
+_md5_=b4a321f520969a8788e168d7fdff91b6
diff --git a/metadata/md5-cache/dev-python/urllib3-1.7 b/metadata/md5-cache/dev-python/urllib3-1.7
index d3fac0ebfb63..35680967fbf0 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.7
+++ b/metadata/md5-cache/dev-python/urllib3-1.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7b2307500e7f75909ad03cf07f2dd932
+_md5_=e434a4dbcbe4a71eb7732aadc162cd98
diff --git a/metadata/md5-cache/dev-python/urwid-1.1.1-r1 b/metadata/md5-cache/dev-python/urwid-1.1.1-r1
index 342628c3f824..5de61711a879 100644
--- a/metadata/md5-cache/dev-python/urwid-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/urwid-1.1.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://excess.org/urwid/urwid-1.1.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ab508dea21d9e46a7351e7299f23dbe4
+_md5_=18d1c73848984d432c691cd83120f63e
diff --git a/metadata/md5-cache/dev-python/vatnumber-1.0-r1 b/metadata/md5-cache/dev-python/vatnumber-1.0-r1
index c0b8a0d1d4e2..a51e9947555a 100644
--- a/metadata/md5-cache/dev-python/vatnumber-1.0-r1
+++ b/metadata/md5-cache/dev-python/vatnumber-1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://vatnumber.googlecode.com/files/vatnumber-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3d00468c9e7f42c0a6cc990045fb83ac
+_md5_=65069364c2e1ff25b4cd6d226fc71e6a
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 52dfde85fc56..72e8f5ed88ed 100644
--- a/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/versiontools-1.9.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/v/versiontools/versiontools-1.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=13778a275f9f787517c0bf99b800e51d
+_md5_=2a8246de062ca6e0b86465ed285a2b14
diff --git a/metadata/md5-cache/dev-python/virtualenv-1.10-r1 b/metadata/md5-cache/dev-python/virtualenv-1.10-r1
index 2018f01b8540..32cfbf12104c 100644
--- a/metadata/md5-cache/dev-python/virtualenv-1.10-r1
+++ b/metadata/md5-cache/dev-python/virtualenv-1.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/tarball/1.10 -> virtualenv-1.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=6eb67f5a5f3df3d5cd4ab21a12fc1c78
+_md5_=7c1a0ebce3dfa006ef7664bec85e3aa5
diff --git a/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1 b/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
index 2ef99c8045ed..661ea6e4acd2 100644
--- a/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/tarball/1.9.1 -> virtualenv-1.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=0a577b72102deed51f5ba3ad8b3faa8a
+_md5_=f639fe165b05ce972aa44269c9ae0aa0
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.4-r1 b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.4-r1
index d5231edf21e9..1b01eba563ea 100644
--- a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv-clone/virtualenv-clone-0.2.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b14e080f1bf70c8e309dee1da4edd791
+_md5_=794cdce22e3baa67742de75339505e0d
diff --git a/metadata/md5-cache/dev-python/w3lib-1.2-r1 b/metadata/md5-cache/dev-python/w3lib-1.2-r1
index 645d78d3a55f..fb0500b3dcfb 100644
--- a/metadata/md5-cache/dev-python/w3lib-1.2-r1
+++ b/metadata/md5-cache/dev-python/w3lib-1.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/w/w3lib/w3lib-1.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=60b0ceb37e40753430a21a841b8979e4
+_md5_=8e3d6676dd990cc90082ae707e0b0ecf
diff --git a/metadata/md5-cache/dev-python/w3lib-1.3 b/metadata/md5-cache/dev-python/w3lib-1.3
index e61d0f110c1b..daee1e14df3f 100644
--- a/metadata/md5-cache/dev-python/w3lib-1.3
+++ b/metadata/md5-cache/dev-python/w3lib-1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/w/w3lib/w3lib-1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a5c3587e8cd1812e2d767346b3914ffd
+_md5_=b3d8db6d7f2599f80efcd2c29fac592e
diff --git a/metadata/md5-cache/dev-python/webpy-0.37-r1 b/metadata/md5-cache/dev-python/webpy-0.37-r1
index ae1db12bbfbe..f7315f0a4917 100644
--- a/metadata/md5-cache/dev-python/webpy-0.37-r1
+++ b/metadata/md5-cache/dev-python/webpy-0.37-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.webpy.org/static/web.py-0.37.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a22e7665ee6cb9ba1b32865ec2bdb048
+_md5_=149161c1e82d01fe852d1012880facf0
diff --git a/metadata/md5-cache/dev-python/websockify-0.3.0 b/metadata/md5-cache/dev-python/websockify-0.3.0
index 72ccc614d97f..f2b69dbe391f 100644
--- a/metadata/md5-cache/dev-python/websockify-0.3.0
+++ b/metadata/md5-cache/dev-python/websockify-0.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/websockify/archive/v0.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ad98a466fd2157425ba51251752a5d99
+_md5_=606663b620fb4a0ea4a4ec1fe4f8abaa
diff --git a/metadata/md5-cache/dev-python/websockify-0.4.1 b/metadata/md5-cache/dev-python/websockify-0.4.1
index c3403bd67865..01e9490e3875 100644
--- a/metadata/md5-cache/dev-python/websockify-0.4.1
+++ b/metadata/md5-cache/dev-python/websockify-0.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/websockify/archive/v0.4.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1b6518b7d2f487d41e24ccf1488a1fd9
+_md5_=db728b04a508f05af78521896d8cce6a
diff --git a/metadata/md5-cache/dev-python/websockify-0.5.1 b/metadata/md5-cache/dev-python/websockify-0.5.1
new file mode 100644
index 000000000000..ab177f140f6f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websockify-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=WebSockets support for any application/server
+EAPI=5
+HOMEPAGE=https://github.com/kanaka/websockify
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/kanaka/websockify/archive/v0.5.1.zip
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c6c31e4e90fb5e12bbdc767175b5e774
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.9.1 b/metadata/md5-cache/dev-python/werkzeug-0.9.1
index c5db1301ce76..74592231964d 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.9.1
+++ b/metadata/md5-cache/dev-python/werkzeug-0.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1dc5b62f854e98ef72d62bd59fa539eb
+_md5_=71f9c67278fac2965e08bdef8da791e0
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.9.2 b/metadata/md5-cache/dev-python/werkzeug-0.9.2
index 5122952da354..19716b04cfa2 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.9.2
+++ b/metadata/md5-cache/dev-python/werkzeug-0.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.9.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b22041f957f74306972d8d0033edbb3
+_md5_=d4b39164e33d73ed29191d80df187c88
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.9.3 b/metadata/md5-cache/dev-python/werkzeug-0.9.3
index e5a8e965862b..91e0d8ed10d6 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.9.3
+++ b/metadata/md5-cache/dev-python/werkzeug-0.9.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.9.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=07705d43c062ce65db81dbdb1c5a7724
+_md5_=66ca16538c64946800da64f65100f9e6
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.9.4 b/metadata/md5-cache/dev-python/werkzeug-0.9.4
index 59a4249bc424..59d294b5ed51 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.9.4
+++ b/metadata/md5-cache/dev-python/werkzeug-0.9.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.9.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=993591f76b057014936ef269dadcfce8
+_md5_=8f245166784baee42e0ec394a6a8354e
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.10-r1 b/metadata/md5-cache/dev-python/whisper-0.9.10-r1
index c49fecb56990..51a208635420 100644
--- a/metadata/md5-cache/dev-python/whisper-0.9.10-r1
+++ b/metadata/md5-cache/dev-python/whisper-0.9.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/w/whisper/whisper-0.9.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d7d895067ffe40c4b9758e254216836a
+_md5_=ff95861c152be9858b36cbeb4bf620e7
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.12 b/metadata/md5-cache/dev-python/whisper-0.9.12
index 043e3c281057..4c4d8e34b7f4 100644
--- a/metadata/md5-cache/dev-python/whisper-0.9.12
+++ b/metadata/md5-cache/dev-python/whisper-0.9.12
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/w/whisper/whisper-0.9.12.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aa5f97775f7a11d8b5a291250550c255
+_md5_=32dca0df81023011d103ef60e6cb02c6
diff --git a/metadata/md5-cache/dev-python/whoosh-2.4.1-r1 b/metadata/md5-cache/dev-python/whoosh-2.4.1-r1
index f71a7442d483..dbc7be89dfc2 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.4.1-r1
+++ b/metadata/md5-cache/dev-python/whoosh-2.4.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=691a6b72b775e82cb2855ec7a3b50019
+_md5_=eaaa6364cd9aa8a482364a8ef2a9662f
diff --git a/metadata/md5-cache/dev-python/workerpool-0.9.2-r1 b/metadata/md5-cache/dev-python/workerpool-0.9.2-r1
index e8138f46e4cc..969afd249bfd 100644
--- a/metadata/md5-cache/dev-python/workerpool-0.9.2-r1
+++ b/metadata/md5-cache/dev-python/workerpool-0.9.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/w/workerpool/workerpool-0.9.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f2459ca6cb19c9f958df1f75fbedf21d
+_md5_=e7dba85dde77bdfe446bc676b7de1fc3
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
index 7ee49206c79d..6cc8e1dc8604 100644
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ b/metadata/md5-cache/dev-python/ws4py-9999
@@ -7,5 +7,5 @@ IUSE=+client +server test +threads
 LICENSE=BSD
 RDEPEND=client? ( dev-lang/python[threads?] ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3902b6fa5addb84a2c1305106471f720
diff --git a/metadata/md5-cache/dev-python/wsgilog-0.3-r1 b/metadata/md5-cache/dev-python/wsgilog-0.3-r1
index 23618ea32956..b6e97dc92a19 100644
--- a/metadata/md5-cache/dev-python/wsgilog-0.3-r1
+++ b/metadata/md5-cache/dev-python/wsgilog-0.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsgilog/wsgilog-0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9a22de1d8fe9e3067b4696367716efa6
+_md5_=1a6875f7b76460eec6a0a2b2a6ba454c
diff --git a/metadata/md5-cache/dev-python/wstools-0.4-r1 b/metadata/md5-cache/dev-python/wstools-0.4-r1
index 1a227f11748e..f5c1f27e2e59 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4-r1
+++ b/metadata/md5-cache/dev-python/wstools-0.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=baaa224bff2c4189b5379ce5dcbb8401
+_md5_=6001455cd27b3e217d997f9587702bd1
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.3 b/metadata/md5-cache/dev-python/wstools-0.4.3
index 66a203ba0435..b4ad5c8d0fee 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.3
+++ b/metadata/md5-cache/dev-python/wstools-0.4.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8f453e704cd448d7de5482fc1d953218
+_md5_=d008db79c20b49201cac2fca695a76eb
diff --git a/metadata/md5-cache/dev-python/wtforms-1.0.3-r1 b/metadata/md5-cache/dev-python/wtforms-1.0.3-r1
index b518fcfdb060..8129005a83f0 100644
--- a/metadata/md5-cache/dev-python/wtforms-1.0.3-r1
+++ b/metadata/md5-cache/dev-python/wtforms-1.0.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-1.0.3.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4e71b57330defe6cfdf6049316269f73
+_md5_=fdd078fb1d6192609f731732fcb84862
diff --git a/metadata/md5-cache/dev-python/wtforms-1.0.4 b/metadata/md5-cache/dev-python/wtforms-1.0.4
index ac0684ba2c28..49754b6d6fb5 100644
--- a/metadata/md5-cache/dev-python/wtforms-1.0.4
+++ b/metadata/md5-cache/dev-python/wtforms-1.0.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-1.0.4.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=444fec9c9fae5476e5d6d1cf73a71d0b
+_md5_=a83d8a10db4255d3061f343ae0b4f371
diff --git a/metadata/md5-cache/dev-python/xlrd-0.9.0 b/metadata/md5-cache/dev-python/xlrd-0.9.0
index d52898ad3e1c..bda8433b025a 100644
--- a/metadata/md5-cache/dev-python/xlrd-0.9.0
+++ b/metadata/md5-cache/dev-python/xlrd-0.9.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/x/xlrd/xlrd-0.9.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=102eb7965a7b7b695b36ac25254a4773
+_md5_=1cb1c2fe3e5b9d4ea693882ecb56d301
diff --git a/metadata/md5-cache/dev-python/xlrd-0.9.2 b/metadata/md5-cache/dev-python/xlrd-0.9.2
index 5ce567e40b5e..b9b0ed09f606 100644
--- a/metadata/md5-cache/dev-python/xlrd-0.9.2
+++ b/metadata/md5-cache/dev-python/xlrd-0.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/x/xlrd/xlrd-0.9.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5cd82170e24805f03793364c513972d3
+_md5_=c9d1b8410786bc8573e6fe8f0cb3e377
diff --git a/metadata/md5-cache/dev-python/xlwt-0.7.4-r1 b/metadata/md5-cache/dev-python/xlwt-0.7.4-r1
index 48843a10e3a2..a079c6b24619 100644
--- a/metadata/md5-cache/dev-python/xlwt-0.7.4-r1
+++ b/metadata/md5-cache/dev-python/xlwt-0.7.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-0.7.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f96f2495c17f3d8d0e5bdd3e5dc09b9d
+_md5_=59e22baf9a002e154a688c3b79399d01
diff --git a/metadata/md5-cache/dev-python/xlwt-0.7.5 b/metadata/md5-cache/dev-python/xlwt-0.7.5
index ef4452348a53..5d6e3b8b1bcf 100644
--- a/metadata/md5-cache/dev-python/xlwt-0.7.5
+++ b/metadata/md5-cache/dev-python/xlwt-0.7.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-0.7.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dd118dba47a5943f5ed86d8ff7de464e
+_md5_=39766e6439a968da67c5e96f811647c1
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 e638b1e6e1b0..9d2921d4db41 100644
--- a/metadata/md5-cache/dev-python/yolk-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/yolk-0.4.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/y/yolk/yolk-0.4.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0be6bce457fe4ae04e69bf3d42eac8be
+_md5_=01be0ddde65fc04f0257df0a86a4fe00
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
index 48e60992ef8d..b0252e2307bb 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows to embed C/C++ in Ruby code
 EAPI=5
 HOMEPAGE=http://www.zenspider.com/ZSS/Products/RubyInline/
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/zentest[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.2.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bffe317c96df3e7b2a9d8abc2b0e9399
+_md5_=c732df012965333aecd017a2824747ac
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.2.1 b/metadata/md5-cache/dev-ruby/cocaine-0.2.1
deleted file mode 100644
index cbd900588c11..000000000000
--- a/metadata/md5-cache/dev-ruby/cocaine-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/bourne[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bourne[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/bourne[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/bourne[ruby_targets_jruby] dev-ruby/mocha[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A small library for doing command lines
-EAPI=4
-HOMEPAGE=http://www.thoughtbot.com/projects/cocaine
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/cocaine-0.2.1.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=38920e65723b64747ddc8b472179e811
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.4.0 b/metadata/md5-cache/dev-ruby/cocaine-0.4.0
deleted file mode 100644
index bdedeb27264e..000000000000
--- a/metadata/md5-cache/dev-ruby/cocaine-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/bourne[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bourne[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/bourne[ruby_targets_jruby] dev-ruby/mocha[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A small library for doing command lines
-EAPI=4
-HOMEPAGE=http://www.thoughtbot.com/projects/cocaine
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/cocaine-0.4.0.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3b2f50340e4c01589b3686728bde90e6
diff --git a/metadata/md5-cache/dev-ruby/flickr-1.0.2-r3 b/metadata/md5-cache/dev-ruby/flickr-1.0.2-r3
deleted file mode 100644
index 34ef87fe0ccc..000000000000
--- a/metadata/md5-cache/dev-ruby/flickr-1.0.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/xml-simple[ruby_targets_ruby18] ) ruby_targets_jruby? ( dev-ruby/xml-simple[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=An insanely easy interface to the Flickr photo-sharing service.
-EAPI=2
-HOMEPAGE=http://rubyforge.org/projects/flickr/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_jruby doc test test
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/xml-simple[ruby_targets_ruby18] ) ruby_targets_jruby? ( dev-ruby/xml-simple[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/flickr-1.0.2-gentoo.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0b060a5885b42c51301fc7e6c423c761
diff --git a/metadata/md5-cache/dev-ruby/flickr-1.0.2-r5 b/metadata/md5-cache/dev-ruby/flickr-1.0.2-r5
index 695a74555d6a..81b1f6df16bf 100644
--- a/metadata/md5-cache/dev-ruby/flickr-1.0.2-r5
+++ b/metadata/md5-cache/dev-ruby/flickr-1.0.2-r5
@@ -4,11 +4,11 @@ DESCRIPTION=An insanely easy interface to the Flickr photo-sharing service.
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/flickr/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/xml-simple[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/xml-simple[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://gentoo/flickr-1.0.2-gentoo.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7dca328cda53df66ac51ff55d9baa78e
+_md5_=fd2e09fe1dccb15ae936f8c04edc43dd
diff --git a/metadata/md5-cache/dev-ruby/gem_plugin-0.2.3-r2 b/metadata/md5-cache/dev-ruby/gem_plugin-0.2.3-r2
index 9b64c4b4de2c..f53056020844 100644
--- a/metadata/md5-cache/dev-ruby/gem_plugin-0.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/gem_plugin-0.2.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A plugin system based only on rubygems that uses dependencies only.
 EAPI=2
 HOMEPAGE=http://mongrel.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby 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
+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=mongrel
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/gem_plugin-0.2.3.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eb69d48b89896f51c452b4b4053af3c1
+_md5_=228b4ccb028f070a41644112be753777
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.2.5 b/metadata/md5-cache/dev-ruby/httpclient-2.2.5
index 05b21e132199..1b7dbd4a9dfc 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.2.5
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.2.5
@@ -4,11 +4,11 @@ DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (
 EAPI=4
 HOMEPAGE=https://github.com/nahi/httpclient
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ssl[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/ruby-ssl[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/tarball/v2.2.5 -> httpclient-2.2.5.tgz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bb5d99036a3edae42823f8c3fc52ef33
+_md5_=642e94e4598eda4bec744e5d0512ace2
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.0 b/metadata/md5-cache/dev-ruby/json-1.8.0
index d902324106de..ae189d8e4b30 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.0
+++ b/metadata/md5-cache/dev-ruby/json-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A JSON implementation as a Ruby extension.
 EAPI=5
 HOMEPAGE=http://json.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.0.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a0b23f729ec9571e9f19f3122c0eef9b
+_md5_=ce9efcdb169749dfa1a2359f25c69bb2
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4 b/metadata/md5-cache/dev-ruby/mocha-0.11.4
index 70f81a6b2dfe..4dc63db01c2e 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=4
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6a98935b274134f9176449cd8961f074
+_md5_=72bdff060f12d2d176988d831ed996d5
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.7 b/metadata/md5-cache/dev-ruby/mocha-0.12.7
index b6779b6a86fa..c3c71f45962e 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.7
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.7
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=4
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.7.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9a4646dff0b33e62e7037cbbf8b1737a
+_md5_=d29c29fe0957072806a64ccfb6158df6
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3 b/metadata/md5-cache/dev-ruby/mocha-0.13.3
index 3804520d9e93..14de67e68a4e 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e191ec52525ac180724c290d7f9f5fb7
+_md5_=6974010953452b1b210493a5640cc7ab
diff --git a/metadata/md5-cache/dev-ruby/ohai-0.6.12 b/metadata/md5-cache/dev-ruby/ohai-0.6.12
deleted file mode 100644
index 8900d1258266..000000000000
--- a/metadata/md5-cache/dev-ruby/ohai-0.6.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Ohai profiles your system and emits JSON
-EAPI=4
-HOMEPAGE=http://wiki.opscode.com/display/chef/Ohai
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/opscode/ohai/tarball/0.6.12 -> ohai-0.6.12.tgz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ce4636855844b3fb10b46afb43bb9504
diff --git a/metadata/md5-cache/dev-ruby/ohai-6.14.0-r1 b/metadata/md5-cache/dev-ruby/ohai-6.14.0-r1
deleted file mode 100644
index 2134ea50e07a..000000000000
--- a/metadata/md5-cache/dev-ruby/ohai-6.14.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Ohai profiles your system and emits JSON
-EAPI=4
-HOMEPAGE=http://wiki.opscode.com/display/chef/Ohai
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/opscode/ohai/tarball/6.14.0 -> ohai-6.14.0.tgz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=86d76e9ba8590e7ff36e481321e2277f
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.9 b/metadata/md5-cache/dev-ruby/racc-1.4.9
index 0d9ebf7d5908..017f4bc09ee2 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.9
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.9
@@ -4,11 +4,11 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=4
 HOMEPAGE=http://www.loveruby.net/en/racc.html
 IUSE=doc test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.9.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1164c85d65848e785af6be5e7a8ba05b
+_md5_=0fc06513022e926f26c0fae3a789d1e3
diff --git a/metadata/md5-cache/dev-ruby/rake-0.9.6 b/metadata/md5-cache/dev-ruby/rake-0.9.6
index d74c31a988df..62a7162ccbbf 100644
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6
+++ b/metadata/md5-cache/dev-ruby/rake-0.9.6
@@ -4,11 +4,11 @@ DESCRIPTION=Make-like scripting in Ruby
 EAPI=4
 HOMEPAGE=http://rake.rubyforge.org/
 IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-0.9.6.gem
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=afbc7251b54ab6dc09d8b71dc68dba0c
+_md5_=1803259e16083b79ebbada551580497d
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1 b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1
index 9ad7a53e8d2c..d933a2250ccb 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
 RDEPEND=ruby_targets_ruby18? ( =dev-ruby/json-1*[ruby_targets_ruby18] >=dev-ruby/json-1.4[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/json-1*[ruby_targets_ruby19] >=dev-ruby/json-1.4[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/json-1*[ruby_targets_ruby20] >=dev-ruby/json-1.4[ruby_targets_ruby20] ) ruby_targets_jruby? ( =dev-ruby/json-1*[ruby_targets_jruby] >=dev-ruby/json-1.4[ruby_targets_jruby] ) ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.2:1.9 ) ruby_targets_ruby18? ( >=dev-lang/ruby-1.8.7:1.8 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.0.1.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ef31ea6b2ae19f70d927e86e5fffe89f
+_md5_=926fea47dd8c0d2f9ac099933e094944
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.1 b/metadata/md5-cache/dev-ruby/rmagick-2.13.1
deleted file mode 100644
index 583703098b64..000000000000
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-gfx/imagemagick-6.4.9[-hdri] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
-EAPI=2
-HOMEPAGE=http://rmagick.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test
-KEYWORDS=amd64 hppa ~mips ppc ppc64 x86 ~x86-macos
-LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.4.9[-hdri] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-SLOT=0
-SRC_URI=mirror://rubyforge/rmagick/RMagick-2.13.1.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2faaef10c87a350909a7efb008a83dc0
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.1-r1 b/metadata/md5-cache/dev-ruby/rmagick-2.13.1-r1
deleted file mode 100644
index 1df3b153827d..000000000000
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing library
-EAPI=5
-HOMEPAGE=http://rmagick.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-macos
-LICENSE=Artistic
-RDEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=mirror://rubyforge/rmagick/RMagick-2.13.1.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ba82e6f5ace883e2aa91adaef9e9690f
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.2 b/metadata/md5-cache/dev-ruby/rmagick-2.13.2
index 5d1189acffb9..d3abbbe7fc94 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.2
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.13.2
@@ -4,11 +4,11 @@ DESCRIPTION=An interface between Ruby and the ImageMagick(TM) image processing l
 EAPI=5
 HOMEPAGE=http://rmagick.rubyforge.org/
 IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test
-KEYWORDS=amd64 hppa ~mips ppc ~ppc64 x86 ~x86-macos
+KEYWORDS=amd64 hppa ~mips ppc ppc64 x86 ~x86-macos
 LICENSE=Artistic
 RDEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/rmagick/RMagick-2.13.2.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=224b7866785958ee7149a61f5770479b
+_md5_=5ac49828fe418711a4cc6d35b8b87211
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-9999 b/metadata/md5-cache/dev-ruby/ruby-elf-9999
index 378e5d6359cb..26e143c96205 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-9999
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/man ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab297c1707088b39bd0a6b07667aa364
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8
index 8db1e9275895..d40eab59d30c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Glib2 bindings
 EAPI=4
 HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 test
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=Ruby
 RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	ruby-ng-gnome2	e4cff284a3481220aed757f422ae56c7	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=273aeb5a4079b3d69e7b58b5b105ccae
+_md5_=0b85ffae4e101ccfad98d0afabf9b7d0
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.15 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.15
new file mode 100644
index 000000000000..bf759638d560
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.15
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=A Ruby interface to some LDAP libraries
+EAPI=5
+HOMEPAGE=http://ruby-ldap.sourceforge.net/
+IUSE=ssl elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos
+LICENSE=BSD
+RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://rubygems/ruby-ldap-0.9.15.gem
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=64d4fe14bfe0d0320713380f2794b02c
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-1.3.1-r1 b/metadata/md5-cache/dev-ruby/ruby2ruby-1.3.1-r1
index 0d7a900bf6b2..bd89de697f38 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-1.3.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=2
 HOMEPAGE=http://seattlerb.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby18? ( =dev-ruby/parsetree-3*[ruby_targets_ruby18] =dev-ruby/sexp_processor-3*[ruby_targets_ruby18] =dev-ruby/ruby_parser-2*[ruby_targets_ruby18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby2ruby-1.3.1.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6ec0a6b76695586151d06683f7d90fa6
+_md5_=5aea9930c6219de16a85221ca97956b2
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6
index 50fbc14012ba..f7c1af727f69 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=5
 HOMEPAGE=http://seattlerb.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/sexp_processor:4[ruby_targets_ruby18] dev-ruby/ruby_parser:3[ruby_targets_ruby18] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/sexp_processor:4[ruby_targets_ruby19] dev-ruby/ruby_parser:3[ruby_targets_ruby19] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.0.6.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0fe4a3172a01428858510339bf94d95e
+_md5_=fda4752e8994fbf876f0b1c5e7b510af
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-2.3.1-r1 b/metadata/md5-cache/dev-ruby/ruby_parser-2.3.1-r1
index 0c02ba114640..4582a1e738ad 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-2.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-2.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby parser written in pure ruby.
 EAPI=2
 HOMEPAGE=http://parsetree.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/sexp_processor-3.0.9[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-3.0.9[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/sexp_processor-3.0.9[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby_parser-2.3.1.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9b68002fdae86818a5d6ed2b67020d94
+_md5_=b40f29f76861ce3d702845a342bb74d5
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3 b/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3
index edc12210c28f..ba8e9bfa4f89 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby parser written in pure ruby.
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby18] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby19] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_jruby] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.1.3.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d9d94de0f179c3908c53b47d2e02bafa
+_md5_=f9c50d5c9292d9f0f9e04036f47ac6d2
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.0.3 b/metadata/md5-cache/dev-ruby/rubygems-2.0.3
index c79723c3c438..1749ef5b1930 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/rubygems/
 IUSE=server test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~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 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
 RDEPEND=ruby_targets_jruby? ( >=dev-java/jruby-1.5.6-r1 ) ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.3_rc1 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ru
 SLOT=0
 SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.0.3.tgz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f419d33ab5f03150816784305b8e4eac
+_md5_=bfd952f43bf5384056ead311c9af3f2d
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-3.0.5 b/metadata/md5-cache/dev-ruby/sexp_processor-3.0.5
deleted file mode 100644
index 48c9fad39de9..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-3.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/hoe-seattlerb[ruby_targets_ruby18] ) test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/hoe-seattlerb[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/hoe[ruby_targets_ree18] dev-ruby/hoe-seattlerb[ruby_targets_ree18] ) test? ( dev-ruby/hoe[ruby_targets_ree18] dev-ruby/hoe-seattlerb[ruby_targets_ree18] dev-ruby/minitest[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/hoe[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] ) test? ( dev-ruby/hoe[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] dev-ruby/minitest[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project.
-EAPI=2
-HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-SLOT=0
-SRC_URI=mirror://rubygems/sexp_processor-3.0.5.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=df7821ec6210304cb6a37b02393471ab
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.0.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.0.1
deleted file mode 100644
index b7f3553e1ad4..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/hoe-seattlerb[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/hoe[ruby_targets_ree18] dev-ruby/hoe-seattlerb[ruby_targets_ree18] dev-ruby/minitest[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/hoe[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] dev-ruby/minitest[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project.
-EAPI=4
-HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=4
-SRC_URI=mirror://rubygems/sexp_processor-4.0.1.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=068fd334b267a9c9ed2f20fd1df42717
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.1.3 b/metadata/md5-cache/dev-ruby/sexp_processor-4.1.3
deleted file mode 100644
index b486be6520f1..000000000000
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/hoe[ruby_targets_ruby18] dev-ruby/hoe-seattlerb[ruby_targets_ruby18] dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/hoe[ruby_targets_ree18] dev-ruby/hoe-seattlerb[ruby_targets_ree18] dev-ruby/minitest[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/hoe[ruby_targets_ruby19] dev-ruby/hoe-seattlerb[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/hoe[ruby_targets_jruby] dev-ruby/hoe-seattlerb[ruby_targets_jruby] dev-ruby/minitest[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rdoc[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=Processor for s-expressions created as part of the ParseTree project.
-EAPI=5
-HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=4
-SRC_URI=mirror://rubygems/sexp_processor-4.1.3.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6ecb83d83a6bc82caad107e693e79807
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1
index aa219623a2f7..fa55a35015c9 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=5
 HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.2.1.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=74933181668a8563cddcd99f21f2dc1f
+_md5_=eb5899893863c38f8fc54db02c5ca5be
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0
index 84c7cd7ae3a6..509ad361ec6e 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A very simple library to use URL shortening services such as TinyURL
 EAPI=5
 HOMEPAGE=http://shorturl.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1504b26f00cd261edc7ce3500485d4d0
+_md5_=2516510fca95ffb73b6c4e462f4070ef
diff --git a/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3 b/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3
index be8e336cf8ff..43e9aaead767 100644
--- a/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3
+++ b/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=An email handling library
 EAPI=2
 HOMEPAGE=http://rubyforge.org/projects/tmail/
 IUSE=debug elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/tmail-1.2.7.1.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0994039d0daec75386674f8fb3837d61
+_md5_=94ae5ec433b960cff16dda76ba7ba527
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1 b/metadata/md5-cache/dev-ruby/uconv-0.6.1
index 9c4ce424865b..4436bcca7a86 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=A module to convert ISO/IEC 10646 (Unicode) string and Japanese stri
 EAPI=5
 HOMEPAGE=http://www.yoshidam.net/Ruby.html#uconv
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
-KEYWORDS=~amd64 ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=40e9f2fcab1ab5d56f812a0700de5c44
+_md5_=386dab258303c2c27f496ec8c7091c33
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.1 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.1
deleted file mode 100644
index 32de3509b03d..000000000000
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Easy API to maintain XML. It is a Ruby port of Grant McLean's Perl module XML::Simple.
-EAPI=2
-HOMEPAGE=http://rubyforge.org/projects/xml-simple/
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_jruby ruby_targets_ree18 test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-SLOT=0
-SRC_URI=mirror://rubygems/xml-simple-1.1.1.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bcc4c88eb857cbd65a17af2ce965d832
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.2 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.2
index e0364c2fd564..bf7e05cb6653 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.2
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Easy API to maintain XML. It is a Ruby port of Grant McLean's Perl m
 EAPI=2
 HOMEPAGE=http://rubyforge.org/projects/xml-simple/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
 SLOT=0
 SRC_URI=mirror://rubygems/xml-simple-1.1.2.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3c3f21712be9589a10f3e3eb474c294e
+_md5_=2d1d97704c6038003717060f7da8f653
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
index 375d7bfe34e1..c5e4c0841b2b 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r6
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b4a4cb087d74ef38b53ece03bb977f75
+_md5_=fe3de7d3766ebc887d1b43fd2294da1b
diff --git a/metadata/md5-cache/dev-tex/dot2tex-2.8.7-r1 b/metadata/md5-cache/dev-tex/dot2tex-2.8.7-r1
index 9078d9347fc9..5ec041ac1ff4 100644
--- a/metadata/md5-cache/dev-tex/dot2tex-2.8.7-r1
+++ b/metadata/md5-cache/dev-tex/dot2tex-2.8.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://dot2tex.googlecode.com/files/dot2tex-2.8.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e58ac61d0ec283915a9db4bf413c480
+_md5_=c3f334a716f14ba7a629390c0ba73084
diff --git a/metadata/md5-cache/dev-util/abi-compliance-checker-9999 b/metadata/md5-cache/dev-util/abi-compliance-checker-9999
index c1b7df629cea..a00c7594b8a0 100644
--- a/metadata/md5-cache/dev-util/abi-compliance-checker-9999
+++ b/metadata/md5-cache/dev-util/abi-compliance-checker-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=http://ispras.linuxbase.org/index.php/ABI_compliance_checker
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=8257aa4cbd47c3c735c222146f95a6db
diff --git a/metadata/md5-cache/dev-util/atomic-install-9999 b/metadata/md5-cache/dev-util/atomic-install-9999
index 3f5aa8063a1b..de7f455b5e96 100644
--- a/metadata/md5-cache/dev-util/atomic-install-9999
+++ b/metadata/md5-cache/dev-util/atomic-install-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs xattr
 LICENSE=BSD
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb1eebc5888ee6fce7524bb2bf949889
diff --git a/metadata/md5-cache/dev-util/bdelta-9999 b/metadata/md5-cache/dev-util/bdelta-9999
index 0ba11ef18cb5..81c829a7b8a5 100644
--- a/metadata/md5-cache/dev-util/bdelta-9999
+++ b/metadata/md5-cache/dev-util/bdelta-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=http://bdelta.org
 LICENSE=MPL-2.0
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=de52ec82693829bf4ad761fab15ecace
diff --git a/metadata/md5-cache/dev-util/biew-6.1.0-r3 b/metadata/md5-cache/dev-util/biew-6.1.0-r3
new file mode 100644
index 000000000000..96fe82bca206
--- /dev/null
+++ b/metadata/md5-cache/dev-util/biew-6.1.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=gpm? ( sys-libs/gpm )
+DESCRIPTION=A portable viewer of binary files, hexadecimal and disassembler modes.
+EAPI=4
+HOMEPAGE=http://beye.sourceforge.net/
+IUSE=gpm mmx sse
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gpm? ( sys-libs/gpm )
+REQUIRED_USE=mmx sse
+SLOT=0
+SRC_URI=mirror://sourceforge/beye/6.1.0/biew-610-src.tar.bz2
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3100e902465f94d6b5af9a1f8ec00053
diff --git a/metadata/md5-cache/dev-util/catalyst-2.9999 b/metadata/md5-cache/dev-util/catalyst-2.9999
index 078e3f94ab11..1c56bb3655c3 100644
--- a/metadata/md5-cache/dev-util/catalyst-2.9999
+++ b/metadata/md5-cache/dev-util/catalyst-2.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lbzip2 app-crypt/shash virtual/cdrtools ccache? ( dev-util/ccache ) ia64? ( sys-fs/dosfstools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d7ded59c0f816d96d31330f647b36fc
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 73a7c7008901..0d0df77978d7 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -7,5 +7,5 @@ IUSE=ccache kernel_linux
 LICENSE=GPL-2
 RDEPEND=app-arch/lbzip2 app-crypt/shash virtual/cdrtools x86? ( >=sys-boot/syslinux-3.72 ) amd64? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) ia64? ( sys-fs/dosfstools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) =dev-lang/python-2*
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f204aa01e40fd8008364a8132d9244e0
diff --git a/metadata/md5-cache/dev-util/cdiff-0.6 b/metadata/md5-cache/dev-util/cdiff-0.6
index fbbbb98a1e2c..9ab5d0d22e76 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.6
+++ b/metadata/md5-cache/dev-util/cdiff-0.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-0.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=658fb1345d47208534a7bd3306f82ef3
+_md5_=84dad6e89ee96261413d6acc6479b6ae
diff --git a/metadata/md5-cache/dev-util/cdiff-0.7 b/metadata/md5-cache/dev-util/cdiff-0.7
index fa639899654d..d613eec63fca 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.7
+++ b/metadata/md5-cache/dev-util/cdiff-0.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-0.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=84b79bf050ec62d2765950d00277c392
+_md5_=eb0a767ece0ce3528ab4859b2e855141
diff --git a/metadata/md5-cache/dev-util/cdiff-0.7.1 b/metadata/md5-cache/dev-util/cdiff-0.7.1
index 7a133f5a4f5c..bf2009bfa9e6 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.7.1
+++ b/metadata/md5-cache/dev-util/cdiff-0.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-0.7.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7a415aaa48304fae022411a567b125dc
+_md5_=267936424c47a177d34fe18af774201b
diff --git a/metadata/md5-cache/dev-util/cdiff-0.8 b/metadata/md5-cache/dev-util/cdiff-0.8
index ae016d26f798..ed238dfb1abc 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.8
+++ b/metadata/md5-cache/dev-util/cdiff-0.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-0.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dbfea30169ddcd5eae090bd596ec8a37
+_md5_=9d10dd4672e555def2db12d7bce3d81a
diff --git a/metadata/md5-cache/dev-util/cdiff-0.9 b/metadata/md5-cache/dev-util/cdiff-0.9
index bac58fab34ae..05c57b777741 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.9
+++ b/metadata/md5-cache/dev-util/cdiff-0.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-0.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=57309679c019aeb22ab2ded92d0ad62e
+_md5_=8977aededf6787d6b0334069c7414ee8
diff --git a/metadata/md5-cache/dev-util/cdiff-0.9.1 b/metadata/md5-cache/dev-util/cdiff-0.9.1
index 311ad87b48d6..e0ced81e2148 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.9.1
+++ b/metadata/md5-cache/dev-util/cdiff-0.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-0.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d48d0aae8d407c4edb81bc927375f0bd
+_md5_=3695bf8e65d3fa60ec85683c721bec09
diff --git a/metadata/md5-cache/dev-util/cdiff-0.9.2 b/metadata/md5-cache/dev-util/cdiff-0.9.2
index f6c70642ec31..5e14925163de 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.9.2
+++ b/metadata/md5-cache/dev-util/cdiff-0.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-0.9.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=905300cf178ce6334cfbaed5616de505
+_md5_=06bf34149120c1b57ed1fbcea53a3de8
diff --git a/metadata/md5-cache/dev-util/cligh-9999 b/metadata/md5-cache/dev-util/cligh-9999
index 89899ac5b333..1d909edba52e 100644
--- a/metadata/md5-cache/dev-util/cligh-9999
+++ b/metadata/md5-cache/dev-util/cligh-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/PyGithub[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c00e758a835b67552e8098a354f06932
diff --git a/metadata/md5-cache/dev-util/coccigrep-1.12 b/metadata/md5-cache/dev-util/coccigrep-1.12
index ba1e8595dba9..f8bfa8800299 100644
--- a/metadata/md5-cache/dev-util/coccigrep-1.12
+++ b/metadata/md5-cache/dev-util/coccigrep-1.12
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/regit/coccigrep/archive/v1.12.tar.gz -> coccigrep-1.12.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=d9a1a3ee72ff732f7deca102394a30c2
+_md5_=2001e814399322feeacfe00c8bf9d776
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc17 b/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc17
index bc0cf1d716eb..a5b06aa924fd 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc17
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.0_rc17
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( ocaml python )
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.0-rc17.tgz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b0e842e78469d0c1e7b292a54abeb9a0
+_md5_=19a49f77620b5208de351a9a3bbd2523
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.59-r1 b/metadata/md5-cache/dev-util/cppcheck-1.59-r1
index c0d46dc526c0..7e2a7b5a0e6a 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.59-r1
+++ b/metadata/md5-cache/dev-util/cppcheck-1.59-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.59.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a959722b52aa492ddaee93794d9501b2
+_md5_=0ccb5cd6114869475ee66aef7d01bae2
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.60.1 b/metadata/md5-cache/dev-util/cppcheck-1.60.1
index ac30f8609d57..38446f011756 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.60.1
+++ b/metadata/md5-cache/dev-util/cppcheck-1.60.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.60.1.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=92263b5f1a4742189a4a0dcc5a055859
+_md5_=87a322d3c3a1cfa1a9ca31c8aeeccf09
diff --git a/metadata/md5-cache/dev-util/cppunit-9999 b/metadata/md5-cache/dev-util/cppunit-9999
index 19fd13053a9b..32a447ba3105 100644
--- a/metadata/md5-cache/dev-util/cppunit-9999
+++ b/metadata/md5-cache/dev-util/cppunit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.freedesktop.org/wiki/Software/cppunit
 IUSE=doc examples static-libs
 LICENSE=LGPL-2.1
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8282292f1047fb3ae5c966ee3d4af3f1
diff --git a/metadata/md5-cache/dev-util/dwarves-1.10-r1 b/metadata/md5-cache/dev-util/dwarves-1.10-r1
index 8e0e9a7f383c..85d52a6ade3a 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.10-r1
+++ b/metadata/md5-cache/dev-util/dwarves-1.10-r1
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_ta
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.10.tar.bz2
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b843fc7d004f9d9c7247d6fc5783c23e
+_md5_=fb768f040b526998c04f5f1f8c10acd3
diff --git a/metadata/md5-cache/dev-util/dwarves-9999 b/metadata/md5-cache/dev-util/dwarves-9999
index 2dd737900171..27692015fef1 100644
--- a/metadata/md5-cache/dev-util/dwarves-9999
+++ b/metadata/md5-cache/dev-util/dwarves-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.131 sys-libs/zlib
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a854b750bf756d36db0ca20d0110cf58
diff --git a/metadata/md5-cache/dev-util/fatrace-0.5 b/metadata/md5-cache/dev-util/fatrace-0.5
index 8a2a31ceada5..aa971693de91 100644
--- a/metadata/md5-cache/dev-util/fatrace-0.5
+++ b/metadata/md5-cache/dev-util/fatrace-0.5
@@ -9,4 +9,4 @@ RDEPEND=powertop? ( python_single_target_python3_2? ( dev-lang/python:3.2 ) pyth
 SLOT=0
 SRC_URI=https://launchpad.net/fatrace/trunk/0.5/+download/fatrace-0.5.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ac8440e841765e8d729cf898df341377
+_md5_=87bd401b0c9193c945472c87b0ab84a0
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4 b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4
index 4c0ae66356bf..52b9fe106a80 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils !<sys-apps/portage-2.1.10.58 python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_1? ( dev-lang/python:3.1[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] )
+DEPEND=app-arch/xz-utils !<sys-apps/portage-2.1.10.58 python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] )
 DESCRIPTION=GDBus code and documentation generator
 EAPI=4
 HOMEPAGE=http://www.gtk.org/
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.32.4:2
-RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_1? ( dev-lang/python:3.1[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] )
-REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] )
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.4.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	892e597faee02a5b94eb02ab512e7622	python-distutils-ng	a5be27b6f8e71ff6b1e5ed69ef2f8f1c	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=df3df57c0bc5ea96fa9a3a8c49682a89
+_md5_=736d0f49b92e61464f4e58be9800b1bb
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1
index 684de8bbaea5..e8fb67d9fb1f 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.4.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c5ee8fa53d74beb11bd95c3af4f36817
+_md5_=0b9caf4811ffbb88b5bd02412ffae314
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r2
index bd514faf7de5..46bce5e3e4ab 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r2
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.4.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=219a33e6ad7b5db4b968c47e73a69817
+_md5_=13204500aa0d78d48dbe0e2fdc781c47
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3
index 10eb799c62af..579b9c74b64a 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.34/glib-2.34.3.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8bedad334b9c30abe53830ec219e8ea3
+_md5_=2b5f5a811d9bebfdf5ec8ddd8395beff
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3-r1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3-r1
index 4cd391b3e218..1a122d5fc769 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3-r1
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.34.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.34/glib-2.34.3.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f6eb4507954427a1a68c70de6c355be4
+_md5_=ffb438a83eeb3e662d976d035a4e16b8
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4 b/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4
index fef33778a27b..36fa2e50cdf5 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.4.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a73f6f7e3ee3834cf1648667f8b71ca8
+_md5_=7829a4512941f501babed5039127c0e8
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4-r1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4-r1
index 455a5ae27b4b..612830ecc6ca 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4-r1
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.36.4-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.4.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6e25e5902afbfb45314812e54f1c8186
+_md5_=3c4ae4a091860a38d4e84177424452fb
diff --git a/metadata/md5-cache/dev-util/ghh-9999 b/metadata/md5-cache/dev-util/ghh-9999
index 7c9199239b11..0cc68a5ac5e5 100644
--- a/metadata/md5-cache/dev-util/ghh-9999
+++ b/metadata/md5-cache/dev-util/ghh-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://jean-francois.richard.name/ghh/
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libgnome app-text/gnome-doc-utils >=app-text/asciidoc-8 dev-python/pygtk:2 dev-vcs/git || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=8216bea2d490028824f4807074e49c84
diff --git a/metadata/md5-cache/dev-util/gprof2dot-0_p20130517 b/metadata/md5-cache/dev-util/gprof2dot-0_p20130517
index 9a381005073a..9083fb39797d 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-0_p20130517
+++ b/metadata/md5-cache/dev-util/gprof2dot-0_p20130517
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/gprof2dot-0_p20130517.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1ce80ec6bfdc87d7fdd307dcdd481289
+_md5_=225609d0816a48367597249331a1227b
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.16 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.16
index 0c0217d95930..1a251d9716ff 100644
--- a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.16
+++ b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.16
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.16.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4c374d257502115f9605f96f10b2619a
+_md5_=0064ddd1ab7e113ea420ed88c15646af
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.19 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.19
index 2a00b0e87752..5d79e43bfc7e 100644
--- a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.19
+++ b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.19
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.19.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=879b341d0d9dd44c419fefb7b2e9336c
+_md5_=1933f1894087ae148b777fc5b7b2d9ce
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.20 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.20
index e6a925c4cf69..52df6460ce30 100644
--- a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.20
+++ b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.20
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.20.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e4752d824421aaf2117d574eab567993
+_md5_=93943fb4304ba0687a2161ea82a8f0f3
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.19 b/metadata/md5-cache/dev-util/gtk-doc-1.19
index 3e3a62394de6..b809a95e1794 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.19
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.19
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ Documentation Generator
 EAPI=5
 HOMEPAGE=http://www.gtk.org/gtk-doc/
 IUSE=debug doc emacs highlight vim test debug python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.6:2 >=dev-lang/perl-5.6 >=app-text/openjade-1.3.1 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( virtual/emacs ) highlight? ( vim? ( || ( app-editors/vim app-editors/gvim ) ) !vim? ( dev-util/source-highlight ) ) !!<dev-tex/tex4ht-20090611_p1038-r1
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.19/gtk-doc-1.19.tar.xz
 _eclasses_=elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3a390fe1f5621ad31c0b2d78694198f6
+_md5_=82d238a9add83d05bccc427519d920b1
diff --git a/metadata/md5-cache/dev-util/gtk-doc-am-1.19 b/metadata/md5-cache/dev-util/gtk-doc-am-1.19
index 4a6268b21021..ec363eefa11f 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-am-1.19
+++ b/metadata/md5-cache/dev-util/gtk-doc-am-1.19
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/perl-5.6 !<dev-util/gtk-doc-1.19 app-arch/xz-utils
 DESCRIPTION=Automake files from gtk-doc
 EAPI=5
 HOMEPAGE=http://www.gtk.org/gtk-doc/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 FDL-1.1
 PDEPEND=virtual/pkgconfig
 RDEPEND=>=dev-lang/perl-5.6
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.19/gtk-doc-1.19.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=53182634357aa2e6b4f716e7fdf322f4
+_md5_=a166f6f82830b42d744b692024b2e6bb
diff --git a/metadata/md5-cache/dev-util/ketchup-9999 b/metadata/md5-cache/dev-util/ketchup-9999
index f80aafd884b1..18abcba4f6b4 100644
--- a/metadata/md5-cache/dev-util/ketchup-9999
+++ b/metadata/md5-cache/dev-util/ketchup-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=http://github.com/psomas/ketchup
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3992b59f5682d744d16d83acb246aa24
diff --git a/metadata/md5-cache/dev-util/osc-9999 b/metadata/md5-cache/dev-util/osc-9999
index c5b18988a82f..5b72c06aed75 100644
--- a/metadata/md5-cache/dev-util/osc-9999
+++ b/metadata/md5-cache/dev-util/osc-9999
@@ -9,5 +9,5 @@ PDEPEND=dev-python/urlgrabber[python_targets_python2_6(-)?,python_targets_python
 RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ce2d67ad405d223ee86cf5076531b7c0
diff --git a/metadata/md5-cache/dev-util/pkgconf-9999 b/metadata/md5-cache/dev-util/pkgconf-9999
index 539734d9ec43..f421ca1ac840 100644
--- a/metadata/md5-cache/dev-util/pkgconf-9999
+++ b/metadata/md5-cache/dev-util/pkgconf-9999
@@ -7,5 +7,5 @@ IUSE=+pkg-config strict
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=9e208c0a14379a3ea58966f09b3dba0a
diff --git a/metadata/md5-cache/dev-util/pkgconfig-9999 b/metadata/md5-cache/dev-util/pkgconfig-9999
index 535936e40e89..1eb4afa0edbb 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-9999
+++ b/metadata/md5-cache/dev-util/pkgconfig-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD hardened internal-glib
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.30 ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccd5abe8f0f64c3285c4c61be31a802f
diff --git a/metadata/md5-cache/dev-util/pkgcore-checks-9999 b/metadata/md5-cache/dev-util/pkgcore-checks-9999
index bf229932a221..33c61649691c 100644
--- a/metadata/md5-cache/dev-util/pkgcore-checks-9999
+++ b/metadata/md5-cache/dev-util/pkgcore-checks-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.pkgcore.org/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pkgcore-0.5.9 >=dev-python/snakeoil-0.3.6 dev-lang/python
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=7c93a40fd2857218334942cff535b6d7
diff --git a/metadata/md5-cache/dev-util/quilt-9999 b/metadata/md5-cache/dev-util/quilt-9999
index 7fc74bc02d44..a72e0c068c81 100644
--- a/metadata/md5-cache/dev-util/quilt-9999
+++ b/metadata/md5-cache/dev-util/quilt-9999
@@ -7,5 +7,5 @@ IUSE=graphviz
 LICENSE=GPL-2
 RDEPEND=dev-util/diffstat mail-mta/sendmail sys-apps/ed >=sys-apps/coreutils-8.5 graphviz? ( media-gfx/graphviz )
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d98d94c41805e5c677d802abf378679f
diff --git a/metadata/md5-cache/dev-util/rbtools-0.5.1 b/metadata/md5-cache/dev-util/rbtools-0.5.1
index 31faa946a56d..df27dd64215d 100644
--- a/metadata/md5-cache/dev-util/rbtools-0.5.1
+++ b/metadata/md5-cache/dev-util/rbtools-0.5.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://downloads.reviewboard.org/releases/RBTools/0.5/RBTools-0.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=094d83b6471a6733c60f96908f1eb27c
+_md5_=047f7238628343ba57b178e874daf113
diff --git a/metadata/md5-cache/dev-util/scons-2.2.0-r1 b/metadata/md5-cache/dev-util/scons-2.2.0-r1
index db7aa6908a0c..0152726d8d34 100644
--- a/metadata/md5-cache/dev-util/scons-2.2.0-r1
+++ b/metadata/md5-cache/dev-util/scons-2.2.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-2.2.0.tar.gz doc? ( http://www.scons.org/doc/2.2.0/PDF/scons-user.pdf -> scons-2.2.0-user.pdf http://www.scons.org/doc/2.2.0/HTML/scons-user.html -> scons-2.2.0-user.html )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=57663cbf6bc57f517d8c4cf772c3e4e2
+_md5_=635db57b96031db1a44599539c65a7e1
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index 5c348f817815..9680aa8dc5e7 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sourceforge.net/projects/strace/
 IUSE=static aio
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0efb1a188ddb1ae9fc7fad1628b0328c
diff --git a/metadata/md5-cache/dev-util/suse-build-9999 b/metadata/md5-cache/dev-util/suse-build-9999
index 577d6202b2c1..7824520d8714 100644
--- a/metadata/md5-cache/dev-util/suse-build-9999
+++ b/metadata/md5-cache/dev-util/suse-build-9999
@@ -7,5 +7,5 @@ IUSE=symlink
 LICENSE=GPL-2
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Getopt-Long dev-perl/XML-Parser dev-perl/TimeDate app-shells/bash app-arch/cpio app-arch/rpm
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=38e83d038e96f287b3dc32f2952f75f7
diff --git a/metadata/md5-cache/dev-util/synopsis-0.13 b/metadata/md5-cache/dev-util/synopsis-0.13
index b4404c8f8b24..795b83c4edc4 100644
--- a/metadata/md5-cache/dev-util/synopsis-0.13
+++ b/metadata/md5-cache/dev-util/synopsis-0.13
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://synopsis.fresco.org/download/synopsis-0.13.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=10b9d86cbf31985db82500d034a68e75
+_md5_=9a25e12cc5c31270d4ea1676ddd05931
diff --git a/metadata/md5-cache/dev-util/trinity-9999 b/metadata/md5-cache/dev-util/trinity-9999
index 88c30e9e4df2..ca40a0ab62b7 100644
--- a/metadata/md5-cache/dev-util/trinity-9999
+++ b/metadata/md5-cache/dev-util/trinity-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://codemonkey.org.uk/projects/trinity/
 IUSE=examples
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=a38fadaf36a4d331728624e2687b32ae
diff --git a/metadata/md5-cache/dev-util/umockdev-0.3.2 b/metadata/md5-cache/dev-util/umockdev-0.3.2
index 3ecda99e3ee3..75852f3eef0e 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.3.2
+++ b/metadata/md5-cache/dev-util/umockdev-0.3.2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/umockdev/trunk/0.3.2/+download/umockdev-0.3.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=76de07650fc9560b39a0fbce978b0c68
+_md5_=c4f2bb8990dafb5ff155e9185293058b
diff --git a/metadata/md5-cache/dev-util/umockdev-0.4.1 b/metadata/md5-cache/dev-util/umockdev-0.4.1
index 0509ae7e28ea..7369c4cab3e4 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.4.1
+++ b/metadata/md5-cache/dev-util/umockdev-0.4.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/umockdev/trunk/0.4.1/+download/umockdev-0.4.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7b581ac8f4ad14a3c5d1171f6cacce41
+_md5_=7f37758126c61ad2cc86b09116e2efc1
diff --git a/metadata/md5-cache/dev-util/umockdev-0.4.3 b/metadata/md5-cache/dev-util/umockdev-0.4.3
index 5d90ecee2f39..6c9555942c92 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.4.3
+++ b/metadata/md5-cache/dev-util/umockdev-0.4.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/umockdev/trunk/0.4.3/+download/umockdev-0.4.3.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f6028b5b4978e806506d21c1505050d5
+_md5_=d2c4971262e6bd6314afa35baa81d2a9
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 6a5af4672bfa..13f389acbfdb 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5236b4e77b86e6d8c06b499ba05a4d70
diff --git a/metadata/md5-cache/dev-vcs/git-bz-0.12.12.15 b/metadata/md5-cache/dev-vcs/git-bz-0.12.12.15
index 8dca38804a9c..2a4c08f619df 100644
--- a/metadata/md5-cache/dev-vcs/git-bz-0.12.12.15
+++ b/metadata/md5-cache/dev-vcs/git-bz-0.12.12.15
@@ -9,4 +9,4 @@ RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=mirror://bitbucket/mgorny/git-bz/downloads/git-bz-0.12.12.15.tar.bz2
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=d6a05ee6cb47963c9add42d129bd0a5a
+_md5_=b33c527083dfd340c456216eb523ab79
diff --git a/metadata/md5-cache/dev-vcs/git-bz-9999 b/metadata/md5-cache/dev-vcs/git-bz-9999
index b8bf727ecf63..d0ed883b771b 100644
--- a/metadata/md5-cache/dev-vcs/git-bz-9999
+++ b/metadata/md5-cache/dev-vcs/git-bz-9999
@@ -7,5 +7,5 @@ IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
 LICENSE=GPL-2
 RDEPEND=dev-vcs/git
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=813ea475bc178fe569044c3287b43fe8
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=dfd60445c09a53b717fd7b45879fc827
diff --git a/metadata/md5-cache/dev-vcs/gitstats-9999 b/metadata/md5-cache/dev-vcs/gitstats-9999
index 659b52a493b8..439e1243eab7 100644
--- a/metadata/md5-cache/dev-vcs/gitstats-9999
+++ b/metadata/md5-cache/dev-vcs/gitstats-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://gitstats.sourceforge.net/
 LICENSE=GPL-3
 RDEPEND=sci-visualization/gnuplot[gd] dev-vcs/git =dev-lang/python-2*
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=54bfefbc739d77e9256cc2abd91867f8
diff --git a/metadata/md5-cache/dev-vcs/gti-9999 b/metadata/md5-cache/dev-vcs/gti-9999
index 380b07aeef30..140a39187486 100644
--- a/metadata/md5-cache/dev-vcs/gti-9999
+++ b/metadata/md5-cache/dev-vcs/gti-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://r-wos.org/hacks/gti
 LICENSE=MIT
 RDEPEND=dev-vcs/git
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=76d8bec43d1275f84997059c926a7e6e
diff --git a/metadata/md5-cache/dev-vcs/mercurial-2.5.4 b/metadata/md5-cache/dev-vcs/mercurial-2.5.4
index 177f77fd8210..db7d5dd11956 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-2.5.4
+++ b/metadata/md5-cache/dev-vcs/mercurial-2.5.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mercurial.selenic.com/release/mercurial-2.5.4.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e41c726d832807ec042599b008e7abfd
+_md5_=0102cf5f3a4dd3e292283408cc015475
diff --git a/metadata/md5-cache/dev-vcs/mercurial-2.6.3 b/metadata/md5-cache/dev-vcs/mercurial-2.6.3
index 1e74f8d3d6f0..873a53c435bd 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-2.6.3
+++ b/metadata/md5-cache/dev-vcs/mercurial-2.6.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mercurial.selenic.com/release/mercurial-2.6.3.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4321a1a72887e729819dd63833f4ede4
+_md5_=0d217a1c9d851c51f7d2ec18ada824b8
diff --git a/metadata/md5-cache/dev-vcs/mercurial-2.7 b/metadata/md5-cache/dev-vcs/mercurial-2.7
index 6e38860a1d1c..60ca2941dfc2 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-2.7
+++ b/metadata/md5-cache/dev-vcs/mercurial-2.7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mercurial.selenic.com/release/mercurial-2.7.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=24818803943141a62c97f01d1a969cd0
+_md5_=25531e212b9d1cab57d56392a0b641c1
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index e23648ea7dbb..b941dd2529c4 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -9,4 +9,4 @@ RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_6(-)?,python_
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=979e081cad06c513e421ff6ff255d484
+_md5_=53092045518f145ed632569a2ca2ac22
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.11 b/metadata/md5-cache/dev-vcs/subversion-1.7.11
index a9080bd43b8a..353b049b665d 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.11
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.11
@@ -11,4 +11,4 @@ REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_6 python_targets_pytho
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.11.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	db-use	1c719875d6599536f956fafea9e1f404	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e9247299d0b6006c4d9018481f3e1acb
+_md5_=047bf0d42ceb45563dc848c12144fc52
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.13 b/metadata/md5-cache/dev-vcs/subversion-1.7.13
index 85953fc19b98..c3d01e599f5b 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.13
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.13
@@ -11,4 +11,4 @@ REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_6 python_targets_pytho
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.13.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	db-use	1c719875d6599536f956fafea9e1f404	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c1b84040d331373d375a65e48f55fad3
+_md5_=ed4c09f8d3616ee8f22f4af27c87763e
diff --git a/metadata/md5-cache/dev-vcs/svn2git-9999 b/metadata/md5-cache/dev-vcs/svn2git-9999
index 51173ef92a9c..fd74b9a0832d 100644
--- a/metadata/md5-cache/dev-vcs/svn2git-9999
+++ b/metadata/md5-cache/dev-vcs/svn2git-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://gitorious.org/svn2git/svn2git
 LICENSE=GPL-3
 RDEPEND=dev-vcs/subversion dev-qt/qtcore:4 dev-vcs/git
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1fb43f3b69c293a337288428a4379cb2
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-2.7.2 b/metadata/md5-cache/dev-vcs/tortoisehg-2.7.2
index 6ecd18d8eaf3..03fb43532a5e 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-2.7.2
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-2.7.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://bitbucket/tortoisehg/targz/downloads/tortoisehg-2.7.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c664577402fffd18e7330c129f082602
+_md5_=85a0b4a1c73e3a829d5d0cdd16257402
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-2.8.2 b/metadata/md5-cache/dev-vcs/tortoisehg-2.8.2
index 312e1c3fd65b..786ad20c9b1e 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-2.8.2
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-2.8.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://bitbucket/tortoisehg/targz/downloads/tortoisehg-2.8.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc7f5b12792229fa4af92ffe8a15893c
+_md5_=0606fbb88dd3ba7ac680469e0948b905
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-2.9 b/metadata/md5-cache/dev-vcs/tortoisehg-2.9
index d012d6a1714a..c7e022b930d3 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-2.9
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-2.9
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://bitbucket/tortoisehg/targz/downloads/tortoisehg-2.9.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=44dd85e58364d83333bf0c70b9142251
+_md5_=4a670f1dd2d5f55686a27b0dfcb3de0e
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index b862c31662c6..f2c3355bbc32 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_6(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8e15e9dab40d471041d112beb5fb43ea
+_md5_=b79d1c26069b391b1e4205c0f37c3059
diff --git a/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1 b/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1
index 62068d8ee785..fa7c5fdc0f67 100644
--- a/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1
+++ b/metadata/md5-cache/games-action/chromium-bsu-0.9.15.1
@@ -4,10 +4,10 @@ DESCRIPTION=Chromium B.S.U. - an arcade game
 EAPI=5
 HOMEPAGE=http://chromium-bsu.sourceforge.net/
 IUSE=mixer nls +sdl
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=Clarified-Artistic
 RDEPEND=media-fonts/dejavu media-libs/quesoglc media-libs/glpng virtual/opengl virtual/glu x11-libs/libXmu mixer? ( media-libs/sdl-mixer ) !mixer? ( media-libs/freealut media-libs/openal ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[X] media-libs/sdl-image[png] ) !sdl? ( media-libs/freeglut )
 SLOT=0
 SRC_URI=mirror://sourceforge/chromium-bsu/chromium-bsu-0.9.15.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f425f409f59197e702a9eea51ee2e253
+_md5_=154dcee9c83f13217f89ef230089539a
diff --git a/metadata/md5-cache/games-action/openclonk-5.3.3 b/metadata/md5-cache/games-action/openclonk-5.3.3
index cbd46cd5acd9..bc7b9316cb84 100644
--- a/metadata/md5-cache/games-action/openclonk-5.3.3
+++ b/metadata/md5-cache/games-action/openclonk-5.3.3
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:0 sys-libs/zlib virtual/jpeg !dedicated? ( media-libs/
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/openclonk-5.3.3.tar.xz http://openclonk.org/homepage/icon.png -> openclonk.png
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cafe754a1160e65aa06fd7e23e24ff47
+_md5_=602ed3090d0135bc19379eac86023ecd
diff --git a/metadata/md5-cache/games-action/slune-1.0.15-r1 b/metadata/md5-cache/games-action/slune-1.0.15-r1
index d38b9951be6a..00f06e84a3e2 100644
--- a/metadata/md5-cache/games-action/slune-1.0.15-r1
+++ b/metadata/md5-cache/games-action/slune-1.0.15-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.gna.org/slune/Slune-1.0.15.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=464bb57e70077a9e0f47e4b5d686ad44
+_md5_=cba605f0bffb1da6182095dc7cf71725
diff --git a/metadata/md5-cache/games-action/teeworlds-0.6.2 b/metadata/md5-cache/games-action/teeworlds-0.6.2
new file mode 100644
index 000000000000..ff0a626880db
--- /dev/null
+++ b/metadata/md5-cache/games-action/teeworlds-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=!dedicated? ( media-libs/pnglite media-libs/libsdl[X,audio,opengl,video] media-sound/wavpack virtual/opengl app-arch/bzip2 media-libs/freetype virtual/glu x11-libs/libX11 ) sys-libs/zlib || ( dev-lang/python:2.7 ) ~dev-util/bam-0.4.0
+DESCRIPTION=Online multi-player platform 2D shooter
+EAPI=5
+HOMEPAGE=http://www.teeworlds.com/
+IUSE=debug dedicated
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=!dedicated? ( media-libs/pnglite media-libs/libsdl[X,audio,opengl,video] media-sound/wavpack virtual/opengl app-arch/bzip2 media-libs/freetype virtual/glu x11-libs/libX11 ) sys-libs/zlib
+SLOT=0
+SRC_URI=http://www.teeworlds.com/files/teeworlds-0.6.2-source.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fb26ae64991b274480dbf7e6ed99b75a
diff --git a/metadata/md5-cache/games-arcade/funnyboat-1.5-r1 b/metadata/md5-cache/games-arcade/funnyboat-1.5-r1
index 5734499a06f5..cc53d057a4c4 100644
--- a/metadata/md5-cache/games-arcade/funnyboat-1.5-r1
+++ b/metadata/md5-cache/games-arcade/funnyboat-1.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=mirror://sourceforge/funnyboat/funnyboat-1.5-src.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=40ef05d4d3863fde5e22ea49c9e9a9ac
+_md5_=ead424494a785790d2167e95c836d6c9
diff --git a/metadata/md5-cache/games-arcade/tuxanci-99999999 b/metadata/md5-cache/games-arcade/tuxanci-99999999
index ca1a95e420c9..597fefc87317 100644
--- a/metadata/md5-cache/games-arcade/tuxanci-99999999
+++ b/metadata/md5-cache/games-arcade/tuxanci-99999999
@@ -7,5 +7,5 @@ IUSE=debug dedicated +ipv6 nls opengl physfs +sound
 LICENSE=GPL-2
 RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cf942f2796c6f2aed6d7a192abff622a
diff --git a/metadata/md5-cache/games-board/gnubg-20130203 b/metadata/md5-cache/games-board/gnubg-20130203
index ec13dfed4787..9e9efec38346 100644
--- a/metadata/md5-cache/games-board/gnubg-20130203
+++ b/metadata/md5-cache/games-board/gnubg-20130203
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib:2 media-libs/libpng:0 dev-libs/libxml2 media-libs/freetype
 SLOT=0
 SRC_URI=http://www.gnubg.org/media/sources/gnubg-source-SNAPSHOT-20130203.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a2a76a5d8964fad9ba3711363462aa0c
+_md5_=0a32e0e5e39f157b5ed1d1b73b080acc
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index a6eeff4e4154..5f46e0b4e67a 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -7,5 +7,5 @@ IUSE=alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio pulseaudio
 LICENSE=GPL-2
 RDEPEND=>=media-libs/glew-1.6 >=media-libs/libsdl-1.2[joystick] <media-libs/libsfml-2.0 >=net-libs/miniupnpc-1.8 sys-libs/readline x11-libs/libXext x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) ffmpeg? ( virtual/ffmpeg ) lzo? ( dev-libs/lzo ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	3315ffba81a98dea5d9837edb418a587
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	wxwidgets	3315ffba81a98dea5d9837edb418a587
 _md5_=97ae74606ff65e5319d0e8dd3bfe5580
diff --git a/metadata/md5-cache/games-fps/doomsday-1.9.8-r1 b/metadata/md5-cache/games-fps/doomsday-1.9.8-r1
index c19fe436a5de..1427a9e1cb07 100644
--- a/metadata/md5-cache/games-fps/doomsday-1.9.8-r1
+++ b/metadata/md5-cache/games-fps/doomsday-1.9.8-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=demo? ( doom ) freedoom? ( doom ) resources? ( doom )
 SLOT=0
 SRC_URI=mirror://sourceforge/deng/doomsday-1.9.8.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1b9dfce662492ddfe2a60cfc4f55039a
+_md5_=cda68a243f01e5c8090927ae4f676757
diff --git a/metadata/md5-cache/games-fps/quake3-9999 b/metadata/md5-cache/games-fps/quake3-9999
index 3d33c767cef1..75c9b3b50c5d 100644
--- a/metadata/md5-cache/games-fps/quake3-9999
+++ b/metadata/md5-cache/games-fps/quake3-9999
@@ -7,5 +7,5 @@ IUSE=dedicated opengl teamarena +openal curl vorbis voice mumble
 LICENSE=GPL-2
 RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[audio,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[audio,video,joystick,X,opengl] virtual/jpeg openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) opengl? ( voice? ( mumble? ( media-sound/mumble ) ) ) !dedicated? ( voice? ( mumble? ( media-sound/mumble ) ) ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8478766dc8ee9a4bef46193b03cf410f
diff --git a/metadata/md5-cache/games-mud/lyntin-4.2-r1 b/metadata/md5-cache/games-mud/lyntin-4.2-r1
index 179c2d7c1fda..599d930ac2c4 100644
--- a/metadata/md5-cache/games-mud/lyntin-4.2-r1
+++ b/metadata/md5-cache/games-mud/lyntin-4.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lyntin/lyntin-4.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9851e18812d978acf0c587857dbe9a2c
+_md5_=b5e83fa2a9287d6413eace78584cb0e2
diff --git a/metadata/md5-cache/games-mud/wxmud-9999 b/metadata/md5-cache/games-mud/wxmud-9999
index 58a3c17a894a..230cfdff2b10 100644
--- a/metadata/md5-cache/games-mud/wxmud-9999
+++ b/metadata/md5-cache/games-mud/wxmud-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:2.8 >=x11-libs/gtk+-2.4:2 python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 SLOT=0
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	games	0fb7637597e0869f6c8be79b11d0135a	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	3315ffba81a98dea5d9837edb418a587
-_md5_=1652489efe1790e80203535535a80566
+_md5_=2c41490ed702e45090fefaba4d11c9d3
diff --git a/metadata/md5-cache/games-puzzle/brainworkshop-4.8.4 b/metadata/md5-cache/games-puzzle/brainworkshop-4.8.4
index 217bd38cca3e..38a203d4d427 100644
--- a/metadata/md5-cache/games-puzzle/brainworkshop-4.8.4
+++ b/metadata/md5-cache/games-puzzle/brainworkshop-4.8.4
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 SLOT=0
 SRC_URI=mirror://sourceforge/brainworkshop/brainworkshop-4.8.4.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1cf198266c3d34e0ad476bb65c1d8f4a
+_md5_=5c0afbee1cf5cc8235d6dcbb67c04e2f
diff --git a/metadata/md5-cache/games-puzzle/pathological-1.1.3-r3 b/metadata/md5-cache/games-puzzle/pathological-1.1.3-r3
index 07affb92f30c..2eb16c82c59b 100644
--- a/metadata/md5-cache/games-puzzle/pathological-1.1.3-r3
+++ b/metadata/md5-cache/games-puzzle/pathological-1.1.3-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=44385da31d3050fb17b81bced46ab2ea
+_md5_=8cf1e6db4cbe9465ed3d17ef08cdb35c
diff --git a/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1 b/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1
index 87de17851d0a..be035c956230 100644
--- a/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1
+++ b/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://emhsoft.com/dh/Dragon_Hunt-3.56.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6d4f5a190fe5ff1d59db5d518f5474ee
+_md5_=c3d813606769ba5e8d140a14440052ca
diff --git a/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1 b/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1
index d61f67ac3bf4..60fe44843b30 100644
--- a/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1
+++ b/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/li
 SLOT=0
 SRC_URI=mirror://sourceforge/freedroid/freedroidRPG-0.15.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7664e2360f4902b5bc96922cf3135f54
+_md5_=92676092a611171ffc41dad864b08f84
diff --git a/metadata/md5-cache/games-simulation/singularity-0.30c-r1 b/metadata/md5-cache/games-simulation/singularity-0.30c-r1
index 931bdd2c7c0c..01ebb1ff355c 100644
--- a/metadata/md5-cache/games-simulation/singularity-0.30c-r1
+++ b/metadata/md5-cache/games-simulation/singularity-0.30c-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://endgame-singularity.googlecode.com/files/singularity-0.30c-src.tar.gz music? ( http://endgame-singularity.googlecode.com/files/endgame-singularity-music-006.zip )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=09053b92984aa66d804ad2696499bb37
+_md5_=ca1795805a12964243ac857f814c9a38
diff --git a/metadata/md5-cache/games-util/nml-0.2.4-r1 b/metadata/md5-cache/games-util/nml-0.2.4-r1
index 3c1a3fc16799..d1bb3357392a 100644
--- a/metadata/md5-cache/games-util/nml-0.2.4-r1
+++ b/metadata/md5-cache/games-util/nml-0.2.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.2.4/nml-0.2.4.src.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0bad1e4f7aa64548b5e4d89b651a9d33
+_md5_=6bd1b5eb60006234398d65a38dadd8d5
diff --git a/metadata/md5-cache/games-util/nml-0.2.4-r2 b/metadata/md5-cache/games-util/nml-0.2.4-r2
index d9e94b6383e9..938cf2b4d2f9 100644
--- a/metadata/md5-cache/games-util/nml-0.2.4-r2
+++ b/metadata/md5-cache/games-util/nml-0.2.4-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.2.4/nml-0.2.4.src.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=46aee326c2bc561c43cf2f7befc279a2
+_md5_=072d523e6b9c1c9e95e4ed77f9f055eb
diff --git a/metadata/md5-cache/gnome-base/gconf-3.2.6-r1 b/metadata/md5-cache/gnome-base/gconf-3.2.6-r1
index 20da2183a25c..779e8f43ab17 100644
--- a/metadata/md5-cache/gnome-base/gconf-3.2.6-r1
+++ b/metadata/md5-cache/gnome-base/gconf-3.2.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=266fcf56627a63126ebfb7f7470acbc2
+_md5_=956c09c74d3b30720a429e2cc203eb47
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.8.0 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.8.0
index 10ba78b62c8b..1f972bf9e3cb 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.8.0
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.8/libgnome-keyring-3.8.0.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0a24cbc446c9f407085c0f8c09dda88c
+_md5_=e30f1232bee56476174aa9b3be939dda
diff --git a/metadata/md5-cache/gnome-base/orbit-2.14.19-r3 b/metadata/md5-cache/gnome-base/orbit-2.14.19-r3
index 2e94d872b6fe..ba67a0a0f4ec 100644
--- a/metadata/md5-cache/gnome-base/orbit-2.14.19-r3
+++ b/metadata/md5-cache/gnome-base/orbit-2.14.19-r3
@@ -4,11 +4,11 @@ DESCRIPTION=ORBit2 is a high-performance CORBA ORB
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/ORBit2/
 IUSE=pic static-libs test debug
-KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2
 REQUIRED_USE=test? ( debug )
 SLOT=2
 SRC_URI=mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c45c9e23107fc1a4e1698d8a477865dd
+_md5_=11dc5592e23e430920c4fff9b339be79
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.6.4 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.6.4
index 6fe4ed56d19b..e60927a705e4 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.6.4
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.6.4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/40
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.6/evolution-data-server-3.6.4.tar.xz
 _eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d62a6478845f5b2bdc5efefb1f4e0316
+_md5_=5ed071a61fd940c170a2180428c4b115
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4
index 8fcafa8c2819..d5031ee6652a 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4
@@ -11,4 +11,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/40
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.8/evolution-data-server-3.8.4.tar.xz
 _eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=356b4f15069db9120c44338d67bf4a37
+_md5_=2dc65fbd2cf9311baf2e989945113d4e
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4-r1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4-r1
index cb76d9feedf6..56b3712b351f 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4-r1
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/40
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.8/evolution-data-server-3.8.4.tar.xz
 _eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4a3d3b753a641facdc103eb35a6d39db
+_md5_=e03dc9094d28862818030a721f2c92da
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.5 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.5
index 5050c0d8dda4..757e7d1bdc74 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.5
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.8.5
@@ -11,4 +11,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/40
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.8/evolution-data-server-3.8.5.tar.xz
 _eclasses_=db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0f77a7cabf4c2cdf3cb474aa6cc3b4ab
+_md5_=714cef315b13fcc0d23ae1c7bbe8c49a
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.1-r1 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.1-r1
index e59f136a4d3c..5f92840d14f8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.91.0:3 >=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-packagekit/3.6/gnome-packagekit-3.6.1.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=586da27a54bdeb7274284f581a156d12
+_md5_=baebf6e0720798571a0a8891463e3673
diff --git a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.2 b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.2
index 2319e90dd9ee..4d1542132ef9 100644
--- a/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.2
+++ b/metadata/md5-cache/gnome-extra/gnome-packagekit-3.6.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.91.0:3 >=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-packagekit/3.6/gnome-packagekit-3.6.2.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d3bb9a4154b452f3e22f69b2e7be189d
+_md5_=15a2722934f7b2a870a873ca5f3bf30c
diff --git a/metadata/md5-cache/kde-base/kate-4.10.5 b/metadata/md5-cache/kde-base/kate-4.10.5
index 067585ab982b..f56abd48e928 100644
--- a/metadata/md5-cache/kde-base/kate-4.10.5
+++ b/metadata/md5-cache/kde-base/kate-4.10.5
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_
 SLOT=4
 SRC_URI=mirror://kde/stable/4.10.5/src/kate-4.10.5.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8936f41cc24afd393640a082a86556e7
+_md5_=97398b263470da3a45b529b283bf9593
diff --git a/metadata/md5-cache/kde-base/krosspython-4.10.5 b/metadata/md5-cache/kde-base/krosspython-4.10.5
index ef39fc121293..d52261ba770d 100644
--- a/metadata/md5-cache/kde-base/krosspython-4.10.5
+++ b/metadata/md5-cache/kde-base/krosspython-4.10.5
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=4
 SRC_URI=mirror://kde/stable/4.10.5/src/kross-interpreters-4.10.5.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=57cb590ab07a8d7285cc08b04941b34b
+_md5_=8d7f25f878aed04677199606ab4866a9
diff --git a/metadata/md5-cache/kde-base/lokalize-4.10.5 b/metadata/md5-cache/kde-base/lokalize-4.10.5
index c950241bc7ff..475cb26ad89a 100644
--- a/metadata/md5-cache/kde-base/lokalize-4.10.5
+++ b/metadata/md5-cache/kde-base/lokalize-4.10.5
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=4
 SRC_URI=mirror://kde/stable/4.10.5/src/kdesdk-4.10.5.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	kde4-meta	18edb0c6f073508b5e55c4b75ea1d15a	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e574c03796a4e25b85154be29bb15af6
+_md5_=2b84f6353f785d9ac95a07b006c00efc
diff --git a/metadata/md5-cache/kde-base/pykde4-4.10.5 b/metadata/md5-cache/kde-base/pykde4-4.10.5
index 5d934791ffb7..c98a86488d39 100644
--- a/metadata/md5-cache/kde-base/pykde4-4.10.5
+++ b/metadata/md5-cache/kde-base/pykde4-4.10.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=4
 SRC_URI=mirror://kde/stable/4.10.5/src/pykde4-4.10.5.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3b8ac956a0408cd973467dc184cfc1ed
+_md5_=5a2d8cd573ad55dafcbb68cc581e3280
diff --git a/metadata/md5-cache/kde-base/superkaramba-4.10.5 b/metadata/md5-cache/kde-base/superkaramba-4.10.5
index d6729071a2a3..fa5a97e207bc 100644
--- a/metadata/md5-cache/kde-base/superkaramba-4.10.5
+++ b/metadata/md5-cache/kde-base/superkaramba-4.10.5
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=4
 SRC_URI=mirror://kde/stable/4.10.5/src/superkaramba-4.10.5.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=05f7a4a5a4258a5defd726b9803d5377
+_md5_=831899381d8085d79221456147ff1dc9
diff --git a/metadata/md5-cache/kde-misc/kanyremote-6.2 b/metadata/md5-cache/kde-misc/kanyremote-6.2
index 2468385f2cee..b9a77fd70a1c 100644
--- a/metadata/md5-cache/kde-misc/kanyremote-6.2
+++ b/metadata/md5-cache/kde-misc/kanyremote-6.2
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=4
 SRC_URI=mirror://sourceforge/anyremote/kanyremote-6.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=878ad516a60c7af3949f32c635a81ce7
+_md5_=38732658dfdd7ccf210cf7d7a8836f08
diff --git a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1 b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1
index 1f4c10a42f86..8f6806e30109 100644
--- a/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1
+++ b/metadata/md5-cache/kde-misc/kcm-ufw-0.4.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=4
 SRC_URI=http://craigd.wikispaces.com/file/view/kcm_ufw-0.4.3.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6d64da87baa787d08c374593dbdd13cf
+_md5_=b12400ff2a1904c16763a7d5ffe05661
diff --git a/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1 b/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1
index 9c377616749f..33c2548488a9 100644
--- a/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1
+++ b/metadata/md5-cache/kde-misc/wicd-client-kde-0.3.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=4
 SRC_URI=http://kde-apps.org/CONTENT/content-files/132366-wicd-kde-0.3.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=23eb1ac9dc3834fa0bfe75e37951662b
+_md5_=582cf11a289d604100d2df4cff452b43
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.9.1 b/metadata/md5-cache/mail-client/claws-mail-3.9.1
index e679d411fdd6..c1fa72d4326a 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.9.1
+++ b/metadata/md5-cache/mail-client/claws-mail-3.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=networkmanager? ( dbus ) smime? ( pgp ) libcanberra? ( notification
 SLOT=0
 SRC_URI=mirror://sourceforge/sylpheed-claws/claws-mail-3.9.1.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=357429d3e3c74494b5c1c892da137fdd
+_md5_=2b9c6cfcb9272aa2520d6d7f192ecda8
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.9.1-r1 b/metadata/md5-cache/mail-client/claws-mail-3.9.1-r1
index 15d22f824757..7f5f9f8edc00 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.9.1-r1
+++ b/metadata/md5-cache/mail-client/claws-mail-3.9.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=networkmanager? ( dbus ) smime? ( pgp ) libcanberra? ( notification
 SLOT=0
 SRC_URI=mirror://sourceforge/sylpheed-claws/claws-mail-3.9.1.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1648d05292fa8d6587037abfa2c8a323
+_md5_=3a0fdd54d911c07983db0b50bf6ba328
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.9.2 b/metadata/md5-cache/mail-client/claws-mail-3.9.2
index 52f60764b67c..8975402f9b85 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.9.2
+++ b/metadata/md5-cache/mail-client/claws-mail-3.9.2
@@ -11,4 +11,4 @@ REQUIRED_USE=networkmanager? ( dbus ) smime? ( pgp ) libcanberra? ( notification
 SLOT=0
 SRC_URI=mirror://sourceforge/sylpheed-claws/claws-mail-3.9.2.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=79d81efdb9f03d2815d6ad1442ee0592
+_md5_=ea0c09f90cd9ea0bc34342adb6ecdacd
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index 3676e5613e47..1813215be478 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -7,5 +7,5 @@ IUSE=debug test +zlib test
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtsql-4.6.0:4[sqlite] >=dev-qt/qtwebkit-4.6.0:4
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1425a1f2e98e04592a78a9458f484bf3
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index 2eb645f8339c..79af84e0823a 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -7,5 +7,5 @@ IUSE=postfix ipv6 syslog
 LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4aca2737ffa4570197481729f7bb037a
diff --git a/metadata/md5-cache/media-gfx/cptutils-1.47 b/metadata/md5-cache/media-gfx/cptutils-1.47
index 556b23da77c0..73fe202f088d 100644
--- a/metadata/md5-cache/media-gfx/cptutils-1.47
+++ b/metadata/md5-cache/media-gfx/cptutils-1.47
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libxml2:2 media-libs/libpng:0= python_single_target_python2_6?
 SLOT=0
 SRC_URI=http://soliton.vm.bytemark.co.uk/pub/jjg/code/cptutils-1.47.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=517a8e69d058f11d1bd138a9938362f6
+_md5_=8e2f6c1510b41eaa90a0c226714c5853
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index af5d277151cc..da139596d364 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -7,5 +7,5 @@ IUSE=colord flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde nls openc
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg web-services? ( dev-libs/json-glib ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango kde? ( kde-base/kwalletd )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08e7cb10bf367781a598933b6e99dadd
diff --git a/metadata/md5-cache/media-gfx/drqueue-9999 b/metadata/md5-cache/media-gfx/drqueue-9999
index 4981d4594396..b9cc814d56cd 100644
--- a/metadata/md5-cache/media-gfx/drqueue-9999
+++ b/metadata/md5-cache/media-gfx/drqueue-9999
@@ -7,5 +7,5 @@ IUSE=X python ruby
 LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/gtk+:2 ) ruby? ( dev-lang/ruby ) app-shells/tcsh python? ( =dev-lang/python-2* )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5c60bd378fe31e6cbd9e56dadc9fe75b
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 3a955b892f4f..af3fe23279d9 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -7,5 +7,5 @@ IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpe
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.11 >=media-libs/gegl-0.2.1 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 SLOT=2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d1d580c48e28fcba4b7b6c3721f935bd
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.2.1 b/metadata/md5-cache/media-gfx/graphite2-1.2.1
index 9f279946677d..f9a0d9ff15cf 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.2.1
+++ b/metadata/md5-cache/media-gfx/graphite2-1.2.1
@@ -10,4 +10,4 @@ RDEPEND=perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.2.1.tgz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eb929fd0c4951ced95dc9d8bd708813c
+_md5_=e1d41bfd43be120598a33a8739a11831
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.28.0 b/metadata/md5-cache/media-gfx/graphviz-2.28.0
index 62b13d75614b..04717921b825 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.28.0
+++ b/metadata/md5-cache/media-gfx/graphviz-2.28.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.28.0.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=37711e2ba3c0f24a20e52d6d23a0cda3
+_md5_=9119f71489423720d8a90b520bc622d7
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8 b/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8
index 6d8f30d149f6..cc8ddd9e709f 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=5
 HOMEPAGE=http://www.imagemagick.org/
 IUSE=autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=>=sys-devel/libtool-2.2.6b autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8 ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.8.6.8
 SRC_URI=mirror://imagemagick/ImageMagick-6.8.6-8.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=69757f19d655f61e8107678ebfef706b
+_md5_=c32bdfbf32d6b253c72c1184e7f67a29
diff --git a/metadata/md5-cache/media-gfx/pinta-9999 b/metadata/md5-cache/media-gfx/pinta-9999
index 723cbf26596d..f2faccf37530 100644
--- a/metadata/md5-cache/media-gfx/pinta-9999
+++ b/metadata/md5-cache/media-gfx/pinta-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://pinta-project.com
 LICENSE=MIT CC-BY-3.0
 RDEPEND=dev-dotnet/atk-sharp:2 dev-dotnet/gdk-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 dev-dotnet/mono-addins[gtk] dev-dotnet/pango-sharp:2 dev-lang/mono x11-libs/cairo[X] x11-libs/gdk-pixbuf[X,jpeg,tiff] x11-themes/gnome-icon-theme
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=f055a5b49dadb1b0d5053046f7299f11
diff --git a/metadata/md5-cache/media-gfx/pixels2pgf-9999 b/metadata/md5-cache/media-gfx/pixels2pgf-9999
index 2940717bfcb2..4a1d6947bdd3 100644
--- a/metadata/md5-cache/media-gfx/pixels2pgf-9999
+++ b/metadata/md5-cache/media-gfx/pixels2pgf-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/pixels2pgf/
 LICENSE=BSD
 RDEPEND=media-libs/libsdl media-libs/sdl-image
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee11b4f3be492830f802737d6b049f03
diff --git a/metadata/md5-cache/media-gfx/pydot-1.0.28-r1 b/metadata/md5-cache/media-gfx/pydot-1.0.28-r1
index ba96c6a3985a..ef1dc04bef33 100644
--- a/metadata/md5-cache/media-gfx/pydot-1.0.28-r1
+++ b/metadata/md5-cache/media-gfx/pydot-1.0.28-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://pydot.googlecode.com/files/pydot-1.0.28.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4b27f75322c7192b6bf0cf6511b8b8bb
+_md5_=e5d2e4d26316676849183bf25733494e
diff --git a/metadata/md5-cache/media-gfx/svg2rlg-0.3 b/metadata/md5-cache/media-gfx/svg2rlg-0.3
index 5108f5ef6bc8..dcc476e378da 100644
--- a/metadata/md5-cache/media-gfx/svg2rlg-0.3
+++ b/metadata/md5-cache/media-gfx/svg2rlg-0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svg2rlg/svg2rlg-0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=579dc838827fc7961800bd1e8466e5b9
+_md5_=44ca88941107ce13531b320ddc6d423d
diff --git a/metadata/md5-cache/media-gfx/uniconvertor-1.1.5-r1 b/metadata/md5-cache/media-gfx/uniconvertor-1.1.5-r1
index 275cf18f9c63..066bd16c2266 100644
--- a/metadata/md5-cache/media-gfx/uniconvertor-1.1.5-r1
+++ b/metadata/md5-cache/media-gfx/uniconvertor-1.1.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://uniconvertor.googlecode.com/files/uniconvertor-1.1.5.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cb75adf52aeab64ef129d8e208118629
+_md5_=cb12b61d77b5944176baac85f5a6a3cc
diff --git a/metadata/md5-cache/media-libs/avidemux-core-9999 b/metadata/md5-cache/media-libs/avidemux-core-9999
index f676d2981618..b40f0730a53e 100644
--- a/metadata/md5-cache/media-libs/avidemux-core-9999
+++ b/metadata/md5-cache/media-libs/avidemux-core-9999
@@ -7,5 +7,5 @@ IUSE=debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv
 LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 RDEPEND=!<media-video/avidemux-9999:2.6 dev-db/sqlite:3 nls? ( sys-devel/gettext:0 ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) xv? ( x11-libs/libXv:0 ) vaapi? ( x11-libs/libva:0 ) vdpau? ( x11-libs/libvdpau:0 ) video_cards_fglrx? ( x11-libs/xvba-video:0 )
 SLOT=2.6
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4da3e04324ec041ee3c36ae8f3ef802b
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-9999 b/metadata/md5-cache/media-libs/avidemux-plugins-9999
index 6d886ce8ebd1..e7b8583a242e 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-9999
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-9999
@@ -7,5 +7,5 @@ IUSE=aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate
 LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 RDEPEND=~media-video/avidemux-9999:2.6[opengl?,qt4?] >=dev-lang/spidermonkey-1.5-r2:0= dev-libs/libxml2:2 media-libs/libpng:0= virtual/libiconv:0 aac? ( media-libs/faac:0 media-libs/faad2:0 ) aften? ( media-libs/aften:0 ) alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) amr? ( media-libs/opencore-amr:0 ) dts? ( media-libs/libdca:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi:0 ) jack? ( media-sound/jack-audio-connection-kit:0 libsamplerate? ( media-libs/libsamplerate:0 ) ) lame? ( media-sound/lame:0 ) oss? ( virtual/os-headers:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame:0 ) x264? ( media-libs/x264:0= ) xv? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXv:0 ) xvid? ( media-libs/xvid:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?]
 SLOT=2.6
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e68be0f9f06af8a8564005a65b7393e0
diff --git a/metadata/md5-cache/media-libs/babl-9999 b/metadata/md5-cache/media-libs/babl-9999
index 34c41c8b6c49..51b014fb4d79 100644
--- a/metadata/md5-cache/media-libs/babl-9999
+++ b/metadata/md5-cache/media-libs/babl-9999
@@ -7,5 +7,5 @@ IUSE=altivec +introspection sse mmx vala
 LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=a56ec76f8e807004afd96b4282a06f34
diff --git a/metadata/md5-cache/media-libs/clutter-gst-2.0.2 b/metadata/md5-cache/media-libs/clutter-gst-2.0.2
index eb211f29cd75..b3e764031788 100644
--- a/metadata/md5-cache/media-libs/clutter-gst-2.0.2
+++ b/metadata/md5-cache/media-libs/clutter-gst-2.0.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.6.0:1.0=[introspection?] >
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/clutter-gst/2.0/clutter-gst-2.0.2.tar.xz
 _eclasses_=clutter	9f94a7b65d03649427777e9cd447f950	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cfaafa45815441f91843ad59e0e2c335
+_md5_=b7db3dc66b5208bf4f2fe3d66754fcb9
diff --git a/metadata/md5-cache/media-libs/clutter-gst-2.0.6 b/metadata/md5-cache/media-libs/clutter-gst-2.0.6
index 57c07e91600e..817cf3a00d7e 100644
--- a/metadata/md5-cache/media-libs/clutter-gst-2.0.6
+++ b/metadata/md5-cache/media-libs/clutter-gst-2.0.6
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.6.0:1.0=[introspection?] >
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/clutter-gst/2.0/clutter-gst-2.0.6.tar.xz
 _eclasses_=clutter	9f94a7b65d03649427777e9cd447f950	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3e94fe1655a5f5ea6eed72537ada9e62
+_md5_=eb0651bc0a19b374cafd6fd9d3d5588e
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.10.92 b/metadata/md5-cache/media-libs/fontconfig-2.10.92
index 531bac803d97..64266c03377d 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.10.92
+++ b/metadata/md5-cache/media-libs/fontconfig-2.10.92
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=5
 HOMEPAGE=http://fontconfig.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_x86_32 abi_x86_64 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-1.95.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.10.92.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b96410093f82373c010af899ce1a93f
+_md5_=1f710ee89fe7160548733d3761ee2883
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 1de21557be8a..fab23bce1618 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -7,5 +7,5 @@ IUSE=cairo debug ffmpeg introspection jpeg jpeg2k lensfun mmx openexr png raw sd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=a63cc16005a626b25ebe99413cde63aa
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.6.1 b/metadata/md5-cache/media-libs/gexiv2-0.6.1
index ce0b8882f041..5345c3e516ac 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.6.1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=5
 HOMEPAGE=http://trac.yorba.org/wiki/gexiv2/
 IUSE=introspection static-libs python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=alpha amd64 arm ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-libs/glib:2 >=media-gfx/exiv2-0.21
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=http://www.yorba.org/download/gexiv2/0.6/libgexiv2_0.6.1.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9ebc7d7c36f48049a53935101081d7d6
+_md5_=a86a3433cd8c256912443c39f765790e
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index f111bd98e44c..668950e4eb06 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -8,5 +8,5 @@ LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2:= ) icu? ( dev-libs/icu:= ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) truetype? ( media-libs/freetype:2= )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f6e7ade49daa1d6939fa1a8ced7e83d4
diff --git a/metadata/md5-cache/media-libs/lcms-1.19-r1 b/metadata/md5-cache/media-libs/lcms-1.19-r1
index 321a8df008e7..f7c89c73ed4d 100644
--- a/metadata/md5-cache/media-libs/lcms-1.19-r1
+++ b/metadata/md5-cache/media-libs/lcms-1.19-r1
@@ -10,4 +10,4 @@ RDEPEND=tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg:0 ) zlib? ( sys-libs/zl
 SLOT=0
 SRC_URI=http://www.littlecms.com/lcms-1.19.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4970238e7e7c552fd91d6a6bc204f4f6
+_md5_=cb289a3fc6f3982efe972668cdde6b5f
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 44470e881a89..5c64646bfd58 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=utils? ( static-libs )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2a9cd217b9b38740f8dfd99a288922eb
diff --git a/metadata/md5-cache/media-libs/libcdr-9999 b/metadata/md5-cache/media-libs/libcdr-9999
index 6501b89e154f..09863513dd9e 100644
--- a/metadata/md5-cache/media-libs/libcdr-9999
+++ b/metadata/md5-cache/media-libs/libcdr-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=LGPL-2.1
 RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= media-libs/lcms:2 sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d6e213202422d99cad0db52cf949e0b0
diff --git a/metadata/md5-cache/media-libs/libilbc-9999 b/metadata/md5-cache/media-libs/libilbc-9999
index 8ebcbb0b7ed3..d533199f163d 100644
--- a/metadata/md5-cache/media-libs/libilbc-9999
+++ b/metadata/md5-cache/media-libs/libilbc-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=https://github.com/dekkers/libilbc
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e734723185241921f54582769f40a10d
diff --git a/metadata/md5-cache/media-libs/libmtp-9999 b/metadata/md5-cache/media-libs/libmtp-9999
index 347a914d27e6..7d1aae22c0bc 100644
--- a/metadata/md5-cache/media-libs/libmtp-9999
+++ b/metadata/md5-cache/media-libs/libmtp-9999
@@ -7,5 +7,5 @@ IUSE=+crypt doc examples static-libs
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 crypt? ( dev-libs/libgcrypt )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c518c99f7bf5b7de0e6cd12c31070fe9
diff --git a/metadata/md5-cache/media-libs/libpostproc-9999 b/metadata/md5-cache/media-libs/libpostproc-9999
index ef320d2b4a02..a7e6f534a3ab 100644
--- a/metadata/md5-cache/media-libs/libpostproc-9999
+++ b/metadata/md5-cache/media-libs/libpostproc-9999
@@ -7,5 +7,5 @@ IUSE=pic static-libs 3dnow altivec mmx mmxext
 LICENSE=GPL-2
 RDEPEND=>=virtual/ffmpeg-0.10.2-r2 !<media-video/libav-0.8.2-r2 !media-video/ffmpeg:0
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a5433c70fd664fe16b314ebea71a3129
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.0 b/metadata/md5-cache/media-libs/libsdl2-2.0.0
index e6ace2f7fcfd..7b9c22fd5d02 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.0
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.0
@@ -3,7 +3,7 @@ DEPEND=alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) directfb? ( >=dev-l
 DESCRIPTION=Simple Direct Media Layer
 EAPI=5
 HOMEPAGE=http://www.libsdl.org
-IUSE=3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs tslib udev +video X xinerama xscreensaver
+IUSE=3dnow alsa altivec +audio custom-cflags dbus directfb fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib udev +video X xinerama xscreensaver
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) directfb? ( >=dev-libs/DirectFB-1.0.0 ) fusionsound? ( >=media-libs/FusionSound-1.1.1 ) gles? ( media-libs/mesa[gles2] ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu ) pulseaudio? ( media-sound/pulseaudio ) tslib? ( x11-libs/tslib ) udev? ( virtual/udev ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) )
@@ -11,4 +11,4 @@ REQUIRED_USE=alsa? ( audio ) fusionsound? ( audio ) gles? ( video ) nas? ( audio
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.0.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=82195b596fa878f6680f2dc00aa1a57b
+_md5_=e1c54e1aae2b17dd7124c0059c476d1a
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1 b/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1
index ffe3cc1b6f26..9a789f26a289 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1
@@ -10,4 +10,4 @@ RDEPEND=!minimal? ( >=media-libs/flac-1.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cd797a2d91b87dcaec35cd7512dba596
+_md5_=43c613196cd8798a6b5e70094a945ecb
diff --git a/metadata/md5-cache/media-libs/libvisio-9999 b/metadata/md5-cache/media-libs/libvisio-9999
index 5f7f0283f3a1..578b898969ec 100644
--- a/metadata/md5-cache/media-libs/libvisio-9999
+++ b/metadata/md5-cache/media-libs/libvisio-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= dev-libs/libxml2 sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6428cffad76758c725a6e9b84b10d61
diff --git a/metadata/md5-cache/media-libs/libvpx-9999 b/metadata/md5-cache/media-libs/libvpx-9999
index 81580e6be483..6ac2bfdf09af 100644
--- a/metadata/md5-cache/media-libs/libvpx-9999
+++ b/metadata/md5-cache/media-libs/libvpx-9999
@@ -9,5 +9,5 @@ RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=sse2? ( mmx ) ssse3? ( sse2 )
 SLOT=0
 SRC_URI=test? ( mirror://gentoo/libvpx-testdata-1.2.0.tar.bz2 )
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=5c6699a06304ace09dcc6e8987abe8bd
diff --git a/metadata/md5-cache/media-libs/oyranos-9999 b/metadata/md5-cache/media-libs/oyranos-9999
index 577887ad00fd..45cc8a9a0c2d 100644
--- a/metadata/md5-cache/media-libs/oyranos-9999
+++ b/metadata/md5-cache/media-libs/oyranos-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND==app-admin/elektra-0.7* dev-libs/libxml2 dev-libs/yajl media-gfx/exiv2 media-libs/icc-profiles-basiccolor-printing2009 media-libs/icc-profiles-basiccolor-printing2009 || ( media-libs/lcms:0 media-libs/lcms:2 ) media-libs/libpng:0 media-libs/libraw >=media-libs/libXcm-0.5.2 fltk? ( x11-libs/fltk:1 ) X? ( x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXinerama ) cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) raw? ( media-libs/libraw )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-multilib	8ad37ef7965c43a2a428cb69256bf631	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-multilib	8ad37ef7965c43a2a428cb69256bf631	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6fed8669af26330563e2092eaac49ec4
diff --git a/metadata/md5-cache/media-libs/phonon-9999 b/metadata/md5-cache/media-libs/phonon-9999
index c65bf5d32f05..70fc6a302647 100644
--- a/metadata/md5-cache/media-libs/phonon-9999
+++ b/metadata/md5-cache/media-libs/phonon-9999
@@ -9,5 +9,5 @@ PDEPEND=aqua? ( media-libs/phonon-qt7 ) gstreamer? ( media-libs/phonon-gstreamer
 RDEPEND=!!dev-qt/qtphonon:4 >=dev-qt/qtcore-4.6.0:4 >=dev-qt/qtdbus-4.6.0:4 >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qttest-4.6.0:4 pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) zeitgeist? ( dev-libs/libqzeitgeist )
 REQUIRED_USE=|| ( aqua gstreamer vlc )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a793ffcfbf462fb4c261053975a8bc5
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-9999 b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
index a62eef640e70..d9658745f8a4 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-9999
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
@@ -7,5 +7,5 @@ IUSE=alsa debug +network
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10[alsa?,ogg,vorbis] >=media-libs/phonon-4.6.0 >=dev-qt/qtcore-4.6.0:4[glib] >=dev-qt/qtgui-4.6.0:4[glib] >=dev-qt/qtopengl-4.6.0:4 virtual/opengl network? ( media-plugins/gst-plugins-soup:0.10 )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6374695cd535991af22beb87a3d0828
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-9999 b/metadata/md5-cache/media-libs/phonon-vlc-9999
index cdf3c395fed1..9bdebed6f67e 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-9999
+++ b/metadata/md5-cache/media-libs/phonon-vlc-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/phonon-4.6.0 >=media-video/vlc-2.0.1[dbus,ogg,vorbis] >=dev-qt/qtcore-4.6.0:4 >=dev-qt/qtdbus-4.6.0:4 >=dev-qt/qtgui-4.6.0:4
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=deb6d0dd4fe0f2e6e58bd594851399d4
diff --git a/metadata/md5-cache/media-libs/raspberrypi-userland-9999 b/metadata/md5-cache/media-libs/raspberrypi-userland-9999
index affb03278cd4..7cab431cd561 100644
--- a/metadata/md5-cache/media-libs/raspberrypi-userland-9999
+++ b/metadata/md5-cache/media-libs/raspberrypi-userland-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/raspberrypi/userland
 LICENSE=BSD
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6280b00a2ac36bded3b92292597ae0b3
diff --git a/metadata/md5-cache/media-libs/sk1libs-0.9.1-r2 b/metadata/md5-cache/media-libs/sk1libs-0.9.1-r2
index 8ec9d015ae09..893274dc7aa7 100644
--- a/metadata/md5-cache/media-libs/sk1libs-0.9.1-r2
+++ b/metadata/md5-cache/media-libs/sk1libs-0.9.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://uniconvertor.googlecode.com/files/sk1libs-0.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3ee0c91c6ccfb72fb425ca0c6bd41592
+_md5_=6fc5cb4a57c775323c729b2da2f0de86
diff --git a/metadata/md5-cache/media-libs/sk1libs-0.9.1-r3 b/metadata/md5-cache/media-libs/sk1libs-0.9.1-r3
index f30f69466b6b..d2d18ec737cd 100644
--- a/metadata/md5-cache/media-libs/sk1libs-0.9.1-r3
+++ b/metadata/md5-cache/media-libs/sk1libs-0.9.1-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://uniconvertor.googlecode.com/files/sk1libs-0.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=118863413fdd8a9796119d530a17b3f4
+_md5_=59ba2097a1a5bd6eb233c1c6c762d71c
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-9999 b/metadata/md5-cache/media-libs/vo-aacenc-9999
index 504f9d44f302..63aab9ea0990 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-9999
+++ b/metadata/md5-cache/media-libs/vo-aacenc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_x86_32 abi_x86_64 abi_mips_n32 abi_mips_n64 abi_mips_o32
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a0a34bd1517c96960e5d28119304a59
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-9999 b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
index aeb1ffb8f130..71272cee5e50 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-9999
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_x86_32 abi_x86_64 abi_mips_n32 abi_mips_n64 abi_mips_o32
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0da7bf0b453a3d4ee88e2ea33b181061
diff --git a/metadata/md5-cache/media-libs/x264-9999 b/metadata/md5-cache/media-libs/x264-9999
index 02f817d4f284..f89152053911 100644
--- a/metadata/md5-cache/media-libs/x264-9999
+++ b/metadata/md5-cache/media-libs/x264-9999
@@ -7,5 +7,5 @@ IUSE=10bit +interlaced opencl pic static-libs sse +threads abi_x86_32 abi_x86_64
 LICENSE=GPL-2
 RDEPEND=opencl? ( virtual/opencl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/135
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8bcbb6d5ba3bf0d8caeff46aacd5def9
diff --git a/metadata/md5-cache/media-plugins/npapi-vlc-9999 b/metadata/md5-cache/media-plugins/npapi-vlc-9999
index eefdff30257c..3de28be9faca 100644
--- a/metadata/md5-cache/media-plugins/npapi-vlc-9999
+++ b/metadata/md5-cache/media-plugins/npapi-vlc-9999
@@ -7,5 +7,5 @@ IUSE=gtk
 LICENSE=LGPL-2.1
 RDEPEND=>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=affc01237afa384070fc5c246f5174e7
diff --git a/metadata/md5-cache/media-plugins/vdr-xvdr-9999 b/metadata/md5-cache/media-plugins/vdr-xvdr-9999
index c8b9f5d81dbb..066d78d97293 100644
--- a/metadata/md5-cache/media-plugins/vdr-xvdr-9999
+++ b/metadata/md5-cache/media-plugins/vdr-xvdr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/pipelka/vdr-plugin-xvdr
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	a74e99e58b7f04808217f47f983098a0
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vdr-plugin-2	a74e99e58b7f04808217f47f983098a0
 _md5_=81e2684d7012a2a5a6499f5972df1689
diff --git a/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999 b/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
index fd3751028b12..e52609a72ea0 100644
--- a/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
+++ b/metadata/md5-cache/media-plugins/xbmc-addon-xvdr-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=https://github.com/pipelka/xbmc-addon-xvdr
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=a6c111877213c51102d80ee70c82e254
diff --git a/metadata/md5-cache/media-radio/tlf-1.1.6 b/metadata/md5-cache/media-radio/tlf-1.1.6
index 1f17029627bf..6f5704957d24 100644
--- a/metadata/md5-cache/media-radio/tlf-1.1.6
+++ b/metadata/md5-cache/media-radio/tlf-1.1.6
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses dev-libs/glib:2 media-libs/hamlib media-sound/sox
 DESCRIPTION=Console-mode amateur radio contest logger
 EAPI=4
 HOMEPAGE=http://home.iae.nl/users/reinc/TLF-0.2.html
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses dev-libs/glib:2 media-libs/hamlib media-sound/sox
 SLOT=0
 SRC_URI=http://www.hs-mittweida.de/tb/tlf-1.1.6.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=09990fa340f6b24173c6459a2623f7c1
+_md5_=15df7269dc2893a48f0aae2fb47db78d
diff --git a/metadata/md5-cache/media-sound/csound-5.19.01 b/metadata/md5-cache/media-sound/csound-5.19.01
index 641390ec31ea..f57057e6753a 100644
--- a/metadata/md5-cache/media-sound/csound-5.19.01
+++ b/metadata/md5-cache/media-sound/csound-5.19.01
@@ -11,4 +11,4 @@ REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( c
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound5.19.01.tar.gz
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d61c3dfba3a9c48119b379a4e1ca8dad
+_md5_=a313a9bcdcf09343b2bc4a4f229b71de
diff --git a/metadata/md5-cache/media-sound/flacon-0.8.0 b/metadata/md5-cache/media-sound/flacon-0.8.0
index a6f662d65f5b..7af1231fe89f 100644
--- a/metadata/md5-cache/media-sound/flacon-0.8.0
+++ b/metadata/md5-cache/media-sound/flacon-0.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=https://flacon.googlecode.com/files/flacon-0.8.0.tgz
 _eclasses_=l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=51343c057915bb5b3edae5ccceee61ca
+_md5_=7bf2357cc4be364e10a9b0e252f0eede
diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-9999 b/metadata/md5-cache/media-sound/gmusicbrowser-9999
index 1fdf512f6b19..de36881005f9 100644
--- a/metadata/md5-cache/media-sound/gmusicbrowser-9999
+++ b/metadata/md5-cache/media-sound/gmusicbrowser-9999
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/gtk2-perl virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) || ( ( dev-perl/GStreamer dev-perl/GStreamer-Interfaces media-plugins/gst-plugins-meta:0.10 ) ( || ( media-video/mplayer media-video/mplayer2 ) ) ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d01a6cf6eb63f51ec6a03e5db62e85f4
diff --git a/metadata/md5-cache/media-sound/lilypond-2.16.2 b/metadata/md5-cache/media-sound/lilypond-2.16.2
index 27bc7c7e0c98..85cae927214f 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.16.2
+++ b/metadata/md5-cache/media-sound/lilypond-2.16.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dae2cd6a293f3f51f99c2b75a329936b
+_md5_=5ed2ebb28f2d718645d4f5a425a0a23d
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.23 b/metadata/md5-cache/media-sound/lilypond-2.17.23
index 02e82cdc99f4..a17886e2c824 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.17.23
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.23
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.23.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=098199dc4e7e799b6502945609ab846e
+_md5_=4bcef76e064eed68a180322aa41afd30
diff --git a/metadata/md5-cache/media-sound/lilypond-2.17.24 b/metadata/md5-cache/media-sound/lilypond-2.17.24
index df4af93a6cf9..d33a318f563e 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.17.24
+++ b/metadata/md5-cache/media-sound/lilypond-2.17.24
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.17/lilypond-2.17.24.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2012c71c9909a80c9b910b044ed94804
+_md5_=20a17c06fd710a552d88195cdd234971
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index 64a431359af8..f682d31b6263 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -9,5 +9,5 @@ RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,rege
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6d2e8e3d9e34ff09c081145119d45bfd
diff --git a/metadata/md5-cache/media-sound/musique-9999 b/metadata/md5-cache/media-sound/musique-9999
index b82fda1e617e..45bcf5dcb2de 100644
--- a/metadata/md5-cache/media-sound/musique-9999
+++ b/metadata/md5-cache/media-sound/musique-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://flavio.tordini.org/minitunes
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtgui:4[dbus(+)] dev-qt/qtsql:4[sqlite] || ( dev-qt/qtphonon:4 media-libs/phonon ) media-libs/taglib
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=10df733add9b5875ab6221fed9afbbff
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-9999 b/metadata/md5-cache/media-sound/ncmpcpp-9999
index ec40016a3298..c5d50bcca62f 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-9999
+++ b/metadata/md5-cache/media-sound/ncmpcpp-9999
@@ -7,5 +7,5 @@ IUSE=bash-completion clock curl outputs taglib unicode visualizer
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.50[nls] sys-libs/ncurses[unicode?] >=media-libs/libmpdclient-2.1 curl? ( net-misc/curl ) visualizer? ( sci-libs/fftw:3.0 ) taglib? ( media-libs/taglib )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eecf5e2726e91e5be20de46250765f4b
diff --git a/metadata/md5-cache/media-sound/pianobar-9999 b/metadata/md5-cache/media-sound/pianobar-9999
index b00cd9d1d639..d63dca241ead 100644
--- a/metadata/md5-cache/media-sound/pianobar-9999
+++ b/metadata/md5-cache/media-sound/pianobar-9999
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libao net-libs/gnutls dev-libs/libgcrypt dev-libs/json-c aac?
 REQUIRED_USE=|| ( aac mp3 )
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a3a0df24e3c32527bb8cfd75891eeed
diff --git a/metadata/md5-cache/media-sound/pithos-99999999 b/metadata/md5-cache/media-sound/pithos-99999999
index b75cd0e61af5..054d9e1a3f98 100644
--- a/metadata/md5-cache/media-sound/pithos-99999999
+++ b/metadata/md5-cache/media-sound/pithos-99999999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-plugins/gst-plugins-meta[aac,http,mp3] gnome? ( gnome-base/gnome-settings-daemon ) !gnome? ( dev-libs/keybinder[python] ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d80ed0659e1e093cf043bb3171b35b94
diff --git a/metadata/md5-cache/media-sound/pms-9999 b/metadata/md5-cache/media-sound/pms-9999
index 93e534eb02c3..33dd8d20b4fa 100644
--- a/metadata/md5-cache/media-sound/pms-9999
+++ b/metadata/md5-cache/media-sound/pms-9999
@@ -7,5 +7,5 @@ IUSE=regex
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=6da9fef5a02affed57d49ed520b996ac
diff --git a/metadata/md5-cache/media-sound/pulseaudio-9999 b/metadata/md5-cache/media-sound/pulseaudio-9999
index cf3e9b427723..519c4b3053e4 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-9999
+++ b/metadata/md5-cache/media-sound/pulseaudio-9999
@@ -9,5 +9,5 @@ PDEPEND=alsa? ( media-plugins/alsa-plugins[pulseaudio] )
 RDEPEND=>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4.99 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) xen? ( app-emulation/xen ) systemd? ( >=sys-apps/systemd-39 ) dev-libs/json-c >=sys-devel/libtool-2.2.4 equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 REQUIRED_USE=bluetooth? ( dbus )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c9c13b5613e5cea0663ffb732126c813
diff --git a/metadata/md5-cache/media-sound/tomahawk-9999 b/metadata/md5-cache/media-sound/tomahawk-9999
index 806f32c301ee..94987b316c20 100644
--- a/metadata/md5-cache/media-sound/tomahawk-9999
+++ b/metadata/md5-cache/media-sound/tomahawk-9999
@@ -7,5 +7,5 @@ IUSE=debug jabber twitter
 LICENSE=GPL-3 BSD
 RDEPEND=app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 >=dev-libs/libattica-0.4.0 dev-libs/qjson dev-libs/quazip dev-libs/qtkeychain >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtdbus-4.7.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) >=dev-qt/qtsql-4.7.0:4[sqlite] >=dev-qt/qtsvg-4.7.0:4 >=dev-qt/qtwebkit-4.7.0:4 >=media-libs/liblastfm-1.0.1 >=media-libs/libechonest-2.1.0 >=media-libs/phonon-4.5.0 >=media-libs/taglib-1.6.0 x11-libs/libX11 jabber? ( >=net-libs/jreen-1.1.1 ) twitter? ( net-libs/qtweetlib ) app-crypt/qca-ossl
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b00dba4b0ed21185b62a9dd48d7542df
diff --git a/metadata/md5-cache/media-sound/volti-0.2.3-r1 b/metadata/md5-cache/media-sound/volti-0.2.3-r1
index 868c0862a009..1a1ec3ff412b 100644
--- a/metadata/md5-cache/media-sound/volti-0.2.3-r1
+++ b/metadata/md5-cache/media-sound/volti-0.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://volti.googlecode.com/files/volti-0.2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9ef48eec00b759dec984210e20b886cb
+_md5_=c45d78787b87eb662a7656297cecb3be
diff --git a/metadata/md5-cache/media-sound/xnoise-9999 b/metadata/md5-cache/media-sound/xnoise-9999
index ffa220f56002..3b9e56434638 100644
--- a/metadata/md5-cache/media-sound/xnoise-9999
+++ b/metadata/md5-cache/media-sound/xnoise-9999
@@ -7,5 +7,5 @@ IUSE=ayatana +lastfm +lyrics
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.34:2 gnome-base/librsvg:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 dev-db/sqlite:3 >=media-libs/libtaginfo-0.1.6 x11-libs/cairo x11-libs/libX11 ayatana? ( dev-libs/libappindicator:3 ) lastfm? ( net-libs/libsoup:2.4 ) lyrics? ( net-libs/libsoup:2.4 dev-libs/libxml2:2 )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=8f8be40ead3d978dd5711a341a2f4618
diff --git a/metadata/md5-cache/media-tv/xbmc-9999 b/metadata/md5-cache/media-tv/xbmc-9999
index 33f16f602bf2..28ebf4f5e677 100644
--- a/metadata/md5-cache/media-tv/xbmc-9999
+++ b/metadata/md5-cache/media-tv/xbmc-9999
@@ -9,5 +9,5 @@ RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[sqlite] ) python_s
 REQUIRED_USE=pvr? ( mysql ) rsxs? ( X ) X? ( sdl ) xrandr? ( X )
 SLOT=0
 SRC_URI=!java? ( mirror://gentoo/xbmc-9999-20130413-generated-addons.tar.xz )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f28958c400d43402ab0937e6627043f8
diff --git a/metadata/md5-cache/media-video/aegisub-9999 b/metadata/md5-cache/media-video/aegisub-9999
index 31517a0a7646..ec898df1c32b 100644
--- a/metadata/md5-cache/media-video/aegisub-9999
+++ b/metadata/md5-cache/media-video/aegisub-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/wxGTK-2.9.3:2.9[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.10.0[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2.3.5:2 alsa? ( >=media-libs/alsa-lib-1.0.16 ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) fftw? ( >=sci-libs/fftw-3.3 )
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	3315ffba81a98dea5d9837edb418a587
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	3315ffba81a98dea5d9837edb418a587
 _md5_=79288ce280cdbc4796890817350646f0
diff --git a/metadata/md5-cache/media-video/aravis-9999 b/metadata/md5-cache/media-video/aravis-9999
index 81c15f7fb905..25e4287cecfb 100644
--- a/metadata/md5-cache/media-video/aravis-9999
+++ b/metadata/md5-cache/media-video/aravis-9999
@@ -7,5 +7,5 @@ IUSE=X gstreamer
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-xvideo:0.10 ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=733e27c417cca9e40af448e3131f9360
diff --git a/metadata/md5-cache/media-video/avidemux-9999 b/metadata/md5-cache/media-video/avidemux-9999
index d571559a1a0b..90813b4035e5 100644
--- a/metadata/md5-cache/media-video/avidemux-9999
+++ b/metadata/md5-cache/media-video/avidemux-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 PDEPEND=~media-libs/avidemux-plugins-9999:2.6[opengl?,qt4?]
 RDEPEND=~media-libs/avidemux-core-9999:2.6[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?] opengl? ( virtual/opengl:0 ) qt4? ( >=dev-qt/qtgui-4.8.3:4 ) vaapi? ( x11-libs/libva:0 ) video_cards_fglrx? ( x11-libs/xvba-video:0 )
 SLOT=2.6
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=abe8bde52c11ffe04fd942db68463d5d
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index 230cd3e315ac..49014f268373 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
 RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) celt? ( >=media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amrenc? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack ) x264? ( >=media-libs/x264-0.0.20111017:= ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gme? ( media-libs/game-music-emu ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) openssl? ( dev-libs/openssl ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( media-libs/libquvi ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
 SLOT=0/52.55.55
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4067783875ba400b5c9b031e4cba448b
diff --git a/metadata/md5-cache/media-video/get_flash_videos-9999 b/metadata/md5-cache/media-video/get_flash_videos-9999
index cd6e0303c9d9..bc98387462ca 100644
--- a/metadata/md5-cache/media-video/get_flash_videos-9999
+++ b/metadata/md5-cache/media-video/get_flash_videos-9999
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=Apache-2.0
 RDEPEND=dev-perl/WWW-Mechanize perl-core/Module-CoreList dev-perl/HTML-TokeParser-Simple dev-perl/Module-Find || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3f7fa997d13d1bd849336d15709f7f14
diff --git a/metadata/md5-cache/media-video/handbrake-0.9.9 b/metadata/md5-cache/media-video/handbrake-0.9.9
index 11cdc091e973..3102898b452c 100644
--- a/metadata/md5-cache/media-video/handbrake-0.9.9
+++ b/metadata/md5-cache/media-video/handbrake-0.9.9
@@ -11,4 +11,4 @@ REQUIRED_USE=!ffmpeg? ( gstreamer )
 SLOT=0
 SRC_URI=http://handbrake.fr/rotation.php?file=HandBrake-0.9.9.tar.bz2 -> handbrake-0.9.9.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=24fd9366e8c991e044b50b01b34aa7ba
+_md5_=14fc005cdb21996f323a7baf1e12c8de
diff --git a/metadata/md5-cache/media-video/handbrake-9999 b/metadata/md5-cache/media-video/handbrake-9999
index 3a8e41edc223..84010de903e7 100644
--- a/metadata/md5-cache/media-video/handbrake-9999
+++ b/metadata/md5-cache/media-video/handbrake-9999
@@ -9,4 +9,4 @@ RDEPEND=media-libs/a52dec media-libs/faac media-libs/libass media-libs/libbluray
 REQUIRED_USE=!ffmpeg? ( gstreamer )
 SLOT=0
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4a5b2ee08b505f5c29251afd6f758578
+_md5_=e497a62a2a3c496b5c1eacc820b080f4
diff --git a/metadata/md5-cache/media-video/libav-0.8.9999 b/metadata/md5-cache/media-video/libav-0.8.9999
index c30627cbe40a..554d2cb5b274 100644
--- a/metadata/md5-cache/media-video/libav-0.8.9999
+++ b/metadata/md5-cache/media-video/libav-0.8.9999
@@ -9,5 +9,5 @@ RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/open
 REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) test? ( encode )
 SLOT=0/0.8
 SRC_URI=test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=064d049385ad7d76b8ec257f7d7e7769
diff --git a/metadata/md5-cache/media-video/libav-9.9999 b/metadata/md5-cache/media-video/libav-9.9999
index 0031ac18b1b5..e59115f82f77 100644
--- a/metadata/md5-cache/media-video/libav-9.9999
+++ b/metadata/md5-cache/media-video/libav-9.9999
@@ -9,5 +9,5 @@ RDEPEND=!media-video/ffmpeg:0 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/op
 REQUIRED_USE=bindist? ( !faac !openssl !fdk ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) test? ( encode zlib )
 SLOT=0/9
 SRC_URI=test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=696adb115b9fd967ec77dd2c3194b7e9
diff --git a/metadata/md5-cache/media-video/libav-9999 b/metadata/md5-cache/media-video/libav-9999
index 9f65c2051038..cd59ce3bb33b 100644
--- a/metadata/md5-cache/media-video/libav-9999
+++ b/metadata/md5-cache/media-video/libav-9999
@@ -9,5 +9,5 @@ RDEPEND=!media-video/ffmpeg:0 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/op
 REQUIRED_USE=bindist? ( !faac !openssl !fdk ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) test? ( encode zlib )
 RESTRICT=test
 SLOT=0/9
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2c3d96f0d22b3a891607288be171e60f
diff --git a/metadata/md5-cache/media-video/mplayer-9999 b/metadata/md5-cache/media-video/mplayer-9999
index 8f1a72503f35..d86e6a58656c 100644
--- a/metadata/md5-cache/media-video/mplayer-9999
+++ b/metadata/md5-cache/media-video/mplayer-9999
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib || ( >=media-video/ffmpeg-
 REQUIRED_USE=bindist? ( !faac ) dga? ( X ) dvdnav? ( dvd ) dxr3? ( X ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
 SLOT=0
 SRC_URI=!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc36e029bf7e3fc1f4234ebc0741b743
diff --git a/metadata/md5-cache/media-video/mplayer2-2.0_p20130428-r1 b/metadata/md5-cache/media-video/mplayer2-2.0_p20130428-r1
index 0e3db867cee7..c89f649b1d06 100644
--- a/metadata/md5-cache/media-video/mplayer2-2.0_p20130428-r1
+++ b/metadata/md5-cache/media-video/mplayer2-2.0_p20130428-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=cddb? ( cdio network ) dvdnav? ( dvd ) enca? ( iconv ) lcms? ( open
 SLOT=0
 SRC_URI=http://rion-overlay.googlecode.com/files/mplayer2-2.0_p20130428.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5688440b01b11a3e6349827f76383bb5
+_md5_=ae515e57d31c931e5d647fbfda1216e3
diff --git a/metadata/md5-cache/media-video/mplayer2-9999 b/metadata/md5-cache/media-video/mplayer2-9999
index 039f809bd98c..e0ff7a405ba6 100644
--- a/metadata/md5-cache/media-video/mplayer2-9999
+++ b/metadata/md5-cache/media-video/mplayer2-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses sys-libs/zlib X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) directfb? ( dev-libs/DirectFB ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) ) enca? ( app-i18n/enca ) gif? ( media-libs/giflib ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc media-video/ffmpeg:0 ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( >=media-libs/libquvi-0.4.1 ) samba? ( net-fs/samba ) >=virtual/ffmpeg-9[threads?,vdpau?] symlink? ( !media-video/mplayer )
 REQUIRED_USE=cddb? ( cdio network ) dvdnav? ( dvd ) enca? ( iconv ) lcms? ( opengl ) opengl? ( || ( aqua X ) ) portaudio? ( threads ) pvr? ( v4l ) radio? ( v4l || ( alsa oss ) ) v4l? ( threads ) vdpau? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c2fda5a2659fa1ad5c257896cc7ac39e
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=75d16f29c5607ef31482401be6123cf1
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 3264b5f176e7..99847d525fdf 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( >=media-video/libav-9:=[encode?,threads?,vaapi?,vdpau?] >=media-video/ffmpeg-1.2:0=[encode?,threads?,vaapi?,vdpau?] ) sys-libs/ncurses sys-libs/zlib X? ( x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vaapi? ( x11-libs/libva[X(+)] ) vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) bluray? ( media-libs/libbluray ) bs2b? ( media-libs/libbs2b ) cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( media-libs/libcaca ) libguess? ( >=app-i18n/libguess-1.0 ) lirc? ( app-misc/lirc ) mng? ( media-libs/libmng ) mp3? ( media-sound/mpg123 ) openal? ( >=media-libs/openal-1.13 ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( || ( media-libs/libpostproc >=media-video/ffmpeg-1.2:0[encode?,threads?,vaapi?,vdpau?] ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( >=media-libs/libquvi-0.4.1:= ) samba? ( net-fs/samba ) wayland? ( >=dev-libs/wayland-1.0.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 )
 REQUIRED_USE=enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) opengl? ( || ( aqua wayland X ) ) portaudio? ( threads ) pvr? ( v4l ) radio? ( v4l || ( alsa oss ) ) v4l? ( threads ) vaapi? ( X ) vdpau? ( X ) wayland? ( opengl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b015e7faa25994938905452bee27f44
diff --git a/metadata/md5-cache/media-video/pitivi-0.15.2 b/metadata/md5-cache/media-video/pitivi-0.15.2
index 2cb23e1aef9f..610525e8cc01 100644
--- a/metadata/md5-cache/media-video/pitivi-0.15.2
+++ b/metadata/md5-cache/media-video/pitivi-0.15.2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.15/pitivi-0.15.2.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7d56ca4c15fc16f70d6ac763d4d2cfc6
+_md5_=11b68209fb99d4f31b35061b9a6f2ad3
diff --git a/metadata/md5-cache/media-video/rtmpdump-9999 b/metadata/md5-cache/media-video/rtmpdump-9999
index 9741e07228d0..8ad5cb9f5697 100644
--- a/metadata/md5-cache/media-video/rtmpdump-9999
+++ b/metadata/md5-cache/media-video/rtmpdump-9999
@@ -7,5 +7,5 @@ IUSE=gnutls polarssl ssl
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=ssl? ( gnutls? ( net-libs/gnutls ) polarssl? ( !gnutls? ( >=net-libs/polarssl-0.14.0 ) ) !gnutls? ( !polarssl? ( dev-libs/openssl ) ) ) sys-libs/zlib
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=5da314cbe19459b2fd6d6dac93e59b67
diff --git a/metadata/md5-cache/media-video/smplayer2-9999 b/metadata/md5-cache/media-video/smplayer2-9999
index 1e2f0aaa72e3..ac0e0d943296 100644
--- a/metadata/md5-cache/media-video/smplayer2-9999
+++ b/metadata/md5-cache/media-video/smplayer2-9999
@@ -7,5 +7,5 @@ IUSE=dbus debug +download-subs linguas_bg linguas_ca linguas_cs linguas_da lingu
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) download-subs? ( dev-libs/quazip ) media-video/mplayer2[libass,png]
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd590e9b120fb09ed5dc024740badcdf
diff --git a/metadata/md5-cache/media-video/snappy-9999 b/metadata/md5-cache/media-video/snappy-9999
index d2c6b3a0dd21..f915db806b59 100644
--- a/metadata/md5-cache/media-video/snappy-9999
+++ b/metadata/md5-cache/media-video/snappy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/luisbg/snappy
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=media-libs/clutter-1.2.0:1.0 >=media-libs/clutter-gst-1.0.0:1.0 x11-libs/libXtst >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 !!net-misc/spice-gtk
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=6cbc02302b54d3510f7ae94fc1b64309
diff --git a/metadata/md5-cache/media-video/subliminal-9999 b/metadata/md5-cache/media-video/subliminal-9999
index 65d281d0010a..b315c407ecb2 100644
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-python/beautifulsoup:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/guessit-0.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ~dev-python/requests-0.14.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/enzyme-0.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c026fbc5030adcee0d9b120a7dabd71f
diff --git a/metadata/md5-cache/media-video/vlc-2.0.9999 b/metadata/md5-cache/media-video/vlc-2.0.9999
index c8ebea6c970d..f84c9c08fbd3 100644
--- a/metadata/md5-cache/media-video/vlc-2.0.9999
+++ b/metadata/md5-cache/media-video/vlc-2.0.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923:= ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) media-library? ( sqlite ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) switcher? ( avcodec ) vaapi? ( avcodec X ) vlm? ( encode ) xosd? ( X ) xv? ( xcb )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da3a893f906a90922e6ea3894ccc2df5
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 3f328738695a..863a5f59f453 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm media-fonts/dejavu ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama ) speex? ( media-libs/speex ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923:= ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt4? ( X ) sdl? ( X ) skins? ( truetype qt4 X ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8355dd64d6074a7dd4b43242f94086ca
diff --git a/metadata/md5-cache/media-video/x264-encoder-9999 b/metadata/md5-cache/media-video/x264-encoder-9999
index c4e34820934b..8f6f86b5ddf8 100644
--- a/metadata/md5-cache/media-video/x264-encoder-9999
+++ b/metadata/md5-cache/media-video/x264-encoder-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
 REQUIRED_USE=ffmpegsource? ( ffmpeg )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e14e05d325d3c0c5fe38497f3a7096f1
diff --git a/metadata/md5-cache/net-analyzer/ettercap-9999 b/metadata/md5-cache/net-analyzer/ettercap-9999
index 24e3ea5dd0f3..4166642f50d8 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-9999
+++ b/metadata/md5-cache/net-analyzer/ettercap-9999
@@ -7,5 +7,5 @@ IUSE=gtk ipv6 ncurses +plugins ssl
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libpcre net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3 ) plugins? ( >=net-misc/curl-7.26.0 sys-devel/libtool ) ssl? ( dev-libs/openssl )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0284cb2ca3fd51c787fc191be8f1ccc7
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.8.10 b/metadata/md5-cache/net-analyzer/fail2ban-0.8.10
index 38a34a02d2e4..29454c375a19 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.8.10
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.8.10
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.8.10 -> fail2ban-0.8.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=180dacfd4ea417f07cd0e405132791b0
+_md5_=326bb171e8d3dd77d142103468ca5b26
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.8.10-r2 b/metadata/md5-cache/net-analyzer/fail2ban-0.8.10-r2
index 216579ac62f8..4beabf9bb68b 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.8.10-r2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.8.10-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.8.10 -> fail2ban-0.8.10.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=4f4d3520427a7447e64f9766eeb17dc9
+_md5_=8144db883b9e29d3990cb32fba8aae07
diff --git a/metadata/md5-cache/net-analyzer/gsm-receiver-9999 b/metadata/md5-cache/net-analyzer/gsm-receiver-9999
index 55a13a93405e..70893898af86 100644
--- a/metadata/md5-cache/net-analyzer/gsm-receiver-9999
+++ b/metadata/md5-cache/net-analyzer/gsm-receiver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://svn.berlin.ccc.de/projects/airprobe/
 LICENSE=GPL-3
 RDEPEND=net-libs/libosmocore <net-wireless/gnuradio-3.7_rc:0= =dev-lang/python-2*
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=d336be01199e9dd625ffcc29877ddbae
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.85 b/metadata/md5-cache/net-analyzer/mtr-0.85
index 4746f6e16bf4..fd846e858254 100644
--- a/metadata/md5-cache/net-analyzer/mtr-0.85
+++ b/metadata/md5-cache/net-analyzer/mtr-0.85
@@ -4,10 +4,10 @@ DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
 EAPI=5
 HOMEPAGE=http://www.bitwizard.nl/mtr/
 IUSE=gtk ipv6 suid
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=ftp://ftp.bitwizard.nl/mtr/mtr-0.85.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a77909eb4403cb4e161bb5ab5651cd4a
+_md5_=96b2296434655e364840076244c233b3
diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-9999 b/metadata/md5-cache/net-analyzer/multimon-ng-9999
index 4705626fd416..79234186450b 100644
--- a/metadata/md5-cache/net-analyzer/multimon-ng-9999
+++ b/metadata/md5-cache/net-analyzer/multimon-ng-9999
@@ -7,5 +7,5 @@ IUSE=pulseaudio
 LICENSE=GPL-2
 RDEPEND=pulseaudio? ( media-sound/pulseaudio ) x11-libs/libX11
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a3d41278bb40f3a4c8d803f3bbe1a289
diff --git a/metadata/md5-cache/net-analyzer/munin-2.1.9999 b/metadata/md5-cache/net-analyzer/munin-2.1.9999
index 87b4cf6682ec..8f418f72a7ef 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.1.9999
+++ b/metadata/md5-cache/net-analyzer/munin-2.1.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e5df33ad3f9f22669620aae379e9d6e
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999 b/metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999
index c71bcdaeabde..06a00fdaa8fc 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-flameeyes-9999
@@ -7,5 +7,5 @@ IUSE=smart samba
 LICENSE=MIT
 RDEPEND=dev-perl/Nagios-Plugin sys-apps/portage dev-perl/Time-Duration dev-perl/TimeDate smart? ( sys-apps/smartmontools app-admin/sudo ) samba? ( dev-perl/Filesys-SmbClient )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=18735ca8929cd105876c5df9d6170c24
diff --git a/metadata/md5-cache/net-analyzer/namebench-1.3.1-r1 b/metadata/md5-cache/net-analyzer/namebench-1.3.1-r1
index 562a2239abdd..52be11f172c4 100644
--- a/metadata/md5-cache/net-analyzer/namebench-1.3.1-r1
+++ b/metadata/md5-cache/net-analyzer/namebench-1.3.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( python_targets_python2_5? ( dev-lang/python:2.5[tk] ) python_targets_python2_6? ( dev-lang/python:2.6[tk] ) python_targets_python2_7? ( dev-lang/python:2.7[tk] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=X? ( python_targets_python2_6? ( dev-lang/python:2.6[tk] ) python_targets_python2_7? ( dev-lang/python:2.7[tk] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=DNS Benchmark Utility
 EAPI=5
 HOMEPAGE=http://code.google.com/p/namebench/
 IUSE=X python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=X? ( python_targets_python2_5? ( dev-lang/python:2.5[tk] ) python_targets_python2_6? ( dev-lang/python:2.6[tk] ) python_targets_python2_7? ( dev-lang/python:2.7[tk] ) ) >=dev-python/dnspython-1.8.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/httplib2-0.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/graphy-1.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/jinja-2.2.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/simplejson-2.1.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+RDEPEND=X? ( python_targets_python2_6? ( dev-lang/python:2.6[tk] ) python_targets_python2_7? ( dev-lang/python:2.7[tk] ) ) >=dev-python/dnspython-1.8.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/httplib2-0.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/graphy-1.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/jinja-2.2.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/simplejson-2.1.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://namebench.googlecode.com/files/namebench-1.3.1-source.tgz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fa9dc4306bd11f31f41acdb5ae352c4e
+_md5_=46b533bc27578d0f1a45e4d3a4f32777
diff --git a/metadata/md5-cache/net-analyzer/netsniff-ng-9999 b/metadata/md5-cache/net-analyzer/netsniff-ng-9999
index 139292d2199d..65e19d7ff84b 100644
--- a/metadata/md5-cache/net-analyzer/netsniff-ng-9999
+++ b/metadata/md5-cache/net-analyzer/netsniff-ng-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://netsniff-ng.org/
 LICENSE=GPL-2
 RDEPEND=dev-libs/geoip dev-libs/libnl:3 dev-libs/userspace-rcu net-libs/libnetfilter_conntrack sys-libs/ncurses:5 dev-libs/libcli net-libs/libpcap sys-libs/ncurses:5 net-libs/libnet:1.1
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7916c270b1447dbdc8159ca4ea9130d4
diff --git a/metadata/md5-cache/net-analyzer/nmap-6.40-r1 b/metadata/md5-cache/net-analyzer/nmap-6.40-r1
index 7a0cc38c5d63..6307f572822d 100644
--- a/metadata/md5-cache/net-analyzer/nmap-6.40-r1
+++ b/metadata/md5-cache/net-analyzer/nmap-6.40-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2 ||
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-6.40.tar.bz2 http://dev.gentoo.org/~jer/nmap-logo-64.png
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=67c0556ec4b327e9735a74fb9657edb8
+_md5_=648314327dcacaa7518b7a79429ae567
diff --git a/metadata/md5-cache/net-analyzer/pypacker-2.0 b/metadata/md5-cache/net-analyzer/pypacker-2.0
index f70e4c7c0e79..b89cafa76761 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-2.0
+++ b/metadata/md5-cache/net-analyzer/pypacker-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=https://github.com/mike01/pypacker/tarball/v2.0 -> pypacker-2.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=9a1c7f10152f1906bc4d862b05eb76fd
+_md5_=530753611948e1059bd408cfc0407d85
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.8.9 b/metadata/md5-cache/net-analyzer/wireshark-1.8.9
index b3e815e4a1fa..f0bb8f6fbe06 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.8.9
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.8.9
@@ -11,4 +11,4 @@ REQUIRED_USE=ssl? ( crypt )
 SLOT=0/1.8.9
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.8.9.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cc1098c0b53fa3718128aee3d62c784a
+_md5_=3118c7426708ae68899ba6021f7d0bd6
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.8 b/metadata/md5-cache/net-analyzer/zabbix-2.0.8
new file mode 100644
index 000000000000..fa4e476a31c5
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers.
+EAPI=5
+HOMEPAGE=http://www.zabbix.com/
+IUSE=agent java curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp sqlite iodbc odbc static elibc_FreeBSD java
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-base-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api dev-java/json-simple ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.8.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	depend.php	df169a364e191b840b695604097e3c21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=0cf217cde75137ac9937e7ee12183eac
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.7.9999 b/metadata/md5-cache/net-dialup/accel-ppp-1.7.9999
index 900fedf55526..e1d72ee6abbc 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.7.9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.7.9999
@@ -7,5 +7,5 @@ IUSE=debug doc postgres radius shaper snmp
 LICENSE=GPL-2
 RDEPEND=postgres? ( dev-db/postgresql-base ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fa2432b9e1513886028a2f815a1ba585
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.31-r2 b/metadata/md5-cache/net-dns/avahi-0.6.31-r2
index 32927f835d13..1a73623108bf 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.31-r2
+++ b/metadata/md5-cache/net-dns/avahi-0.6.31-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm ) mono? ( dbus ) how
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.31.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=770a48462a8f717997b97c65e39bcf51
+_md5_=9dc0ae8db5e16b433b826d5b313acd5b
diff --git a/metadata/md5-cache/net-dns/rbldnsd-0.997 b/metadata/md5-cache/net-dns/rbldnsd-0.997
index 5e9cc5c7a867..cae18adc6e04 100644
--- a/metadata/md5-cache/net-dns/rbldnsd-0.997
+++ b/metadata/md5-cache/net-dns/rbldnsd-0.997
@@ -10,4 +10,4 @@ RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://www.corpit.ru/mjt/rbldnsd/rbldnsd-0.997.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=18ec2ffb3610c918348f3684566cc26b
+_md5_=64f8da21aa391b4a766b6d67517a988e
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.20 b/metadata/md5-cache/net-dns/unbound-1.4.20
index 257df04233f0..dda93cfa8cd7 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.20
+++ b/metadata/md5-cache/net-dns/unbound-1.4.20
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.4.20.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0307e463b10860ddacf199db70345df2
+_md5_=c89a1c6de50c9447f5ea419b7ccce434
diff --git a/metadata/md5-cache/net-fs/autofs-5.0.7-r4 b/metadata/md5-cache/net-fs/autofs-5.0.7-r4
index af7deee680ee..cd0eab948788 100644
--- a/metadata/md5-cache/net-fs/autofs-5.0.7-r4
+++ b/metadata/md5-cache/net-fs/autofs-5.0.7-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Kernel based automounter
 EAPI=5
 HOMEPAGE=http://www.linux-consulting.com/Amd_AutoFS/autofs.html
 IUSE=-dmalloc hesiod ldap libtirpc mount-locking sasl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc )
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.7.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/autofs-5.0.7-patches-3.tar.lzma
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=545bf47a86162b92897300107259d5bc
+_md5_=f8b4ab2eba3dfe91d6578cc4338298e6
diff --git a/metadata/md5-cache/net-fs/autofs-9999 b/metadata/md5-cache/net-fs/autofs-9999
index a17a223b55a6..82bc442e8c9d 100644
--- a/metadata/md5-cache/net-fs/autofs-9999
+++ b/metadata/md5-cache/net-fs/autofs-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) libtirpc? ( net-libs/libtirpc )
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4c3dc31538ca0d350b32dd30fd1596af
diff --git a/metadata/md5-cache/net-fs/libnfs-9999 b/metadata/md5-cache/net-fs/libnfs-9999
index c1cea7ea4943..b74bd901cda3 100644
--- a/metadata/md5-cache/net-fs/libnfs-9999
+++ b/metadata/md5-cache/net-fs/libnfs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/sahlberg/libnfs
 IUSE=static-libs
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=08338024b92674f7939c8e851ffae71d
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.5-r2 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.5-r2
new file mode 100644
index 000000000000..d9ce73739c71
--- /dev/null
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=The OpenAFS distributed file system kernel module
+EAPI=5
+HOMEPAGE=http://www.openafs.org/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=IBM BSD openafs-krb5-a APSL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://openafs.org/dl/openafs/1.6.5/openafs-1.6.5-src.tar.bz2 mirror://gentoo/openafs-1.6.5-patches-1.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3f4f3e60cd2d07d002aa792004ad89ed
diff --git a/metadata/md5-cache/net-fs/samba-3.6.16 b/metadata/md5-cache/net-fs/samba-3.6.16
index 5c1088369d13..3c1c4b9c403b 100644
--- a/metadata/md5-cache/net-fs/samba-3.6.16
+++ b/metadata/md5-cache/net-fs/samba-3.6.16
@@ -4,7 +4,7 @@ DESCRIPTION=Library bits of the samba network filesystem
 EAPI=4
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes swat syslog winbind
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.5 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.18 virtual/libiconv ads? ( virtual/krb5 sys-fs/e2fsprogs client? ( sys-apps/keyutils kernel_linux? ( net-fs/cifs-utils[ads] ) ) ) avahi? ( net-dns/avahi[dbus] ) caps? ( sys-libs/libcap ) client? ( !net-fs/mount-cifs dev-libs/iniparser kernel_linux? ( net-fs/cifs-utils ) ) cluster? ( >=dev-db/ctdb-1.13 ) cups? ( net-print/cups ) debug? ( dev-libs/dmalloc ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) ldb? ( sys-libs/ldb ) pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sec-policy/selinux-samba ) syslog? ( virtual/logger )
 REQUIRED_USE=ads? ( ldap ) swat? ( server )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-3.6.16.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=79fc06a398c870099b2ac095e47492c9
+_md5_=799d66ae7795d162a9575e54b8750854
diff --git a/metadata/md5-cache/net-fs/samba-4.0.8-r2 b/metadata/md5-cache/net-fs/samba-4.0.8-r2
index 82b32b444ffa..d7719bafc6f8 100644
--- a/metadata/md5-cache/net-fs/samba-4.0.8-r2
+++ b/metadata/md5-cache/net-fs/samba-4.0.8-r2
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.0.8.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=04d061e1152471f1341a66e37808ac96
+_md5_=1e2765eb1c027a6592a61db5197c7baa
diff --git a/metadata/md5-cache/net-fs/samba-4.1.0_rc2 b/metadata/md5-cache/net-fs/samba-4.1.0_rc2
index 9ba2ab0848e4..4989edf997b9 100644
--- a/metadata/md5-cache/net-fs/samba-4.1.0_rc2
+++ b/metadata/md5-cache/net-fs/samba-4.1.0_rc2
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://samba/rc/samba-4.1.0rc2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=284bd7fc9b0cf077daa9a722df6fe6e2
+_md5_=58dd66f661d5380f123fdab45fcc67f4
diff --git a/metadata/md5-cache/net-im/bitlbee-3.2 b/metadata/md5-cache/net-im/bitlbee-3.2
index c5e4e2e629ca..efcf98edb933 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.2
+++ b/metadata/md5-cache/net-im/bitlbee-3.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( purple || ( jabber msn oscar yahoo ) ) msn? ( || ( gnutls nss
 SLOT=0
 SRC_URI=http://get.bitlbee.org/src/bitlbee-3.2.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7d1846cd29e387099186b398e0aa0511
+_md5_=83693c2a6b3dfe8ee276a174e2a70926
diff --git a/metadata/md5-cache/net-im/ekg2-0.3.1-r1 b/metadata/md5-cache/net-im/ekg2-0.3.1-r1
index cc533e8c65fd..40c46be08773 100644
--- a/metadata/md5-cache/net-im/ekg2-0.3.1-r1
+++ b/metadata/md5-cache/net-im/ekg2-0.3.1-r1
@@ -10,4 +10,4 @@ RDEPEND=gpg? ( app-crypt/gpgme ) gsm? ( media-sound/gsm ) gtk? ( x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://pl.ekg2.org/ekg2-0.3.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=31ec0fd5b5b6a7c319c53adf32c769d1
+_md5_=305bc1d3e91417e3b2b8ee32beb2da90
diff --git a/metadata/md5-cache/net-im/ekg2-9999 b/metadata/md5-cache/net-im/ekg2-9999
index 74a4ff02ec9e..535c2e060b7b 100644
--- a/metadata/md5-cache/net-im/ekg2-9999
+++ b/metadata/md5-cache/net-im/ekg2-9999
@@ -7,5 +7,5 @@ IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl python readline rss
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gadu? ( net-libs/libgadu ) gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) openssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline ) rss? ( dev-libs/expat ) ssl? ( net-libs/gnutls ) xmpp? ( dev-libs/expat ) zlib? ( sys-libs/zlib ) ncurses? ( sys-libs/ncurses[unicode=] gpm? ( sys-libs/gpm ) spell? ( app-text/aspell ) ) sqlite? ( !sqlite2? ( dev-db/sqlite:3 ) sqlite2? ( dev-db/sqlite:0 ) )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=635f615d72afcd5bb3de780121e97d9f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7e124482f6b4c061af9623db221393f7
diff --git a/metadata/md5-cache/net-im/emesene-9999 b/metadata/md5-cache/net-im/emesene-9999
index 862419636e13..263349c5d402 100644
--- a/metadata/md5-cache/net-im/emesene-9999
+++ b/metadata/md5-cache/net-im/emesene-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.emesene.org
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 )
 RDEPEND=dev-python/pygtk:2 dev-python/notify-python dev-python/pywebkitgtk dev-python/pyopenssl dev-python/xmpppy =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40027c7e37db351a7c05da4d155771be
diff --git a/metadata/md5-cache/net-im/empathy-3.6.4 b/metadata/md5-cache/net-im/empathy-3.6.4
index 262468dab380..8e29440ea104 100644
--- a/metadata/md5-cache/net-im/empathy-3.6.4
+++ b/metadata/md5-cache/net-im/empathy-3.6.4
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.33.3:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.5.1:3 x
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.6/empathy-3.6.4.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9b5e8e973427f530ae2f130e7565b843
+_md5_=7e973061c197edb3fec82744aacae33e
diff --git a/metadata/md5-cache/net-im/empathy-3.8.2 b/metadata/md5-cache/net-im/empathy-3.8.2
index 337d5676a52c..1bc796d97b24 100644
--- a/metadata/md5-cache/net-im/empathy-3.8.2
+++ b/metadata/md5-cache/net-im/empathy-3.8.2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.33.3:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.5.1:3 x
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.8/empathy-3.8.2.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=19ca5a2c7dae2708c04262b49f36a184
+_md5_=77bd514b570834e733634df63ca06399
diff --git a/metadata/md5-cache/net-im/empathy-3.8.3 b/metadata/md5-cache/net-im/empathy-3.8.3
index 382e37f8032b..2537c8da70ec 100644
--- a/metadata/md5-cache/net-im/empathy-3.8.3
+++ b/metadata/md5-cache/net-im/empathy-3.8.3
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.33.3:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.5.1:3 x
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.8/empathy-3.8.3.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fd7d8f24d32dfabfdc3c532cce7d6540
+_md5_=a9171be197894e571381a0578b7f7862
diff --git a/metadata/md5-cache/net-im/kmess-2.0.9999 b/metadata/md5-cache/net-im/kmess-2.0.9999
index 6d4bfe31c6cc..a71c586bb7ab 100644
--- a/metadata/md5-cache/net-im/kmess-2.0.9999
+++ b/metadata/md5-cache/net-im/kmess-2.0.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/libxml2 dev-libs/libxslt gif? ( media-libs/giflib ) konqueror? ( >=kde-base/libkonq-4.4:4[aqua=] ) libnotify? ( >=kde-base/knotify-4.4:4[aqua=] ) xscreensaver? ( x11-libs/libXScrnSaver ) !net-im/kmess:0 konqueror? ( >=kde-base/konqueror-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=088d86d8219100895bd9ff065780c3dc
diff --git a/metadata/md5-cache/net-im/kmess-9999 b/metadata/md5-cache/net-im/kmess-9999
index 47ad6ac78618..9d80dbca1cd9 100644
--- a/metadata/md5-cache/net-im/kmess-9999
+++ b/metadata/md5-cache/net-im/kmess-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/libxml2 dev-libs/libxslt gif? ( media-libs/giflib ) konqueror? ( >=kde-base/libkonq-4.4:4[aqua=] ) libnotify? ( >=kde-base/knotify-4.4:4[aqua=] ) xscreensaver? ( x11-libs/libXScrnSaver ) !net-im/kmess:0 konqueror? ( >=kde-base/konqueror-4.4:4[aqua=] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2fe07ad8a219a3510fa06736e6ca4dde
diff --git a/metadata/md5-cache/net-im/psi-9999 b/metadata/md5-cache/net-im/psi-9999
index f89f95025e31..a83192e0de2e 100644
--- a/metadata/md5-cache/net-im/psi-9999
+++ b/metadata/md5-cache/net-im/psi-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-4.4:4[dbus(+)?] >=app-crypt/qca-2.0.2:2 whiteboarding? (
 REQUIRED_USE=iconsets? ( extras ) plugins? ( extras ) powersave? ( extras ) webkit? ( extras )
 RESTRICT=test
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=225dcfe180747acf3dacb68d6d09d30e
diff --git a/metadata/md5-cache/net-im/sendxmpp-1.23 b/metadata/md5-cache/net-im/sendxmpp-1.23
index 99cab5972b65..6c10de6818c2 100644
--- a/metadata/md5-cache/net-im/sendxmpp-1.23
+++ b/metadata/md5-cache/net-im/sendxmpp-1.23
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=sendxmpp is a perl-script to send xmpp (jabber), similar to what mail(1) does for mail.
 EAPI=5
 HOMEPAGE=http://sendxmpp.hostname.sk/
-KEYWORDS=~amd64 hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 hppa ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Net-XMPP dev-perl/Authen-SASL virtual/perl-Getopt-Long || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/sendxmpp/sendxmpp_1.23.orig.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d060d74fe5ad4abed25d08d72da16025
+_md5_=fe3d0c778bb5ae9f594d23bb9c50ae08
diff --git a/metadata/md5-cache/net-im/skypetab-ng-9999 b/metadata/md5-cache/net-im/skypetab-ng-9999
index e3d085a7b224..3be19538c470 100644
--- a/metadata/md5-cache/net-im/skypetab-ng-9999
+++ b/metadata/md5-cache/net-im/skypetab-ng-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://github.com/kekekeks/skypetab-ng
 LICENSE=LGPL-3
 RDEPEND=dev-qt/qtgui:4 amd64? ( app-emulation/emul-linux-x86-qtlibs ) || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d87992a3dd518633785d25f291a242d5
diff --git a/metadata/md5-cache/net-im/telepathy-logger-0.6.0 b/metadata/md5-cache/net-im/telepathy-logger-0.6.0
index 0e7a45ba7190..69a2dc4448f6 100644
--- a/metadata/md5-cache/net-im/telepathy-logger-0.6.0
+++ b/metadata/md5-cache/net-im/telepathy-logger-0.6.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.25.11:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82
 SLOT=0/3
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.6.0.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4dfbed18f2baef5334608baccae693a0
+_md5_=75339c39bb899c9a2883b3a28f7931c5
diff --git a/metadata/md5-cache/net-im/telepathy-logger-0.8.0 b/metadata/md5-cache/net-im/telepathy-logger-0.8.0
index 15af9d0a940a..4e647d02f7ad 100644
--- a/metadata/md5-cache/net-im/telepathy-logger-0.8.0
+++ b/metadata/md5-cache/net-im/telepathy-logger-0.8.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1 >=dev-libs/dbus-glib-0.82 >=n
 SLOT=0/3
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.8.0.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=666497a2df990d3d750890752f5bd50b
+_md5_=b43f80943049b8b0a634d8f8ccff1cf0
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.14.0-r1 b/metadata/md5-cache/net-im/telepathy-mission-control-5.14.0-r1
index cc4e95645e0e..cba0d3cdc1f5 100644
--- a/metadata/md5-cache/net-im/telepathy-mission-control-5.14.0-r1
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.14.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( connman networkmanager )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.14.0.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4c1d220fd33df2f6d7f699393515a9c9
+_md5_=741f4e3b5bb3c8581a63724a1802e09d
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.14.1 b/metadata/md5-cache/net-im/telepathy-mission-control-5.14.1
index 077c46462ba3..8b96b556b525 100644
--- a/metadata/md5-cache/net-im/telepathy-mission-control-5.14.1
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.14.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.14.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fdc2be0cfe2518c44619319ec34dcea1
+_md5_=4eb17cc5956923d633bf6d0cd9d3dc85
diff --git a/metadata/md5-cache/net-irc/atheme-services-9999 b/metadata/md5-cache/net-irc/atheme-services-9999
index 878dd143d4d9..f841993755b2 100644
--- a/metadata/md5-cache/net-irc/atheme-services-9999
+++ b/metadata/md5-cache/net-irc/atheme-services-9999
@@ -7,5 +7,5 @@ IUSE=cracklib largenet ldap nls +pcre perl profile ssl
 LICENSE=BSD
 RDEPEND==dev-libs/libmowgli-9999:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3864d56200accd96525e6745b418b927
diff --git a/metadata/md5-cache/net-irc/hexchat-2.9.5 b/metadata/md5-cache/net-irc/hexchat-2.9.5
index cbf19b94a68f..f67c7e6cead5 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.9.5
+++ b/metadata/md5-cache/net-irc/hexchat-2.9.5
@@ -11,4 +11,4 @@ REQUIRED_USE=plugin-checksum? ( plugins ) plugin-doat? ( plugins ) plugin-fishli
 SLOT=0
 SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.5.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f44b527975a3383e9ee85d4540784bb3
+_md5_=a8551a1bb75757830809536d9ad76e70
diff --git a/metadata/md5-cache/net-irc/hexchat-2.9.5-r1 b/metadata/md5-cache/net-irc/hexchat-2.9.5-r1
index 40b9291d7fe0..aea8ca20f8cb 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.9.5-r1
+++ b/metadata/md5-cache/net-irc/hexchat-2.9.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=plugin-checksum? ( plugins ) plugin-doat? ( plugins ) plugin-fishli
 SLOT=0
 SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.5.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ce567ac7bc0f0098b1ab11bb683aa28a
+_md5_=a430b1a0cedfc1f6a7115834ceb7522c
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index de529129efe8..2da9a41b4d52 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dbus? ( >=dev-libs/dbus-glib-0.98 ) fastscroll? ( x11-libs/libXft ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] ) spell? ( app-text/enchant gtkspell? ( app-text/gtkspell:2 ) sexy? ( x11-libs/libsexy ) !gtkspell? ( !sexy? ( dev-libs/libxml2 ) ) ) ssl? ( >=dev-libs/openssl-0.9.8u ) theme-manager? ( dev-lang/mono )
 REQUIRED_USE=gtkspell? ( spell ) plugin-checksum? ( plugins ) plugin-doat? ( plugins ) plugin-fishlim? ( plugins ) plugin-sysinfo? ( plugins ) python? ( python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) ^^ ( python_single_target_python2_7 python_single_target_python3_3 ) ) sexy? ( spell ) ?? ( gtkspell sexy )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca232286118125e3883bcab42bf21c72
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index 445fd45fa290..66b0b2bdd77a 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtcore-4.6.0:4[ssl?] monolithic? ( >=dev-qt/qtscript-4.6.0:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( >=dev-qt/qtsql-4.6.0:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( >=dev-qt/qtsql-4.6.0:4[postgres] ) syslog? ( virtual/logger ) >=dev-qt/qtgui-4.6.0:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-qt/qtdbus-4.6.0:4 dev-libs/libdbusmenu-qt ) kde? ( >=kde-base/kdelibs-4.4 >=kde-base/oxygen-icons-4.4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon >=dev-qt/qtphonon-4.6.0:4 ) ) webkit? ( >=dev-qt/qtwebkit-4.6.0:4 ) ) !monolithic? ( server? ( >=dev-qt/qtscript-4.6.0:4 crypt? ( app-crypt/qca:2 app-crypt/qca-ossl ) !postgres? ( >=dev-qt/qtsql-4.6.0:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( >=dev-qt/qtsql-4.6.0:4[postgres] ) syslog? ( virtual/logger ) ) X? ( >=dev-qt/qtgui-4.6.0:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-qt/qtdbus-4.6.0:4 dev-libs/libdbusmenu-qt ) kde? ( >=kde-base/kdelibs-4.4 >=kde-base/oxygen-icons-4.4 ayatana? ( kde-misc/plasma-widget-message-indicator ) ) phonon? ( || ( media-libs/phonon >=dev-qt/qtphonon-4.6.0:4 ) ) webkit? ( >=dev-qt/qtwebkit-4.6.0:4 ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) syslog? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) ) phonon? ( || ( X monolithic ) ) dbus? ( || ( X monolithic ) ) ayatana? ( || ( X monolithic ) ) webkit? ( || ( X monolithic ) )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bff9a163d06f4d359116609fb0d8a209
diff --git a/metadata/md5-cache/net-irc/rbot-9999-r10 b/metadata/md5-cache/net-irc/rbot-9999-r10
index f406ae3bfe56..5ba0b79563a5 100644
--- a/metadata/md5-cache/net-irc/rbot-9999-r10
+++ b/metadata/md5-cache/net-irc/rbot-9999-r10
@@ -6,5 +6,5 @@ IUSE=spell aspell timezone translator shorturl nls dict figlet fortune cal host
 LICENSE=|| ( feh GPL-2 )
 RDEPEND=>=dev-lang/ruby-1.8 dev-ruby/ruby-bdb timezone? ( dev-ruby/tzinfo ) spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) translator? ( dev-ruby/mechanize ) shorturl? ( dev-ruby/shorturl ) nls? ( dev-ruby/ruby-gettext ) dict? ( dev-ruby/ruby-dict ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) =dev-lang/ruby-1.8*
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=465dc50627f0127ee3f5ce00d9d2a039
diff --git a/metadata/md5-cache/net-irc/telepathy-idle-0.1.16 b/metadata/md5-cache/net-irc/telepathy-idle-0.1.16
index 93bed8cf1c9c..9345f5e9afb0 100644
--- a/metadata/md5-cache/net-irc/telepathy-idle-0.1.16
+++ b/metadata/md5-cache/net-irc/telepathy-idle-0.1.16
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.30.0:2 >=net-libs/telepathy-
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.16.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=198aed5e93cdf22ee9c0f6ac7223f001
+_md5_=27c73acca8e23f51ddb04a192b12ff84
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 02db4435f599..e6ce7d21befa 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -7,5 +7,5 @@ IUSE=guile lua +perl +python ruby tcl +alias +charset +fifo +logger +relay +rmod
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=39f18f4f322a70df061773f5f2292c12
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 9217620f69f5..d03fb374fbc8 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -7,5 +7,5 @@ IUSE=daemon debug ipv6 perl python ssl sasl tcl
 LICENSE=GPL-2
 RDEPEND=perl? ( >=dev-lang/perl-5.10 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( >=dev-libs/openssl-0.9.7d ) tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-3* )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=613e3589e458085383dbacd7af4e01f0
diff --git a/metadata/md5-cache/net-libs/dslib-3.0-r1 b/metadata/md5-cache/net-libs/dslib-3.0-r1
index e8f53b195727..2a395811eec8 100644
--- a/metadata/md5-cache/net-libs/dslib-3.0-r1
+++ b/metadata/md5-cache/net-libs/dslib-3.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.nic.cz/public_media/datove_schranky/releases//src/dslib-3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4a35756052d3728e2f51de7fd8e11a9a
+_md5_=eb7ecec1997c1f077b484f6b381645c2
diff --git a/metadata/md5-cache/net-libs/gloox-0.9.8 b/metadata/md5-cache/net-libs/gloox-0.9.8
deleted file mode 100644
index f361253179de..000000000000
--- a/metadata/md5-cache/net-libs/gloox-0.9.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.7 ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-HOMEPAGE=http://camaya.net/gloox
-IUSE=debug gnutls idn ssl zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.7 ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://camaya.net/download/gloox-0.9.8.tar.bz2
-_md5_=fba38ce1ff576b08d78801050a836ce8
diff --git a/metadata/md5-cache/net-libs/gloox-0.9.9.5 b/metadata/md5-cache/net-libs/gloox-0.9.9.5
deleted file mode 100644
index 7d04b4f95ca2..000000000000
--- a/metadata/md5-cache/net-libs/gloox-0.9.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) zlib? ( >=sys-libs/zlib-1.2.3 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=2
-HOMEPAGE=http://camaya.net/gloox
-IUSE=debug gnutls idn ssl zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) zlib? ( >=sys-libs/zlib-1.2.3 )
-SLOT=0
-SRC_URI=http://camaya.net/download/gloox-0.9.9.5.tar.bz2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a1b00764af7d6158e1cff47c2afb89fc
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.6 b/metadata/md5-cache/net-libs/gloox-1.0.6
new file mode 100644
index 000000000000..2081718df0c6
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gloox-1.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
+DESCRIPTION=A portable high-level Jabber/XMPP library for C++
+EAPI=5
+HOMEPAGE=http://camaya.net/gloox
+IUSE=debug gnutls idn ssl zlib
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=idn? ( net-dns/libidn ) gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://camaya.net/download/gloox-1.0.6.tar.bz2
+_md5_=60e9551d03df6c788e679037a75526bc
diff --git a/metadata/md5-cache/net-libs/http-parser-2.1 b/metadata/md5-cache/net-libs/http-parser-2.1
index fe082ef1ba96..2277c6188768 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.1
+++ b/metadata/md5-cache/net-libs/http-parser-2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A parser for HTTP messages written in C. It parses both requests and responses
 EAPI=5
 HOMEPAGE=https://github.com/joyent/http-parser
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/joyent/http-parser/archive/v2.1.tar.gz -> http-parser-2.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=deabda396eea2505244770e080cf3312
+_md5_=027c083556ac161e23b8924b40c2067d
diff --git a/metadata/md5-cache/net-libs/libbtbb-9999 b/metadata/md5-cache/net-libs/libbtbb-9999
index b7113b8a56b6..8f5e4d7ba442 100644
--- a/metadata/md5-cache/net-libs/libbtbb-9999
+++ b/metadata/md5-cache/net-libs/libbtbb-9999
@@ -7,5 +7,5 @@ IUSE=+wireshark
 LICENSE=GPL-2
 RDEPEND=wireshark? ( dev-libs/glib >=net-analyzer/wireshark-1.8.3-r1:= )
 SLOT=0/9999
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=81980cf166cbd37e372763722e45693d
diff --git a/metadata/md5-cache/net-libs/libhackrf-9999 b/metadata/md5-cache/net-libs/libhackrf-9999
index c2a98fa02924..ce61cbba2927 100644
--- a/metadata/md5-cache/net-libs/libhackrf-9999
+++ b/metadata/md5-cache/net-libs/libhackrf-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://greatscottgadgets.com/hackrf/
 LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/9999
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a2c604f8fd3fcaf5014f4f3a54cc42f
diff --git a/metadata/md5-cache/net-libs/libiscsi-9999 b/metadata/md5-cache/net-libs/libiscsi-9999
index 4b9101029b8c..2d1a897ae150 100644
--- a/metadata/md5-cache/net-libs/libiscsi-9999
+++ b/metadata/md5-cache/net-libs/libiscsi-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=https://github.com/sahlberg/libiscsi
 LICENSE=GPL-2 LGPL-2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0960f0e8040cdb2d0d2388bdd82387a8
diff --git a/metadata/md5-cache/net-libs/libisds-9999 b/metadata/md5-cache/net-libs/libisds-9999
index 4c8c94083875..bf03b0e89200 100644
--- a/metadata/md5-cache/net-libs/libisds-9999
+++ b/metadata/md5-cache/net-libs/libisds-9999
@@ -7,5 +7,5 @@ IUSE=+curl debug nls static-libs test
 LICENSE=LGPL-3
 RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49345e58ab877a7cd59cb61c306c48d7
diff --git a/metadata/md5-cache/net-libs/libmirisdr-9999 b/metadata/md5-cache/net-libs/libmirisdr-9999
index 0449f737d68b..180f23d81f26 100644
--- a/metadata/md5-cache/net-libs/libmirisdr-9999
+++ b/metadata/md5-cache/net-libs/libmirisdr-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0/9999
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7eb6ec94a48b34dc36ce29130397edf8
diff --git a/metadata/md5-cache/net-libs/liboauth-1.0.1 b/metadata/md5-cache/net-libs/liboauth-1.0.1
index fc6c7e1948e1..ba444ee932da 100644
--- a/metadata/md5-cache/net-libs/liboauth-1.0.1
+++ b/metadata/md5-cache/net-libs/liboauth-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=C library implementing the OAuth secure authentication protocol
 EAPI=5
 HOMEPAGE=http://liboauth.sourceforge.net/
 IUSE=curl doc bindist +nss
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x64-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos
 LICENSE=|| ( GPL-2 MIT )
 RDEPEND=nss? ( dev-libs/nss curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-misc/curl[-ssl] ) ) ) !nss? ( dev-libs/openssl curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) ) ) net-misc/curl
 REQUIRED_USE=bindist? ( nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/liboauth/liboauth-1.0.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7daf99665b8edfabe6750131308637e0
+_md5_=55a11c3931400c9a59aebaab5af68b9c
diff --git a/metadata/md5-cache/net-libs/libosmo-dsp-9999 b/metadata/md5-cache/net-libs/libosmo-dsp-9999
index a790c2bdaada..2afe7bea6a7d 100644
--- a/metadata/md5-cache/net-libs/libosmo-dsp-9999
+++ b/metadata/md5-cache/net-libs/libosmo-dsp-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=GPL-2
 RDEPEND=sci-libs/fftw
 SLOT=0/9999
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=8b0f6c757f6700e63c590a9d8da37734
diff --git a/metadata/md5-cache/net-libs/libosmocore-9999 b/metadata/md5-cache/net-libs/libosmocore-9999
index 6de2dd9b3ebe..dae5cd9a9a11 100644
--- a/metadata/md5-cache/net-libs/libosmocore-9999
+++ b/metadata/md5-cache/net-libs/libosmocore-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://bb.osmocom.org/trac/wiki/libosmocore
 IUSE=embedded
 LICENSE=GPL-2 LGPL-3
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3916ad8405756769b60e38bb16e4ebea
diff --git a/metadata/md5-cache/net-libs/libqmi-9999 b/metadata/md5-cache/net-libs/libqmi-9999
index bf5e83e48c21..69ce8a41e35f 100644
--- a/metadata/md5-cache/net-libs/libqmi-9999
+++ b/metadata/md5-cache/net-libs/libqmi-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs test
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=ded14f42dbb4cc1d208ef7eb0ed929ca
diff --git a/metadata/md5-cache/net-libs/libsoup-2.40.3 b/metadata/md5-cache/net-libs/libsoup-2.40.3
index 408348e140ff..2fffdc1eb951 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.40.3
+++ b/metadata/md5-cache/net-libs/libsoup-2.40.3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.33.1:2 >=dev-libs/libxml2-2:2 >=net-libs/glib-networki
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=12ae44473a9a7ff1158fcc84dd8527df
+_md5_=e28e167d77f7d09beac9ba3a2d490276
diff --git a/metadata/md5-cache/net-libs/libsoup-2.42.1 b/metadata/md5-cache/net-libs/libsoup-2.42.1
index 2a02b9dbf389..c334b43295d7 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.42.1
+++ b/metadata/md5-cache/net-libs/libsoup-2.42.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2:2 dev-db/sqlite:3 >=net-li
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.42/libsoup-2.42.1.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=777e342f47b4131a68ef2369d0870115
+_md5_=f8071b83deedd245504a50c26b817cb3
diff --git a/metadata/md5-cache/net-libs/libsoup-2.42.2 b/metadata/md5-cache/net-libs/libsoup-2.42.2
index d47c7e433706..3219f6fbc2b2 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.42.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.42.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2:2 dev-db/sqlite:3 >=net-li
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.42/libsoup-2.42.2.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d287945b3e940a48c9b5ad6281f87067
+_md5_=6def2be35d3ef46346d0db2aa947097a
diff --git a/metadata/md5-cache/net-libs/libsoup-2.42.2-r1 b/metadata/md5-cache/net-libs/libsoup-2.42.2-r1
index 4f3e1550a2c9..95625c53948e 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.42.2-r1
+++ b/metadata/md5-cache/net-libs/libsoup-2.42.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2:2 dev-db/sqlite:3 >=net-li
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.42/libsoup-2.42.2.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	60f01dcce699345bbe95db0476914874	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=979a40d3890edd91ecbab0bf311ea25d
+_md5_=20f2a22fb95596af396405af8ab37994
diff --git a/metadata/md5-cache/net-libs/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index a1fa622cab4f..15224289bef5 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -7,5 +7,5 @@ IUSE=debug examples gcrypt pcap +sftp ssh1 server static-libs zlib
 LICENSE=LGPL-2.1
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.4 )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=946a03a3573887bc78916ca496f0e577
diff --git a/metadata/md5-cache/net-libs/nodejs-0.10.17 b/metadata/md5-cache/net-libs/nodejs-0.10.17
index baa28978c459..6297d7c62beb 100644
--- a/metadata/md5-cache/net-libs/nodejs-0.10.17
+++ b/metadata/md5-cache/net-libs/nodejs-0.10.17
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://nodejs.org/dist/v0.10.17/node-v0.10.17.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=f39fe91caf63e499470105576b710903
+_md5_=8ed7aa9fac6df443a933db24349ed458
diff --git a/metadata/md5-cache/net-libs/nodejs-0.10.18 b/metadata/md5-cache/net-libs/nodejs-0.10.18
index 6f3ccba755d8..aeb2817f4961 100644
--- a/metadata/md5-cache/net-libs/nodejs-0.10.18
+++ b/metadata/md5-cache/net-libs/nodejs-0.10.18
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://nodejs.org/dist/v0.10.18/node-v0.10.18.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=8f22df54772d798b47aa1bea241c19dd
+_md5_=5693e9662a3a0c5feb30c9d7da488ba3
diff --git a/metadata/md5-cache/net-libs/qtweetlib-9999 b/metadata/md5-cache/net-libs/qtweetlib-9999
index 5eca774e7451..e5e8baca6f7e 100644
--- a/metadata/md5-cache/net-libs/qtweetlib-9999
+++ b/metadata/md5-cache/net-libs/qtweetlib-9999
@@ -7,5 +7,5 @@ IUSE=debug
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/qjson-0.7.1 >=dev-qt/qtcore-4.6.0:4[ssl]
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47d4c7342319f61b95bab41455efc78c
diff --git a/metadata/md5-cache/net-libs/qxmpp-9999 b/metadata/md5-cache/net-libs/qxmpp-9999
index 7cf120b4e026..e05c256fb6de 100644
--- a/metadata/md5-cache/net-libs/qxmpp-9999
+++ b/metadata/md5-cache/net-libs/qxmpp-9999
@@ -7,5 +7,5 @@ IUSE=debug doc +speex test theora vpx
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:4 speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ff18ffadf3aa75b3e0ec6aca80e46e01
diff --git a/metadata/md5-cache/net-libs/rb_libtorrent-0.16.10 b/metadata/md5-cache/net-libs/rb_libtorrent-0.16.10
index e988e408e0b4..59d2535a56e3 100644
--- a/metadata/md5-cache/net-libs/rb_libtorrent-0.16.10
+++ b/metadata/md5-cache/net-libs/rb_libtorrent-0.16.10
@@ -4,11 +4,11 @@ DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
 EAPI=4
 HOMEPAGE=http://www.rasterbar.com/products/libtorrent/
 IUSE=debug doc examples python ssl static-libs
-KEYWORDS=amd64 arm ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.48[python?,threads(+)] >=sys-devel/libtool-2.2 sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[threads] =dev-lang/python-2.6*[threads] ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libtorrent.googlecode.com/files/libtorrent-rasterbar-0.16.10.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a8da92487731f43f1be9c8217b1bb744
+_md5_=f8b27229058e3754e721231e451c7a8b
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1 b/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
index 69d7143b90b8..1fd9eef05fd8 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.20.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.20.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e09e2e390a29da67dba599ec9c14a722
+_md5_=4247e0f11953cad2d4785c055f48e1da
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.20.3 b/metadata/md5-cache/net-libs/telepathy-glib-0.20.3
index e8ff2cdf936a..bd447ea59739 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.20.3
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.20.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) vala? ( in
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.20.3.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9b54bceb352dd37c5b06075c733b13ff
+_md5_=91816fcbb2443a1c6d2410beb2def038
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.20.4 b/metadata/md5-cache/net-libs/telepathy-glib-0.20.4
index 9a145cb6e11f..3eb46ce610d2 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.20.4
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.20.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 ) vala? ( in
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.20.4.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f4b8ab0f293c93dcabe6ae3fd03725ad
+_md5_=05f7c1bb5827c44fe389e418260ff842
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.3-r1 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.3-r1
index 2c8009b54cac..8648a51d8abb 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.9.3-r1
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.9.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=farsight? ( !farstream )
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.3.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5cae14483529f232e4517d7aac9ab1fe
+_md5_=e3a5b0bcae2e6eb8911925b35ac267b2
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300
index d4e9d387db1a..556edef81094 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.10.2-r300
@@ -11,4 +11,4 @@ REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-1.10.2.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=90138652250022618f82803165ddb218
+_md5_=9eb48addbaf363971048f7cf7f621985
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200
index 7bac335153a3..984db3ba8366 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r200
@@ -11,4 +11,4 @@ REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.3.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=aaacbae75579c5b77845559e17235e44
+_md5_=8227fa82a8446ced0ca72eefcaf9f14a
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201
index ceefb281c725..d341ae00840a 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r201
@@ -11,4 +11,4 @@ REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=2
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.3.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f7589efc66dc824bef440f8d2cefdb8d
+_md5_=32882b6cdf944cd469da8626977efd0f
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300 b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300
index d1fc1e90c239..19ae5cfeb0a6 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300
+++ b/metadata/md5-cache/net-libs/webkit-gtk-1.8.3-r300
@@ -11,4 +11,4 @@ REQUIRED_USE=introspection? ( geoloc gstreamer )
 SLOT=3
 SRC_URI=http://www.webkitgtk.org/releases/webkit-1.8.3.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6af02548d6e082a7a37147f2516d3e63
+_md5_=5ea2b184cf916676335814b6de3b20ae
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.0.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.0.4
index 8a836d9ae692..8b79fb9a0b42 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.0.4
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.0.4
@@ -11,4 +11,4 @@ REQUIRED_USE=geoloc? ( introspection ) introspection? ( gstreamer )
 SLOT=3/25
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.0.4.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3cfbaf6f57b679a298704afb814e7399
+_md5_=7ba93a81884273a869f8ef087b8dc48a
diff --git a/metadata/md5-cache/net-mail/Freemail-9999 b/metadata/md5-cache/net-mail/Freemail-9999
index 02a7d4a18277..7d9eb13c3e4a 100644
--- a/metadata/md5-cache/net-mail/Freemail-9999
+++ b/metadata/md5-cache/net-mail/Freemail-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/bcprov:0 net-p2p/freenet >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fdd21c44ee24d404a9079a9d3bba54e
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.5 b/metadata/md5-cache/net-mail/dovecot-2.2.5
index 1f465025c115..f49e5640ff97 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.5
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.5
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd zlib ssl
-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=LGPL-2.1 MIT
 RDEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.5.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.1.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.1.tar.gz )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ffd10d673f6568d4b81c53a34ddcded5
+_md5_=579b5c5e76626c428c7709cb4bfa2821
diff --git a/metadata/md5-cache/net-mail/getmail-4.36.0 b/metadata/md5-cache/net-mail/getmail-4.36.0
index 1f18b9ea361b..d7984d1977b1 100644
--- a/metadata/md5-cache/net-mail/getmail-4.36.0
+++ b/metadata/md5-cache/net-mail/getmail-4.36.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=4
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-4.36.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=16eb650771d763168ceb48ce50444ded
+_md5_=24df17c9ec24642d392657b95aa525b7
diff --git a/metadata/md5-cache/net-mail/getmail-4.39.1 b/metadata/md5-cache/net-mail/getmail-4.39.1
index 9823bf0d7bcc..1405005623c0 100644
--- a/metadata/md5-cache/net-mail/getmail-4.39.1
+++ b/metadata/md5-cache/net-mail/getmail-4.39.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=4
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-4.39.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=947eb42f517841adedbb8373b8a46018
+_md5_=5578878ece98300c642bfa589fe077b1
diff --git a/metadata/md5-cache/net-mail/getmail-4.40.1 b/metadata/md5-cache/net-mail/getmail-4.40.1
index a09f1fc5b680..6c7a9a62f2ce 100644
--- a/metadata/md5-cache/net-mail/getmail-4.40.1
+++ b/metadata/md5-cache/net-mail/getmail-4.40.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=4
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-4.40.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=578c60f47e49f2e304c4a76a819bedfd
+_md5_=c07b3fa9409ed45e2cddc336b6581262
diff --git a/metadata/md5-cache/net-mail/getmail-4.40.3 b/metadata/md5-cache/net-mail/getmail-4.40.3
index 83dd2dfc0160..92976c4945c6 100644
--- a/metadata/md5-cache/net-mail/getmail-4.40.3
+++ b/metadata/md5-cache/net-mail/getmail-4.40.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=4
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-4.40.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6cf209f438efae10a99e6ac1de52b175
+_md5_=faa1e0d27930a8a18806a9759c99df34
diff --git a/metadata/md5-cache/net-mail/getmail-4.41.0 b/metadata/md5-cache/net-mail/getmail-4.41.0
index 61544036fb76..fe0d4b299067 100644
--- a/metadata/md5-cache/net-mail/getmail-4.41.0
+++ b/metadata/md5-cache/net-mail/getmail-4.41.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=4
 SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-4.41.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1bcb814b7251619d63d545b2ed8a9e7a
+_md5_=baae2ec58a88aa5939a6b4e66023cfbf
diff --git a/metadata/md5-cache/net-mail/mpop-1.0.28 b/metadata/md5-cache/net-mail/mpop-1.0.28
index 51d8fda341c5..eb9762107419 100644
--- a/metadata/md5-cache/net-mail/mpop-1.0.28
+++ b/metadata/md5-cache/net-mail/mpop-1.0.28
@@ -11,4 +11,4 @@ REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mpop/mpop-1.0.28.tar.bz2
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=b3ab8c3926a971bf756d37872873c354
+_md5_=d98a27ac0704455cc98ef05a15d37001
diff --git a/metadata/md5-cache/net-misc/autoupnp-9999 b/metadata/md5-cache/net-misc/autoupnp-9999
index 607639618d79..8935e8e2db15 100644
--- a/metadata/md5-cache/net-misc/autoupnp-9999
+++ b/metadata/md5-cache/net-misc/autoupnp-9999
@@ -7,5 +7,5 @@ IUSE=libnotify
 LICENSE=BSD
 RDEPEND=net-libs/miniupnpc libnotify? ( x11-libs/libtinynotify )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=158d78ff309923783fa13ae8be816609
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.4 b/metadata/md5-cache/net-misc/bridge-utils-1.4
index 3d752044d827..702375bf3d16 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.4
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.4
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bridge/bridge-utils-1.4.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=35a6a68bc254015f8a451ab5d183432c
+_md5_=7166d598396bc630e87cfa5f9cb079ae
diff --git a/metadata/md5-cache/net-misc/bridge-utils-1.5 b/metadata/md5-cache/net-misc/bridge-utils-1.5
index 0aa3edbb6c4a..d893608cb9a3 100644
--- a/metadata/md5-cache/net-misc/bridge-utils-1.5
+++ b/metadata/md5-cache/net-misc/bridge-utils-1.5
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/bridge/bridge-utils-1.5.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=83d63286f37ef51d96e6c11ece0cd0f2
+_md5_=617f0451efe09cd9e211dc00e3142606
diff --git a/metadata/md5-cache/net-misc/clusterssh-9999 b/metadata/md5-cache/net-misc/clusterssh-9999
index 869df82ad056..a044e1db60da 100644
--- a/metadata/md5-cache/net-misc/clusterssh-9999
+++ b/metadata/md5-cache/net-misc/clusterssh-9999
@@ -7,5 +7,5 @@ IUSE=test
 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 x11-apps/xlsfonts x11-terms/xterm || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=39c19abedaef9232d93c039988ccbf30
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9999 b/metadata/md5-cache/net-misc/dhcpcd-9999
index bc660dc17aba..376fdcc4d797 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9999
+++ b/metadata/md5-cache/net-misc/dhcpcd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
 IUSE=elibc_glibc ipv6
 LICENSE=BSD-2
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1cb9819a2d08698737e7b44aaaf65e21
diff --git a/metadata/md5-cache/net-misc/flexget-9999 b/metadata/md5-cache/net-misc/flexget-9999
index 88eba03c0ff6..9bac1dc67b78 100644
--- a/metadata/md5-cache/net-misc/flexget-9999
+++ b/metadata/md5-cache/net-misc/flexget-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-python/feedparser-5.1.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] <dev-python/sqlalchemy-0.7.99 dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/beautifulsoup:python-2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/beautifulsoup-4.1:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] <dev-python/beautifulsoup-4.3:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/PyRSS2Gen[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pynzb[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/cherrypy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-tvrage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/requests-1.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] <dev-python/requests-1.99 dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] transmission? ( dev-python/transmissionrpc[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec07b5c0b2cf6e8460ae6a61d9526c52
diff --git a/metadata/md5-cache/net-misc/freerdp-9999.1 b/metadata/md5-cache/net-misc/freerdp-9999.1
index a30357b93b9b..d0961de8a8f6 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999.1
+++ b/metadata/md5-cache/net-misc/freerdp-9999.1
@@ -7,5 +7,5 @@ IUSE=alsa +channels +client cups debug directfb doc ffmpeg gstreamer jpeg pulsea
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( directfb? ( dev-libs/DirectFB ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 x11-libs/libXrandr ) jpeg? ( virtual/jpeg ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=1deaec20a102e84a0450af92733f1687
diff --git a/metadata/md5-cache/net-misc/gns3-0.8.4 b/metadata/md5-cache/net-misc/gns3-0.8.4
index 504e49d88832..2090953404e9 100644
--- a/metadata/md5-cache/net-misc/gns3-0.8.4
+++ b/metadata/md5-cache/net-misc/gns3-0.8.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gns-3/GNS3/0.8.4/GNS3-0.8.4-src.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cd70b2927f4fc4fd0616b7c9f1423e4c
+_md5_=9a338224af3ce1a458ceb909905166c4
diff --git a/metadata/md5-cache/net-misc/guidedog-1.1-r1 b/metadata/md5-cache/net-misc/guidedog-1.1-r1
index 5613b338a353..a858fb8a0e93 100644
--- a/metadata/md5-cache/net-misc/guidedog-1.1-r1
+++ b/metadata/md5-cache/net-misc/guidedog-1.1-r1
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_ta
 SLOT=4
 SRC_URI=http://www.simonzone.com/software/guidedog/guidedog-1.1.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f6a3661cadae331d10cda845e3692b3a
+_md5_=83e70fd011ee6aca40fc2fc9d03c0620
diff --git a/metadata/md5-cache/net-misc/hotot-9999 b/metadata/md5-cache/net-misc/hotot-9999
index 6ab10961d466..299355d67a53 100644
--- a/metadata/md5-cache/net-misc/hotot-9999
+++ b/metadata/md5-cache/net-misc/hotot-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] gtk? ( dev-python/pywebkitgtk ) qt4? ( dev-qt/qtwebkit:4 kde? ( kde-base/kdelibs ) )
 REQUIRED_USE=|| ( chrome gtk qt4 )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f83dc453f7e017f3cd290c7d6c603b7d
diff --git a/metadata/md5-cache/net-misc/httpie-0.3.0 b/metadata/md5-cache/net-misc/httpie-0.3.0
index df5401e36ddd..cbb0f46e8b4b 100644
--- a/metadata/md5-cache/net-misc/httpie-0.3.0
+++ b/metadata/md5-cache/net-misc/httpie-0.3.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b9ea0a87f8cd67c80f03cd89a7a98535
+_md5_=18f6dc83740185e6099f10104ac8ca04
diff --git a/metadata/md5-cache/net-misc/httpie-0.3.0-r1 b/metadata/md5-cache/net-misc/httpie-0.3.0-r1
index 1f96be506f07..bdf635409d53 100644
--- a/metadata/md5-cache/net-misc/httpie-0.3.0-r1
+++ b/metadata/md5-cache/net-misc/httpie-0.3.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.3.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9a6f15ca8594de7cf6745215e609ef87
+_md5_=5a57cca247b23c577d8a4530b9c26ea7
diff --git a/metadata/md5-cache/net-misc/httpie-0.3.1 b/metadata/md5-cache/net-misc/httpie-0.3.1
index c4ab116e2744..6cb6066a566e 100644
--- a/metadata/md5-cache/net-misc/httpie-0.3.1
+++ b/metadata/md5-cache/net-misc/httpie-0.3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.3.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8f80022ce24e52ce08701917300cf77b
+_md5_=3179607c0ca7a89a8ce64bbfa2ee764d
diff --git a/metadata/md5-cache/net-misc/httpie-0.4.1 b/metadata/md5-cache/net-misc/httpie-0.4.1
index 9eac4828336f..77553007e37f 100644
--- a/metadata/md5-cache/net-misc/httpie-0.4.1
+++ b/metadata/md5-cache/net-misc/httpie-0.4.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b59fbe3185dccd72275a8428c27f7677
+_md5_=8a535d5d5696ea35ebee3441ff3941ed
diff --git a/metadata/md5-cache/net-misc/httpie-0.5.1 b/metadata/md5-cache/net-misc/httpie-0.5.1
index eb0cc4efb5bc..a583c32a4e42 100644
--- a/metadata/md5-cache/net-misc/httpie-0.5.1
+++ b/metadata/md5-cache/net-misc/httpie-0.5.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=672fc2045a8a728a748a7a6c043acce1
+_md5_=6331d1405405629fd78d6e6b8fa1a8e4
diff --git a/metadata/md5-cache/net-misc/httpie-0.6.0 b/metadata/md5-cache/net-misc/httpie-0.6.0
index c8a721fcc0b8..df5905c0669d 100644
--- a/metadata/md5-cache/net-misc/httpie-0.6.0
+++ b/metadata/md5-cache/net-misc/httpie-0.6.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/h/httpie/httpie-0.6.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=59048fbcedf9c2b6da1c881d0a0ef1fe
+_md5_=06565b99e2ffdabde7c025fc4a360944
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.5-r2 b/metadata/md5-cache/net-misc/iperf-2.0.5-r2
new file mode 100644
index 000000000000..53ada18a1793
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-2.0.5-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
+EAPI=5
+HOMEPAGE=http://iperf.sourceforge.net/
+IUSE=ipv6 threads debug
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+LICENSE=HPND
+SLOT=0
+SRC_URI=mirror://sourceforge/iperf/iperf-2.0.5.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=be447c3a46ed4fb4c07c26480e53fde5
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index 2313be7df58f..221b055afb67 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -7,5 +7,5 @@ IUSE=caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static +filecaps
 LICENSE=BSD
 RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9a47d5b0d8dfcde37f2390b3ef13ffd9
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index 35519a2336b0..b3b0d7767666 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] dev-ruby/bsearch[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/memoize[ruby_targets_ruby19] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby19] dev-ruby/ruby-gtk2[ruby_targets_ruby19] dev-ruby/typed-array[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0c66433d1a2d759fa06dc87dc4d205b6
diff --git a/metadata/md5-cache/net-misc/minidlna-1.1.0-r3 b/metadata/md5-cache/net-misc/minidlna-1.1.0-r3
new file mode 100644
index 000000000000..97201be52ae0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/minidlna-1.1.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-db/sqlite media-libs/flac media-libs/libexif media-libs/libid3tag media-libs/libogg media-libs/libvorbis virtual/ffmpeg virtual/jpeg virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=DLNA/UPnP-AV compliant media server
+EAPI=4
+HOMEPAGE=http://minidlna.sourceforge.net/
+IUSE=netgear readynas
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD GPL-2
+RDEPEND=dev-db/sqlite media-libs/flac media-libs/libexif media-libs/libid3tag media-libs/libogg media-libs/libvorbis virtual/ffmpeg virtual/jpeg
+SLOT=0
+SRC_URI=mirror://sourceforge/minidlna/1.1.0/minidlna-1.1.0.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c57cc9afd6e9f532bf4bbd8caf554d81
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index 72a435b37b01..a7d1ea949dbb 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=520d6f9ffbdbd4e52fdd02a378cb88c6
diff --git a/metadata/md5-cache/net-misc/netctl-9999 b/metadata/md5-cache/net-misc/netctl-9999
index 20aa57deada2..f6d18132b865 100644
--- a/metadata/md5-cache/net-misc/netctl-9999
+++ b/metadata/md5-cache/net-misc/netctl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://wiki.archlinux.org/index.php/Netctl https://www.archlinux.org/p
 LICENSE=BSD
 RDEPEND=>=app-shells/bash-4.0 >=net-dns/openresolv-3.5.4-r1 sys-apps/iproute2 sys-apps/systemd !<net-misc/dhcpcd-5.6.7
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=0bfb5312ecbf15cf263b7f5f973ba53c
diff --git a/metadata/md5-cache/net-misc/netifrc-9999 b/metadata/md5-cache/net-misc/netifrc-9999
index 6d38202ddedc..1a4c64bd7178 100644
--- a/metadata/md5-cache/net-misc/netifrc-9999
+++ b/metadata/md5-cache/net-misc/netifrc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
 LICENSE=BSD-2
 RDEPEND=>=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e61b02b9509bfd8466672f9503b82c5f
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-9999 b/metadata/md5-cache/net-misc/npapi-sdk-9999
index 5213d1b6cb35..f9994d2d1e81 100644
--- a/metadata/md5-cache/net-misc/npapi-sdk-9999
+++ b/metadata/md5-cache/net-misc/npapi-sdk-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/npapi-sdk/
 LICENSE=MPL-1.1
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f67077cfa10d963f1481319748bef7fa
diff --git a/metadata/md5-cache/net-misc/openvpn-9999 b/metadata/md5-cache/net-misc/openvpn-9999
index 1a1f625c4761..f354ba2b529e 100644
--- a/metadata/md5-cache/net-misc/openvpn-9999
+++ b/metadata/md5-cache/net-misc/openvpn-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.1.0 ) ) lzo? ( >=dev-libs/lzo-1.07 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 REQUIRED_USE=static? ( !plugins !pkcs11 ) polarssl? ( ssl ) !plugins? ( !pam !down-root )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8cd5af2b4044be0ea0ee5dee11d759ec
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.3 b/metadata/md5-cache/net-misc/rabbitmq-server-3.1.3
index b296f318dc42..b87662297a5c 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.3
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.1.3
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.1.3/rabbitmq-server-3.1.3.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6b0b70e57a059bed0a06d2698c60edb1
+_md5_=86eaf848a5266b693c61ca4dcdaed577
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.4 b/metadata/md5-cache/net-misc/rabbitmq-server-3.1.4
index 37027ecfa853..1414ad30be72 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.4
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.1.4
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.1.4/rabbitmq-server-3.1.4.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4cd5968ba56e5d3fe9b02ee264a0b00f
+_md5_=1fec9fe087bbe4f39d81dbc9d2afb091
diff --git a/metadata/md5-cache/net-misc/remmina-9999 b/metadata/md5-cache/net-misc/remmina-9999
index a3d6b98262d4..7f9e3f6f585b 100644
--- a/metadata/md5-cache/net-misc/remmina-9999
+++ b/metadata/md5-cache/net-misc/remmina-9999
@@ -7,5 +7,5 @@ IUSE=ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.31.18:2 >=net-libs/libvncserver-0.9.8.2 x11-libs/libxkbfile avahi? ( net-dns/avahi[gtk3] ) ayatana? ( dev-libs/libappindicator ) crypt? ( dev-libs/libgcrypt ) freerdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) gnome-keyring? ( gnome-base/libgnome-keyring ) ssh? ( net-libs/libssh[sftp] ) telepathy? ( net-libs/telepathy-glib ) vte? ( x11-libs/vte:2.90 ) !net-misc/remmina-plugins
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ba62c10b8aedaef9efd889b54914764
diff --git a/metadata/md5-cache/net-misc/shigofumi-9999 b/metadata/md5-cache/net-misc/shigofumi-9999
index 173574375e95..f2857bdc1d21 100644
--- a/metadata/md5-cache/net-misc/shigofumi-9999
+++ b/metadata/md5-cache/net-misc/shigofumi-9999
@@ -7,5 +7,5 @@ IUSE=debug doc nls xattr
 LICENSE=GPL-3
 RDEPEND=dev-libs/confuse dev-libs/libxml2 sys-libs/readline >=net-libs/libisds-0.7
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7c66d016158ddf77280f8ee8cc5014d0
diff --git a/metadata/md5-cache/net-misc/tor-0.2.4.15_rc b/metadata/md5-cache/net-misc/tor-0.2.4.17_rc
similarity index 85%
rename from metadata/md5-cache/net-misc/tor-0.2.4.15_rc
rename to metadata/md5-cache/net-misc/tor-0.2.4.17_rc
index efde78aa19ec..aae181f9f9e3 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.4.15_rc
+++ b/metadata/md5-cache/net-misc/tor-0.2.4.17_rc
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=dev-libs/openssl sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.2.4.15-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.4.15-rc.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.2.4.17-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.4.17-rc.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=629a2e9947d81bcedf2413d2a1627f18
+_md5_=186a8055b42cb61d91b95480352cb1c9
diff --git a/metadata/md5-cache/net-misc/youtube-viewer-9999 b/metadata/md5-cache/net-misc/youtube-viewer-9999
index 93c30906e7f3..8794e36a48ec 100644
--- a/metadata/md5-cache/net-misc/youtube-viewer-9999
+++ b/metadata/md5-cache/net-misc/youtube-viewer-9999
@@ -7,5 +7,5 @@ IUSE=gtk
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-lang/perl-5.16.0 dev-perl/Data-Dump dev-perl/libwww-perl || ( media-video/mplayer[X,network] media-video/mplayer2[X,network] ) virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor gtk? ( >=dev-perl/gtk2-perl-1.244.0 !net-misc/gtk-youtube-viewer virtual/freedesktop-icon-theme x11-libs/gdk-pixbuf:2[X,jpeg] ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b19f591182908dd799bf598a72c815b0
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.35 b/metadata/md5-cache/net-nds/openldap-2.4.35
index 4423821de04f..8ac8abc2fef3 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.35
+++ b/metadata/md5-cache/net-nds/openldap-2.4.35
@@ -4,11 +4,11 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
 IUSE=crypt icu samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux smbkrb5passwd kerberos -cxx ssl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=OPENLDAP
 RDEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.35.tgz mirror://gentoo/rfc2307bis.schema-20120525
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9ec1f668b2c68e99ed027e8cb329e341
+_md5_=aceac6daae652cae30d02b4b3e698b52
diff --git a/metadata/md5-cache/net-nds/portmap-9999 b/metadata/md5-cache/net-nds/portmap-9999
index b3aa7bb1cead..1046c9d4e96d 100644
--- a/metadata/md5-cache/net-nds/portmap-9999
+++ b/metadata/md5-cache/net-nds/portmap-9999
@@ -6,5 +6,5 @@ IUSE=selinux tcpd
 LICENSE=BSD GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-portmap ) tcpd? ( >=sys-apps/tcp-wrappers-7.6-r7 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2f9e266cfda30b1427e3be78e1bd0341
diff --git a/metadata/md5-cache/net-nds/rpcbind-9999 b/metadata/md5-cache/net-nds/rpcbind-9999
index 6425243df5ee..7dbebf9fec87 100644
--- a/metadata/md5-cache/net-nds/rpcbind-9999
+++ b/metadata/md5-cache/net-nds/rpcbind-9999
@@ -7,5 +7,5 @@ IUSE=selinux tcpd
 LICENSE=BSD
 RDEPEND=net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=4a42e4ad218175cd8597ec25f1b70d1e
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.3-r1 b/metadata/md5-cache/net-nntp/inn-2.5.3-r1
index ff7208f4a3c8..2d85ed48955f 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.3-r1
+++ b/metadata/md5-cache/net-nntp/inn-2.5.3-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/mta dev-perl/MIME-tools sys-libs/pam sys-libs/zlib kerberos? ( v
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b3ad473b388714c3c1e66bf609be0bfa
+_md5_=f42aebe6822f4b81e06a75d4175d6e37
diff --git a/metadata/md5-cache/net-nntp/inn-2.5.3-r2 b/metadata/md5-cache/net-nntp/inn-2.5.3-r2
index 4f244b26b091..0d47668c357e 100644
--- a/metadata/md5-cache/net-nntp/inn-2.5.3-r2
+++ b/metadata/md5-cache/net-nntp/inn-2.5.3-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/inn/inn-2.5.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2f78bf4fb0fd0f8cb32b979c9d71528f
+_md5_=f452f97ca35f27da16ea53b9f45cfcb8
diff --git a/metadata/md5-cache/net-nntp/nzbget-12.0_pre808 b/metadata/md5-cache/net-nntp/nzbget-12.0_pre808
new file mode 100644
index 000000000000..088dd7ad858f
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/nzbget-12.0_pre808
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A command-line based binary newsgrapper supporting .nzb files
+EAPI=5
+HOMEPAGE=http://nzbget.sourceforge.net/
+IUSE=debug gnutls ncurses parcheck ssl zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/nzbget/nzbget-12.0-testing-r808.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cbe0e0c5ad6204deeee85853e9314ea7
diff --git a/metadata/md5-cache/net-nntp/pan-9999 b/metadata/md5-cache/net-nntp/pan-9999
index e67e814d7b4e..244310ef37b2 100644
--- a/metadata/md5-cache/net-nntp/pan-9999
+++ b/metadata/md5-cache/net-nntp/pan-9999
@@ -7,5 +7,5 @@ IUSE=dbus gnome-keyring libnotify spell ssl
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.6 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3 )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=ae8c8e5fb480b2ab664ce9e6692c3e97
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.6 b/metadata/md5-cache/net-p2p/deluge-1.3.6
index 89cd6c293dc8..7b1a1b357caf 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.6
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=BitTorrent client with a client/server model.
 EAPI=3
 HOMEPAGE=http://deluge-torrent.org/
 IUSE=geoip gtk libnotify setproctitle sound webinterface
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-util/intltool dev-python/chardet dev-python/pyopenssl dev-python/pyxdg || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-core-8.1 >=dev-python/twisted-web-8.1 geoip? ( dev-libs/geoip ) gtk? ( sound? ( dev-python/pygame ) dev-python/pygobject:2 >=dev-python/pygtk-2.12 gnome-base/librsvg libnotify? ( dev-python/notify-python ) ) setproctitle? ( dev-python/setproctitle ) webinterface? ( dev-python/mako ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.6.tar.bz2
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d0d3132c54c0700c8a7e5ab2ba332177
+_md5_=88b9f1e3d074670338d15eb358b65601
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index ff7913e398a8..95a4c591cefa 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -7,5 +7,5 @@ IUSE=geoip gtk libnotify setproctitle webinterface
 LICENSE=GPL-2
 RDEPEND=>=net-libs/rb_libtorrent-0.14.9[python] dev-python/setuptools dev-python/chardet dev-python/pyopenssl dev-python/pyxdg || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) >=dev-python/twisted-core-8.1 >=dev-python/twisted-web-8.1 geoip? ( dev-libs/geoip ) gtk? ( dev-python/pygame dev-python/pygobject:2 >=dev-python/pygtk-2.12 gnome-base/librsvg libnotify? ( dev-python/notify-python ) ) setproctitle? ( dev-python/setproctitle ) webinterface? ( dev-python/mako ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=c24e551796cda157ff7626b93f76db9b
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
index a922afba6d68..c7188084200c 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3
 RDEPEND=app-arch/bzip2 >=dev-libs/boost-1.38 >=dev-libs/openssl-0.9.8 sys-apps/attr sys-devel/gettext sys-libs/zlib virtual/libiconv idn? ( net-dns/libidn ) lua? ( >=dev-lang/lua-5.1 ) pcre? ( >=dev-libs/libpcre-4.2 ) upnp? ( >=net-libs/miniupnpc-1.6 ) cli? ( >=dev-lang/perl-5.10 perl-core/Getopt-Long dev-perl/Data-Dump dev-perl/Term-ShellUI json? ( dev-perl/JSON-RPC ) xmlrpc? ( dev-perl/RPC-XML ) ) daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) ) gtk? ( x11-libs/pango x11-libs/gtk+:3 >=dev-libs/glib-2.24:2 x11-themes/hicolor-icon-theme libcanberra? ( media-libs/libcanberra ) libnotify? ( >=x11-libs/libnotify-0.4.1 ) ) qt4? ( >=dev-qt/qtgui-4.6.0:4 dbus? ( >=dev-qt/qtdbus-4.6.0:4 ) javascript? ( dev-qt/qtscript:4 x11-libs/qtscriptgenerator ) spell? ( app-text/aspell ) sqlite? ( dev-qt/qtsql:4[sqlite] ) )
 REQUIRED_USE=cli? ( ^^ ( json xmlrpc ) ) emoticons? ( || ( gtk qt4 ) ) dbus? ( qt4 ) javascript? ( qt4 ) json? ( !xmlrpc ) libcanberra? ( gtk ) libnotify? ( gtk ) spell? ( qt4 ) sound? ( || ( gtk qt4 ) ) sqlite? ( qt4 )
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=11761957afabeec19881d9a2e6870ed8
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.3 b/metadata/md5-cache/net-p2p/mldonkey-3.1.3
index 8ec929d8438e..1078bc66b426 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.3
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=MLDonkey is a multi-network P2P application written in Ocaml, coming
 EAPI=2
 HOMEPAGE=http://mldonkey.sourceforge.net/
 IUSE=bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.1.3.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=95860a0bf92562ed9f979be859695e8d
+_md5_=beca0c2475d1d9bfa8fc63c79ef2aa43
diff --git a/metadata/md5-cache/net-p2p/ncdc-9999 b/metadata/md5-cache/net-p2p/ncdc-9999
index 5f517f32c503..3eadc9c9fa15 100644
--- a/metadata/md5-cache/net-p2p/ncdc-9999
+++ b/metadata/md5-cache/net-p2p/ncdc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://dev.yorhel.nl/ncdc
 LICENSE=MIT
 RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls sys-libs/ncurses:5[unicode] sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=90a8a7ef53140ff12d4d2d534bc8c009
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-9999 b/metadata/md5-cache/net-p2p/pybitmessage-9999
index 37ebe340d310..3c37ced2dc81 100644
--- a/metadata/md5-cache/net-p2p/pybitmessage-9999
+++ b/metadata/md5-cache/net-p2p/pybitmessage-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/openssl[-bindist] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1510f12e115aaa5e57d037e90aa1db9
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-3.0.11 b/metadata/md5-cache/net-p2p/qbittorrent-3.0.11
index 3cc421ccb13b..edca67afccba 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-3.0.11
+++ b/metadata/md5-cache/net-p2p/qbittorrent-3.0.11
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/boost dev-qt/qtcore:4 >=net-libs/rb_libtorrent-0.16.3 X? ( dev-
 SLOT=0
 SRC_URI=mirror://sourceforge/qbittorrent/qbittorrent-3.0.11.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c1fb674c15d67465c7f5f4a3a1d2f82e
+_md5_=c3eb4c79b26b3fcc057ec190f8ee21df
diff --git a/metadata/md5-cache/net-p2p/qbittorrent-9999 b/metadata/md5-cache/net-p2p/qbittorrent-9999
index 0c13f59be5dc..ce1f33a4f49a 100644
--- a/metadata/md5-cache/net-p2p/qbittorrent-9999
+++ b/metadata/md5-cache/net-p2p/qbittorrent-9999
@@ -7,5 +7,5 @@ IUSE=dbus +X geoip python_targets_python2_6 python_targets_python2_7
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost dev-qt/qtcore:4 net-libs/rb_libtorrent X? ( dev-qt/qtgui:4 ) dbus? ( dev-qt/qtdbus:4 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] geoip? ( dev-libs/geoip )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d28d9b7a2cf805456f40ec9b1a9746db
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4ff31aaf40c882e8264810200749f361
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.1 b/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.1
index 220bf3bf1592..1dd11e75675e 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.1
+++ b/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.1
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/fagga/transmission-remote-cli/archive/v1.6.1.tar.gz -> transmission-remote-cli-1.6.1.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=4f2951db541be616a874cedb8821e84f
+_md5_=b44af169bdec962d6573289dad68ca21
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2 b/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2
index 1298c07b8ca3..8ac389ee7997 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2
+++ b/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/fagga/transmission-remote-cli/archive/v1.6.2.tar.gz -> transmission-remote-cli-1.6.2.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=43fda5ef79e30d2cf43429189b124790
+_md5_=1d8867da47274437ef43199441595ea8
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2-r1 b/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2-r1
index 4fbcf800e9df..337115c28b1f 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2-r1
+++ b/metadata/md5-cache/net-p2p/transmission-remote-cli-1.6.2-r1
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/fagga/transmission-remote-cli/archive/v1.6.2.tar.gz -> transmission-remote-cli-1.6.2.tar.gz
 _eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=22be530431de35f6e36f1db209ff9485
+_md5_=604bd907f72a23df5953842459c83da9
diff --git a/metadata/md5-cache/net-print/cups-1.6.3-r2 b/metadata/md5-cache/net-print/cups-1.6.3-r2
index 9fa443c0a2d1..8b5014e6a2b3 100644
--- a/metadata/md5-cache/net-print/cups-1.6.3-r2
+++ b/metadata/md5-cache/net-print/cups-1.6.3-r2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/1.6.3/cups-1.6.3-source.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=af637622c14a3b750ccab397f3860d9e
+_md5_=e55994f0e0c5e67b86eb241760c3ee23
diff --git a/metadata/md5-cache/net-print/cups-1.6.9999 b/metadata/md5-cache/net-print/cups-1.6.9999
index a2be6d474c5f..74b563f52be8 100644
--- a/metadata/md5-cache/net-print/cups-1.6.9999
+++ b/metadata/md5-cache/net-print/cups-1.6.9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=gnutls? ( ssl ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e7e858e41e5cd71009da9644c30c006d
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=eb834db2033fb1c50e1044e176b9b3ca
diff --git a/metadata/md5-cache/net-print/cups-1.7_rc1 b/metadata/md5-cache/net-print/cups-1.7_rc1
index ad2c81b062e0..bdfaff290a87 100644
--- a/metadata/md5-cache/net-print/cups-1.7_rc1
+++ b/metadata/md5-cache/net-print/cups-1.7_rc1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/1.7rc1/cups-1.7rc1-source.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6ca1ddacb0661f78484b40357bb469e2
+_md5_=829c8b3da1468d435135a8d19c2f1a79
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 369e1edffc01..6f25f8a503fb 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=gnutls? ( ssl ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f109d035b99bd78137298a1f6f6fc087
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b2ac19841324018ff534f0c77c9a4705
diff --git a/metadata/md5-cache/net-print/foomatic-db-3.0.20060720 b/metadata/md5-cache/net-print/foomatic-db-3.0.20060720
deleted file mode 100644
index f17cf94e7d36..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-3.0.20060720
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine
-SLOT=0
-SRC_URI=http://gentooexperimental.org/~genstef/dist/foomatic-db-3.0-20060720.tar.gz http://linuxprinting.org/download/foomatic/foomatic-db-3.0-20060720.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f403f652a0711fb91ee83db854fa5ddf
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20110506 b/metadata/md5-cache/net-print/foomatic-db-4.0.20110506
deleted file mode 100644
index 315d5f2d9e5c..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20110506
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=4
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20110506.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f06f57125a6fcb0dc7e66953aa6716f3
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20120117 b/metadata/md5-cache/net-print/foomatic-db-4.0.20120117
deleted file mode 100644
index a92f93ff0dc1..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20120117
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=4
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20120117.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8cbd3c4112f9187730796a8f2eb52d37
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.7 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.7
deleted file mode 100644
index 7f256a70f78d..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-print/cups || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Generates ppds out of xml foomatic printer description files
-EAPI=2
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-PDEPEND=net-print/foomatic-db
-RDEPEND=dev-libs/libxml2 net-print/foomatic-filters || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-4.0.7.tar.gz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-app	20b0a51a72b6d2c8ac53ccab1605737f	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=42ff9883409a6e03d04443bb5552eaac
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20110506 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20110506
deleted file mode 100644
index 3d63adc36e75..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20110506
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=4
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://gentooexperimental.org/~genstef/dist/foomatic-db-4.0-20110506.tar.gz http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20110506.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7022a3e25f17eafc7b012483a15ecb8c
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20120117-r1 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20120117-r1
deleted file mode 100644
index a90c0cdcb79f..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20120117-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=4
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/foomatic-db-4.0-20120117.tar.gz http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20120117.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a404e26a60c20cb7a1232afed69b52e4
diff --git a/metadata/md5-cache/net-proxy/haproxy-9999 b/metadata/md5-cache/net-proxy/haproxy-9999
index 5bbc3c133e8e..7ec64c02365d 100644
--- a/metadata/md5-cache/net-proxy/haproxy-9999
+++ b/metadata/md5-cache/net-proxy/haproxy-9999
@@ -7,5 +7,5 @@ IUSE=+crypt examples +pcre ssl vim-syntax +zlib
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl[zlib?] ) zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=84d97929458cddaf3299154337f41c99
diff --git a/metadata/md5-cache/net-proxy/polipo-9999 b/metadata/md5-cache/net-proxy/polipo-9999
index 063d0908fcfa..e9c204148547 100644
--- a/metadata/md5-cache/net-proxy/polipo-9999
+++ b/metadata/md5-cache/net-proxy/polipo-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.pps.jussieu.fr/~jch/software/polipo/
 LICENSE=MIT GPL-2
 RDEPEND=sys-apps/texinfo
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a9763acaa0185ac55548cd3c9d684def
diff --git a/metadata/md5-cache/net-voip/homer-9999 b/metadata/md5-cache/net-voip/homer-9999
index a0585320c5f7..b6d19e48fdf7 100644
--- a/metadata/md5-cache/net-voip/homer-9999
+++ b/metadata/md5-cache/net-voip/homer-9999
@@ -7,5 +7,5 @@ IUSE=pulseaudio
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-1.0 media-libs/alsa-lib media-libs/libsdl[X,audio,video,alsa] media-libs/portaudio[alsa] media-libs/sdl-mixer media-libs/sdl-sound media-libs/x264:* media-video/ffmpeg:0[X] net-libs/sofia-sip dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtmultimedia:4 dev-qt/qtwebkit:4 pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=19cc87632c890b9d2eb0e5679b8827d3
diff --git a/metadata/md5-cache/net-voip/telepathy-gabble-0.16.4 b/metadata/md5-cache/net-voip/telepathy-gabble-0.16.4
index ef1bd916960d..36a14ae6aafa 100644
--- a/metadata/md5-cache/net-voip/telepathy-gabble-0.16.4
+++ b/metadata/md5-cache/net-voip/telepathy-gabble-0.16.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.30:2 >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.82 >
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.16.4.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9c4b8a912d4a924710943d2777ef0d56
+_md5_=bdb3b1a24b13b01c5668333b20d1a06f
diff --git a/metadata/md5-cache/net-voip/telepathy-gabble-0.16.6 b/metadata/md5-cache/net-voip/telepathy-gabble-0.16.6
index ec69239fc154..3e0b9d27bd66 100644
--- a/metadata/md5-cache/net-voip/telepathy-gabble-0.16.6
+++ b/metadata/md5-cache/net-voip/telepathy-gabble-0.16.6
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.30:2 >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.82 >
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.16.6.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=35764784ca8b25601f324b25cee02135
+_md5_=7b123009d23b809150aff92e89e02b72
diff --git a/metadata/md5-cache/net-voip/telepathy-haze-0.7.0 b/metadata/md5-cache/net-voip/telepathy-haze-0.7.0
index f4db4296c6d7..a47d7e2076c8 100644
--- a/metadata/md5-cache/net-voip/telepathy-haze-0.7.0
+++ b/metadata/md5-cache/net-voip/telepathy-haze-0.7.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-0.7.0.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a299169c61b39f226473f2f6b545617f
+_md5_=73361ada23020680f1e012c1c69002cb
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1
index 9e54a2c285d3..924b4b120e3b 100644
--- a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1
+++ b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cdfb11ed085ecc0c167181102917def4
+_md5_=7fade8660c455834d4b877ff0e2a665a
diff --git a/metadata/md5-cache/net-wireless/dump1090-9999 b/metadata/md5-cache/net-wireless/dump1090-9999
index 961ea64a0cc9..c0b1a834ba19 100644
--- a/metadata/md5-cache/net-wireless/dump1090-9999
+++ b/metadata/md5-cache/net-wireless/dump1090-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/antirez/dump1090
 LICENSE=BSD
 RDEPEND=net-wireless/rtl-sdr
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=a565abd07d2c69cb5292a99c5f873dcc
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 2299e578a600..4257138322f8 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -7,5 +7,5 @@ IUSE=alsa doc examples fcd filter grc jack oss performance-counters portaudio qt
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/orc-0.4.12 dev-libs/boost:0= !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/cheetah dev-util/cppunit sci-libs/fftw:3.0 fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib ) grc? ( dev-python/lxml dev-python/numpy dev-python/pygtk:2 ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) qt4? ( dev-python/PyQt4[X,opengl] dev-python/pyqwt:5 dev-qt/qtgui:4 ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1 ) wavelet? ( sci-libs/gsl ) wxwidgets? ( dev-python/wxpython:2.8 dev-python/numpy ) =dev-lang/python-2*
 SLOT=0/9999
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e4a8a866dfa9f0e0f46fde8be5aef124
diff --git a/metadata/md5-cache/net-wireless/gr-baz-9999 b/metadata/md5-cache/net-wireless/gr-baz-9999
index 025f00a45b95..e9286f07ef5e 100644
--- a/metadata/md5-cache/net-wireless/gr-baz-9999
+++ b/metadata/md5-cache/net-wireless/gr-baz-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://wiki.spench.net/wiki/Gr-baz
 LICENSE=GPL-3
 RDEPEND=net-wireless/gnuradio =dev-lang/python-2*
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=e7680afc683a19837f0a8c1d7bf767db
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-9999 b/metadata/md5-cache/net-wireless/gr-iqbal-9999
index 248bf31cc34f..db01517081dd 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-9999
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://git.osmocom.org/gr-iqbal/
 LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0= net-libs/libosmo-dsp:= =dev-lang/python-2*
 SLOT=0/9999
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed8a4837149ff09cc5c6ab0269680a9b
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 3a7620830f5b..a8ac2971adad 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -7,5 +7,5 @@ IUSE=fcd hackrf iqbalance mirisdr python rtlsdr uhd
 LICENSE=GPL-3
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[fcd?] hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:= ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) uhd? ( net-wireless/uhd:= ) python? ( =dev-lang/python-2* )
 SLOT=0/9999
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb95c2daf9266d14654277858afb984c
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-9999 b/metadata/md5-cache/net-wireless/hackrf-tools-9999
index 66c9cacfdc60..f4f834d77089 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-9999
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://greatscottgadgets.com/hackrf/
 LICENSE=BSD
 RDEPEND=virtual/libusb:1 net-libs/libhackrf:=
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dfe2b01bb213008253f27e602696022d
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 16378c543b4e..9e39ba335acd 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -7,5 +7,5 @@ IUSE=+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-
 LICENSE=GPL-2
 RDEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 || ( <net-libs/libpcap-1.4.0[-netlink] >=net-libs/libpcap-1.4.0 ) ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses ) !arm? ( speech? ( app-accessibility/flite ) ) ruby? ( dev-lang/ruby ) plugin-btscan? ( net-wireless/bluez ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools )
 SLOT=0/9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd296c18bb9ddc9130e4e19b83906089
diff --git a/metadata/md5-cache/net-wireless/kismet-ubertooth-9999 b/metadata/md5-cache/net-wireless/kismet-ubertooth-9999
index e793698998e8..7c8d0b0e9606 100644
--- a/metadata/md5-cache/net-wireless/kismet-ubertooth-9999
+++ b/metadata/md5-cache/net-wireless/kismet-ubertooth-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://ubertooth.sourceforge.net/
 LICENSE=GPL-2
 RDEPEND=>=net-wireless/kismet-2011.03.2-r1:= =net-wireless/ubertooth-9999 =net-libs/libbtbb-9999 virtual/libusb:1
 SLOT=0/9999
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=d7809a252e32503e9553ddde85f36a2d
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index efc98d9f91ad..9c5c3fe8b7e4 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -7,5 +7,5 @@ IUSE=python ruby elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
 LICENSE=GPL-2
 RDEPEND=ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) dev-libs/libnl net-libs/libpcap python? ( =dev-lang/python-2* )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2d596ae0296547d69da1c738bb4b207c
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999
index 7a0123e230b1..3aec3f4b1405 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-9999
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=65a30f763e08bb1a57ee7efbbedc6dce
diff --git a/metadata/md5-cache/net-wireless/spectools-9999 b/metadata/md5-cache/net-wireless/spectools-9999
index 104ce0bf9647..401b0825195c 100644
--- a/metadata/md5-cache/net-wireless/spectools-9999
+++ b/metadata/md5-cache/net-wireless/spectools-9999
@@ -7,5 +7,5 @@ IUSE=debug ncurses gtk
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de
 _md5_=a9db26972025870b8e82ab425a92ceee
diff --git a/metadata/md5-cache/net-wireless/ubertooth-9999 b/metadata/md5-cache/net-wireless/ubertooth-9999
index a5d1a0351467..0e2eb539b915 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-9999
+++ b/metadata/md5-cache/net-wireless/ubertooth-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=clock_debug? ( net-wireless/bluez ) specan? ( virtual/libusb:1 >=dev-qt/qtgui-4.7.2:4 >=dev-python/pyside-1.0.2 >=dev-python/numpy-1.3 >=dev-python/pyusb-1.0.0_alpha1 ) dfu? ( virtual/libusb:1 >=dev-python/pyusb-1.0.0_alpha1 ) =net-libs/libbtbb-9999 python? ( =dev-lang/python-2* )
 REQUIRED_USE=dfu? ( python ) specan? ( python ) ubertooth0-firmware? ( dfu ) ubertooth1-firmware? ( dfu ) python? ( || ( dfu specan ) )
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=ff17f0f4478990f3a9fa9ce14cbd7ed9
diff --git a/metadata/md5-cache/net-zope/zope-fixers-1.0-r1 b/metadata/md5-cache/net-zope/zope-fixers-1.0-r1
index 6d54b13bf801..24f3ba5365a3 100644
--- a/metadata/md5-cache/net-zope/zope-fixers-1.0-r1
+++ b/metadata/md5-cache/net-zope/zope-fixers-1.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.fixers/zope.fixers-1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=70b121e76e93c6c607dc8bfc9bd8a075
+_md5_=51e117deab4541e9ceb2b7a2fce0d928
diff --git a/metadata/md5-cache/net-zope/zope-fixers-1.1.2 b/metadata/md5-cache/net-zope/zope-fixers-1.1.2
index 6676f6f39dbe..694cb47c1482 100644
--- a/metadata/md5-cache/net-zope/zope-fixers-1.1.2
+++ b/metadata/md5-cache/net-zope/zope-fixers-1.1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.fixers/zope.fixers-1.1.2.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ed0a2c850d042a7be181646c5ae27f5a
+_md5_=cbff0d1294fa4139498c084f410dc05c
diff --git a/metadata/md5-cache/net-zope/zope-interface-4.0.5 b/metadata/md5-cache/net-zope/zope-interface-4.0.5
index 4bb07f7ffde6..8b9541b3bd94 100644
--- a/metadata/md5-cache/net-zope/zope-interface-4.0.5
+++ b/metadata/md5-cache/net-zope/zope-interface-4.0.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.0.5.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bd5cff618dcb4d53614d66663bd1fbc5
+_md5_=a0492b0b4691324fe215ab4a49922333
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1
index 8543660620da..d642c7e3ff30 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyephem/pyephem-3.7.5.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4fa72a4d598501119f905519ad4c40f4
+_md5_=d0469963cefcaa3ea75ec24cd07c1e1f
diff --git a/metadata/md5-cache/sci-biology/bioperl-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-9999-r1
index ef60508509b9..9a78b6e6cb4c 100644
--- a/metadata/md5-cache/sci-biology/bioperl-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-9999-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 PDEPEND=!minimal? ( dev-perl/Bio-ASN1-EntrezGene ) db? ( >=sci-biology/bioperl-db-9999 ) network? ( >=sci-biology/bioperl-network-9999 ) run? ( >=sci-biology/bioperl-run-9999 )
 RDEPEND=dev-perl/Data-Stag dev-perl/libwww-perl !minimal? ( dev-perl/Ace dev-perl/Bio-ASN1-EntrezGene dev-perl/Spreadsheet-ParseExcel dev-perl/Spreadsheet-WriteExcel >=dev-perl/XML-SAX-0.15 dev-perl/Graph dev-perl/SOAP-Lite dev-perl/Array-Compare dev-perl/SVG dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-Twig >=dev-perl/HTML-Parser-3.60 >=dev-perl/XML-Writer-0.4 dev-perl/Clone dev-perl/XML-DOM dev-perl/set-scalar dev-perl/XML-XPath dev-perl/XML-DOM-XPath dev-perl/Algorithm-Munkres dev-perl/Data-Stag dev-perl/Math-Random dev-perl/PostScript dev-perl/Convert-Binary-C dev-perl/SVG-Graph ) graphviz? ( dev-perl/GraphViz ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9277e8bf7016168365dfd7a32ab7b926
diff --git a/metadata/md5-cache/sci-biology/bioperl-db-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-db-9999-r1
index 178670931cb5..1cc6b514b0d9 100644
--- a/metadata/md5-cache/sci-biology/bioperl-db-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-db-9999-r1
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.bioperl.org/
 LICENSE=Artistic GPL-2
 RDEPEND=>=sci-biology/bioperl-9999 dev-perl/DBI sci-biology/biosql || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=28ad234fd805abdc123be71b72077a85
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
index a196dde48f4e..0bd30f44ec7a 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-network-9999-r1
@@ -7,5 +7,5 @@ IUSE=test
 LICENSE=Artistic GPL-2
 RDEPEND=>=sci-biology/bioperl-9999 >=dev-perl/Graph-0.86 || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3dcdb18271877b46975854bac4b03175
diff --git a/metadata/md5-cache/sci-biology/bioperl-run-9999-r1 b/metadata/md5-cache/sci-biology/bioperl-run-9999-r1
index ffd1bf286868..bead9c9375b3 100644
--- a/metadata/md5-cache/sci-biology/bioperl-run-9999-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-run-9999-r1
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=>=sci-biology/bioperl-9999 !minimal? ( dev-perl/Algorithm-Diff dev-perl/XML-Twig dev-perl/IO-String dev-perl/IPC-Run ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 RESTRICT=test
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b42321ee8d6e3b0fd31b29a7b93eba52
diff --git a/metadata/md5-cache/sci-biology/bioruby-9999 b/metadata/md5-cache/sci-biology/bioruby-9999
index 2c286488311a..0562bd2cb3bd 100644
--- a/metadata/md5-cache/sci-biology/bioruby-9999
+++ b/metadata/md5-cache/sci-biology/bioruby-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.bioruby.org/
 LICENSE=Ruby
 RDEPEND==dev-lang/ruby-1.8*
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	ruby	d0d4dafe867eb79ce8953e27d88fc00f	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=40517431f71e0c8451c484ca1559d3d8
diff --git a/metadata/md5-cache/sci-biology/gatk-9999 b/metadata/md5-cache/sci-biology/gatk-9999
index b6f714aa5b88..8ae54ccd1d73 100644
--- a/metadata/md5-cache/sci-biology/gatk-9999
+++ b/metadata/md5-cache/sci-biology/gatk-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f7bbf9a654ffda9c7c3058c638d4db24
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.2.3 b/metadata/md5-cache/sci-biology/shrimp-2.2.3
index c7effd8a6e3b..8ea9067b50bb 100644
--- a/metadata/md5-cache/sci-biology/shrimp-2.2.3
+++ b/metadata/md5-cache/sci-biology/shrimp-2.2.3
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_2_3.src.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=31fb87281e0b221dc5f7fbaa20fd1ce8
+_md5_=c847052f5b90798c76780e737a1a6703
diff --git a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1 b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
index 7bd9d5bedbf4..f512f970fd6c 100644
--- a/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
+++ b/metadata/md5-cache/sci-biology/vienna-rna-2.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.tbi.univie.ac.at/~ronny/RNA/ViennaRNA-2.1.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3cd8b651a4600fe1bf9cd65a284b20a8
+_md5_=f2115af340d3da383864f5ea72df9f0f
diff --git a/metadata/md5-cache/sci-chemistry/ball-1.4.1-r1 b/metadata/md5-cache/sci-chemistry/ball-1.4.1-r1
index be6fea9e4c91..94e6c553efd7 100644
--- a/metadata/md5-cache/sci-chemistry/ball-1.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/ball-1.4.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/ball-1.4.1.tar.gz
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cfdaba84ae118244c182e8383964de6a
+_md5_=be6c503753a1495e813ecd7e76f84f7e
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318
index a8e90efbf019..4b06d620a339 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-130318.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9c04b478144e25976da1d8bf7bc960dc
+_md5_=6eef234888a1476475dacd4039983787
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318-r1 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318-r1
index 3ace2cfb03bc..87387cf4c93e 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318-r1
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130318-r1
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-130318.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e074c63f89f60aea900973561d5bcc92
+_md5_=544cf61db477cbcd286c03b21061f2bc
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130530 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130530
index c85ac7668189..1f652c1b9fee 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130530
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130530
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-130530.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f2c7590686a8fd8187ad29827db510e2
+_md5_=ce63c3809387b264959d7b917730739e
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130618 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130618
index 6bb19df1f006..799dde3be922 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130618
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130618
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-130618.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=74db3e6a4f542a836e6cbafeda6c586e
+_md5_=ba4e6f6107057d5613f3418b359f0ca0
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130705 b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130705
index 588f8ee030fc..6a4f2e060dda 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130705
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.2.2_p130705
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-130705.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4b5b5074d0ffacf50236331a019e9847
+_md5_=d58a0d31bacf675c2b29b397a2f2bafb
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1 b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1
index 614fc8e0fbe8..4eb8420e73e7 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.3.1r2.tar.gz -> analysis2.3.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b09e72545f04d2cbe406047efebdc220
+_md5_=b8d71a0e67e7cb975ceef9575f6df88e
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130813 b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130813
index 087aa3017332..4e2951f3b441 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130813
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130813
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.3.1r2.tar.gz -> analysis2.3.1.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.3.1-130813.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a4c3a9fadb5566cde5b104d3c2b0bc2a
+_md5_=e810c7577fab2e27309645311416543f
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130814 b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130814
index 159a4a82ecbb..b1fde7769254 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130814
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130814
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.3.1r2.tar.gz -> analysis2.3.1.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.3.1-130814.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=204515e16894529d9cf059f34de8f041
+_md5_=f80b87335e2609ae650f325b1d0e4e99
diff --git a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130822 b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130822
index ef4df7c1eac0..7a586c75ffe8 100644
--- a/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130822
+++ b/metadata/md5-cache/sci-chemistry/ccpn-2.3.1_p130822
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.3.1r2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.3.1-130822.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f06a4c07b493c85075b7cda5739c07ae
+_md5_=8a557d04d57a61a603d6f7ba9a11167f
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
index 58de0f713825..4baa99ff8146 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.2.tar.gz
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dc9c599415680c4b3a2daea8d03b53ea
+_md5_=f0a864bd755692925910fe929a9bd777
diff --git a/metadata/md5-cache/sci-chemistry/p3d-9999 b/metadata/md5-cache/sci-chemistry/p3d-9999
index 031af17e4fa8..f8f1db72d7f9 100644
--- a/metadata/md5-cache/sci-chemistry/p3d-9999
+++ b/metadata/md5-cache/sci-chemistry/p3d-9999
@@ -7,5 +7,5 @@ IUSE=examples
 LICENSE=GPL-3
 RDEPEND==dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ba5646ab47d3691fb3f3d52e40c8dbeb
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
index 63364538bfc5..86cbf8736753 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0b27c5b22ba601199f145fff017bcd12
+_md5_=b9b87c4748c8780b461775e81fec8de4
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
index a1e28a5a4d42..c65d305b9f3b 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e56032c1fd19d07541503b51d4e4004d
+_md5_=13b45e67435f91fd95016cb89120d5ed
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3 b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3
index 3842499568c5..99448ec1412b 100644
--- a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3
+++ b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=An application to generate publication-ready figures
 EAPI=5
 HOMEPAGE=http://wwwu.uni-klu.ac.at/magostin/cirkuit.html
 IUSE=debug aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.12.3-r3[qt4] virtual/latex-base media-libs/netpbm dev-texlive/texlive-pstricks app-text/ghostscript-gpl app-text/ps2eps media-gfx/pdf2svg >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 || ( ( >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] dev-qt/designer:4[-phonon] ) <dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] ) >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://wwwu.uni-klu.ac.at/magostin/src/cirkuit-0.4.3.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	kde4-base	5ba60672833e2a1cafaa86c446439d47	kde4-functions	7fc09e82c0d1735f44aedfa8e5073065	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3d3d3f049686acb267a7889b14f385dd
+_md5_=cea735d35f091e42bf053b7f08fbb686
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index af422ad01980..0b7befa8558a 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=X? ( dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) ncurses? ( sys-libs/ncurses ) bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:1 ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt4? ( dev-qt/qtgui:4 ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf1c12a760b16419b2eb46bd4b26574e
diff --git a/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6 b/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6
index cc617928e224..fabea5c36f52 100644
--- a/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6
+++ b/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/tkrajina/gpxpy/tarball/85c3477b -> gpxpy-0.8.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=ef735f1deb44966de623f5278da7c2be
+_md5_=162a17238b5317b2040a6b4ca441855a
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-9999 b/metadata/md5-cache/sci-geosciences/merkaartor-9999
index 257abc018dff..9aed316cfc0c 100644
--- a/metadata/md5-cache/sci-geosciences/merkaartor-9999
+++ b/metadata/md5-cache/sci-geosciences/merkaartor-9999
@@ -7,5 +7,5 @@ IUSE=debug exif gps nls libproxy webkit
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 >=dev-qt/qtgui-4.7.2:4 >=dev-qt/qtsvg-4.7.2:4 exif? ( media-gfx/exiv2 ) gps? ( >=sci-geosciences/gpsd-2.92[cxx] ) libproxy? ( net-libs/libproxy ) webkit? ( >=dev-qt/qtwebkit-4.7.2:4 )
 SLOT=0
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3206710fc52d8b6f0390e4ab04bf4c56
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999 b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
index a2be7a9a1761..5e5b2df31b79 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
@@ -7,5 +7,5 @@ IUSE=+pbf
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base pbf? ( dev-libs/protobuf-c )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=a7b1a9dc799ddca352268b2e12f5981b
diff --git a/metadata/md5-cache/sci-geosciences/qgis-1.8.0 b/metadata/md5-cache/sci-geosciences/qgis-1.8.0
index eb005272a92f..824266b76995 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-1.8.0
+++ b/metadata/md5-cache/sci-geosciences/qgis-1.8.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_
 SLOT=0
 SRC_URI=http://qgis.org/downloads/qgis-1.8.0.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
 _eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8fc87783dc5a78d57b12b1b2dcaa5359
+_md5_=d15b7e76492f00e4a93c6f99cf4e1847
diff --git a/metadata/md5-cache/sci-geosciences/seawater-2.0.1 b/metadata/md5-cache/sci-geosciences/seawater-2.0.1
index 30e1d5387f73..ed76a2a45841 100644
--- a/metadata/md5-cache/sci-geosciences/seawater-2.0.1
+++ b/metadata/md5-cache/sci-geosciences/seawater-2.0.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/seawater/seawater-2.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d564096cb867f58fec8de843ac02998e
+_md5_=c38abc221e517137351177b6d7e1d64d
diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3 b/metadata/md5-cache/sci-geosciences/seawater-3.3
index b432028473fa..45360369aa82 100644
--- a/metadata/md5-cache/sci-geosciences/seawater-3.3
+++ b/metadata/md5-cache/sci-geosciences/seawater-3.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/seawater/seawater-3.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4835da6d3134d76908f3a44670ce29c0
+_md5_=bd5d2d8e85e648d964e12b22504eb66b
diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3.1 b/metadata/md5-cache/sci-geosciences/seawater-3.3.1
index c07c6b1a67f6..e28beaf7e05f 100644
--- a/metadata/md5-cache/sci-geosciences/seawater-3.3.1
+++ b/metadata/md5-cache/sci-geosciences/seawater-3.3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/seawater/seawater-3.3.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0174ac5b57b05a4f50a16af13c8618e7
+_md5_=05e5d519186328220302a7e2785f5d8c
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.0-r1 b/metadata/md5-cache/sci-libs/bmrblib-1.0.0-r1
index 1cd597a5954d..7f50d87318ea 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.0-r1
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://download.gna.org/bmrblib/bmrblib-1.0.0.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=176c7f5a8b6825a3fbe1a3691c50c2f8
+_md5_=d03b3c9252cfe9df2e07cc5bfe3a7e68
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.1_pre198 b/metadata/md5-cache/sci-libs/bmrblib-1.0.1_pre198
index 604711c7fb56..4d2079db2241 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.1_pre198
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.1_pre198
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/bmrblib-1.0.1_pre198.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0a2ef26b94026fe9c665c85abd0312ea
+_md5_=8e9d5a333dbad02514dd51f44003e33a
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.2 b/metadata/md5-cache/sci-libs/bmrblib-1.0.2
index 37329e83dd03..90a4fdda2aea 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.2
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://download.gna.org/bmrblib/bmrblib-1.0.2.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=17e3cc342124df85e78a65dd4b544d20
+_md5_=8c40549d115c54ce55cf519742911eb9
diff --git a/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112-r1 b/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112-r1
index 6d64c3ac5122..a25ee649792c 100644
--- a/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112-r1
+++ b/metadata/md5-cache/sci-libs/ccpn-data-2.2.2_p121112-r1
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://www2.ccpn.ac.uk/download/ccpnmr/analysis2.2.2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.2-121112.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=50c90a7351e57027f10140aa64b3fe41
+_md5_=53a74ea96c46ff96fda3e3af5bbee756
diff --git a/metadata/md5-cache/sci-libs/ccpn-data-2.3.1 b/metadata/md5-cache/sci-libs/ccpn-data-2.3.1
index 0d471f4bd398..6e52a098c1dd 100644
--- a/metadata/md5-cache/sci-libs/ccpn-data-2.3.1
+++ b/metadata/md5-cache/sci-libs/ccpn-data-2.3.1
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://www2.ccpn.ac.uk/download/ccpnmr/analysis2.3.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d3fe15a5707fc7e81dd5386a2b5a0a01
+_md5_=b5e3253d39d0b24d5953f362a3d42370
diff --git a/metadata/md5-cache/sci-libs/ccpn-data-2.3.1_p130822 b/metadata/md5-cache/sci-libs/ccpn-data-2.3.1_p130822
index 574b3913ecb0..7111815a6845 100644
--- a/metadata/md5-cache/sci-libs/ccpn-data-2.3.1_p130822
+++ b/metadata/md5-cache/sci-libs/ccpn-data-2.3.1_p130822
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://www2.ccpn.ac.uk/download/ccpnmr/analysis2.3.1r2.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.3.1-130822.patch.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f8c8fe65f661610dd7b37b9be92ea52d
+_md5_=560a1ecff9ad65d719683eba8cff177b
diff --git a/metadata/md5-cache/sci-libs/deap-0.9.1 b/metadata/md5-cache/sci-libs/deap-0.9.1
index b47107cc25d7..d8363bff4707 100644
--- a/metadata/md5-cache/sci-libs/deap-0.9.1
+++ b/metadata/md5-cache/sci-libs/deap-0.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://deap.googlecode.com/files/deap-0.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f0e280de4ae88eae7c4c165e22eb0641
+_md5_=b21a99bbc6a59157ebb560e7ae3d5acb
diff --git a/metadata/md5-cache/sci-libs/deap-1.0.0_rc1 b/metadata/md5-cache/sci-libs/deap-1.0.0_rc1
index b133df5e6f37..99cd1ad002b2 100644
--- a/metadata/md5-cache/sci-libs/deap-1.0.0_rc1
+++ b/metadata/md5-cache/sci-libs/deap-1.0.0_rc1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://deap.googlecode.com/files/deap-1.0.0rc1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d079c0d90a593e8146a8ad3f61753b72
+_md5_=6bd2151437e3421b37b69ae8ba1336ba
diff --git a/metadata/md5-cache/sci-libs/deap-1.0.0_rc2 b/metadata/md5-cache/sci-libs/deap-1.0.0_rc2
index 18f7a6d58f8e..4647a4e935d3 100644
--- a/metadata/md5-cache/sci-libs/deap-1.0.0_rc2
+++ b/metadata/md5-cache/sci-libs/deap-1.0.0_rc2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://deap.googlecode.com/files/deap-1.0.0rc2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=81bef2a7364cab2a24565b7e39d22c2c
+_md5_=f8e7abb83a35bb0cd5bf1442fa617629
diff --git a/metadata/md5-cache/sci-libs/libh2o-9999 b/metadata/md5-cache/sci-libs/libh2o-9999
index 94a198b275c7..bef6304de55c 100644
--- a/metadata/md5-cache/sci-libs/libh2o-9999
+++ b/metadata/md5-cache/sci-libs/libh2o-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/libh2o/
 IUSE=debug static-libs
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=74a2fc65c833c9118c16b80642a74947
diff --git a/metadata/md5-cache/sci-libs/libh2oxx-9999 b/metadata/md5-cache/sci-libs/libh2oxx-9999
index 2bd677591b6c..1e410788f5f1 100644
--- a/metadata/md5-cache/sci-libs/libh2oxx-9999
+++ b/metadata/md5-cache/sci-libs/libh2oxx-9999
@@ -7,5 +7,5 @@ IUSE=debug static-libs
 LICENSE=BSD
 RDEPEND=>=sci-libs/libh2o-0.2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=72cf779590ddcc0674db4d705e88879a
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.3-r1 b/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
index 8dd1c560f851..1327ad9bc287 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5021a21f1a49ae3d01546eeba29eb9f4
+_md5_=5476dc6c18a0aabf0e046b19668c2374
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.4 b/metadata/md5-cache/sci-libs/minfx-1.0.4
index 4cb7ddfc49b9..0025b64f0f3e 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.4
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://download.gna.org/minfx/minfx-1.0.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=582cfb240fdeead56f89c8c19bb638a8
+_md5_=cb18132e6d1b02d11d8b56825750b6d4
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98 b/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
index e40a15418056..5b6ebd7d492f 100644
--- a/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
+++ b/metadata/md5-cache/sci-libs/minfx-1.0.4_pre98
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/minfx-1.0.4_pre98.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ab6f2d6dcbc1fb0e2db18e1ddc1964e9
+_md5_=8526786889c239cc4afdc0dd886336c0
diff --git a/metadata/md5-cache/sci-libs/scikits-0.1-r1 b/metadata/md5-cache/sci-libs/scikits-0.1-r1
index 28319c3a4a11..026839b82a3f 100644
--- a/metadata/md5-cache/sci-libs/scikits-0.1-r1
+++ b/metadata/md5-cache/sci-libs/scikits-0.1-r1
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/s/scikits.example/scikits.example-0.1.tar.gz
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=8adea93cd58e5408508378daef1869ce
+_md5_=c6dd34bdd8af427984d743f4945a4066
diff --git a/metadata/md5-cache/sci-libs/scikits_optimization-0.3 b/metadata/md5-cache/sci-libs/scikits_optimization-0.3
index 614df7ebaa9e..058738142eda 100644
--- a/metadata/md5-cache/sci-libs/scikits_optimization-0.3
+++ b/metadata/md5-cache/sci-libs/scikits_optimization-0.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikits.optimization/scikits.optimization-0.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e87c039f82176c6138382e617884af45
+_md5_=398fba36d2dca212e7d90b9407d6f6f4
diff --git a/metadata/md5-cache/sci-libs/scipy-0.12.0 b/metadata/md5-cache/sci-libs/scipy-0.12.0
index 5e94f032aada..2671ce7647dd 100644
--- a/metadata/md5-cache/sci-libs/scipy-0.12.0
+++ b/metadata/md5-cache/sci-libs/scipy-0.12.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://sourceforge/scipy/scipy-0.12.0.tar.gz doc? ( http://docs.scipy.org/doc/scipy/scipy-html.zip -> scipy-0.12.0-html.zip http://docs.scipy.org/doc/scipy/scipy-ref.pdf -> scipy-0.12.0-ref.pdf )
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=550c162cb8dac428ef25caf1a3724bae
+_md5_=24a20644f42d975fa3ec59064227b9a0
diff --git a/metadata/md5-cache/sci-mathematics/pymc-9999 b/metadata/md5-cache/sci-mathematics/pymc-9999
index f9e2203e1228..1e1e3e246434 100644
--- a/metadata/md5-cache/sci-mathematics/pymc-9999
+++ b/metadata/md5-cache/sci-mathematics/pymc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://github.com/pymc-devs/pymc http://pypi.python.org/pypi/pymc
 LICENSE=AFL-3.0
 RDEPEND=dev-lang/python
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=a94b97c2c7228bddde8cebd48132d861
diff --git a/metadata/md5-cache/sci-misc/repsnapper-9999 b/metadata/md5-cache/sci-misc/repsnapper-9999
index e2db4e75def9..4b0e5389d33f 100644
--- a/metadata/md5-cache/sci-misc/repsnapper-9999
+++ b/metadata/md5-cache/sci-misc/repsnapper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/timschmidt/repsnapper
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkglextmm-1.2 >=dev-cpp/gtkmm-2.4 dev-cpp/libxmlpp dev-libs/libzip virtual/opengl
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=9101e5476d7c8ed3be8daa9d084cc4ad
diff --git a/metadata/md5-cache/sci-physics/geant-python-4.9.6_p02 b/metadata/md5-cache/sci-physics/geant-python-4.9.6_p02
index c0db13dd1250..870b2b5df4d3 100644
--- a/metadata/md5-cache/sci-physics/geant-python-4.9.6_p02
+++ b/metadata/md5-cache/sci-physics/geant-python-4.9.6_p02
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 SLOT=0
 SRC_URI=http://geant4.cern.ch/support/source/geant4.9.6.p02.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7b05c3ef2d1105778517a9511fbce19e
+_md5_=9997605e909924fb20edc0660aaeae17
diff --git a/metadata/md5-cache/sci-physics/h2o-gtk-9999 b/metadata/md5-cache/sci-physics/h2o-gtk-9999
index 283c2957ac5e..b211d69c2ce6 100644
--- a/metadata/md5-cache/sci-physics/h2o-gtk-9999
+++ b/metadata/md5-cache/sci-physics/h2o-gtk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/h2o-gtk/
 LICENSE=BSD
 RDEPEND=dev-cpp/gtkmm sci-libs/libh2oxx sci-libs/plotmm
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eaf598bd7bf3fe1dca65664bda37d3d2
diff --git a/metadata/md5-cache/sci-physics/root-5.34.09 b/metadata/md5-cache/sci-physics/root-5.34.09
index c12ab1f8450d..0303b3acdb89 100644
--- a/metadata/md5-cache/sci-physics/root-5.34.09
+++ b/metadata/md5-cache/sci-physics/root-5.34.09
@@ -12,4 +12,4 @@ REQUIRED_USE=!X? ( !opengl !qt4 ) htmldoc? ( doc ) mpi? ( math !openmp ) openmp?
 SLOT=0
 SRC_URI=ftp://root.cern.ch/root/root_v5.34.09.source.tar.gz doc? ( math? ( ftp://root.cern.ch/root/doc/RooFit_Users_Manual_2.91-33.pdf http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.03.pdf ) metric? ( ftp://root.cern.ch/root/doc/ROOTUsersGuideA4.pdf -> ROOTUsersGuideA4-5.34.09.pdf ) !metric? ( ftp://root.cern.ch/root/doc/ROOTUsersGuideLetter.pdf -> ROOTUsersGuideLetter-5.34.09.pdf ) htmldoc? ( http://root.cern.ch/drupal/sites/default/files/rootdrawing-logo.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/blue/root-banner.png http://root.cern.ch/drupal/sites/all/themes/newsflash/images/info.png ) )
 _eclasses_=elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=13b853fcfbb7ad11392bd9ef5344b8e7
+_md5_=1a5ed4dfcf77cc0080f5357ac1c23780
diff --git a/metadata/md5-cache/sec-policy/selinux-abrt-9999 b/metadata/md5-cache/sec-policy/selinux-abrt-9999
index 43bc5fbf90ae..36fa37122dcf 100644
--- a/metadata/md5-cache/sec-policy/selinux-abrt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-abrt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d9c7314fe932aaa2d5b760d0a724c54
diff --git a/metadata/md5-cache/sec-policy/selinux-acct-9999 b/metadata/md5-cache/sec-policy/selinux-acct-9999
index e101d1827d19..baa43cc9fa7b 100644
--- a/metadata/md5-cache/sec-policy/selinux-acct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-acct-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fa03cb04d7ef3de2d2130532eb3aaef1
diff --git a/metadata/md5-cache/sec-policy/selinux-ada-9999 b/metadata/md5-cache/sec-policy/selinux-ada-9999
index c554392133a5..3a53514a54dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-ada-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ada-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ec4680a81553730ee67fbcdd3dbd048
diff --git a/metadata/md5-cache/sec-policy/selinux-afs-9999 b/metadata/md5-cache/sec-policy/selinux-afs-9999
index 0965490c1bfc..a8272f87a8dd 100644
--- a/metadata/md5-cache/sec-policy/selinux-afs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-afs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=903a74e124853a6cc4d501f9c8e6cb1b
diff --git a/metadata/md5-cache/sec-policy/selinux-aide-9999 b/metadata/md5-cache/sec-policy/selinux-aide-9999
index b9659de48a5a..49e93b90d4de 100644
--- a/metadata/md5-cache/sec-policy/selinux-aide-9999
+++ b/metadata/md5-cache/sec-policy/selinux-aide-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8fa5d483bcb1b44a99a9e8090a14792
diff --git a/metadata/md5-cache/sec-policy/selinux-alsa-9999 b/metadata/md5-cache/sec-policy/selinux-alsa-9999
index 433db76981e2..02dcac93cca1 100644
--- a/metadata/md5-cache/sec-policy/selinux-alsa-9999
+++ b/metadata/md5-cache/sec-policy/selinux-alsa-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=301429f2e4405f12669bebaa7f0f4be0
diff --git a/metadata/md5-cache/sec-policy/selinux-amanda-9999 b/metadata/md5-cache/sec-policy/selinux-amanda-9999
index 5ab74eae918b..cfacdaca86f7 100644
--- a/metadata/md5-cache/sec-policy/selinux-amanda-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amanda-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dc24c0ba43e52bfa8781d90ce5326538
diff --git a/metadata/md5-cache/sec-policy/selinux-amavis-9999 b/metadata/md5-cache/sec-policy/selinux-amavis-9999
index debeb90db553..0631b4bd5fff 100644
--- a/metadata/md5-cache/sec-policy/selinux-amavis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-amavis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=386aeaa713f7ac8210a1c56286a62246
diff --git a/metadata/md5-cache/sec-policy/selinux-apache-9999 b/metadata/md5-cache/sec-policy/selinux-apache-9999
index d833b752bef6..4eda9a7733e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-apache-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apache-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-kerberos >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=446c939345fa1288f97ee5835d534564
diff --git a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999 b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
index ea0515b4f497..21d84f3effdc 100644
--- a/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apcupsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=021f62e5b7f63c955f9dc37aea62b937
diff --git a/metadata/md5-cache/sec-policy/selinux-apm-9999 b/metadata/md5-cache/sec-policy/selinux-apm-9999
index e77d01536221..65443d77a6e9 100644
--- a/metadata/md5-cache/sec-policy/selinux-apm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-apm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0f192268395b13d75206e20fb1a8724
diff --git a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999 b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
index 49e3ab155d9f..dad0086fb2b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-arpwatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a117a13652ab27e9faf12d92ee92590
diff --git a/metadata/md5-cache/sec-policy/selinux-asterisk-9999 b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
index 9a10c559b01b..077a8b7337f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-asterisk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-asterisk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=21ad5183bfd891eb828e0829d567d690
diff --git a/metadata/md5-cache/sec-policy/selinux-at-9999 b/metadata/md5-cache/sec-policy/selinux-at-9999
index e73f9021881e..7f551869b2ab 100644
--- a/metadata/md5-cache/sec-policy/selinux-at-9999
+++ b/metadata/md5-cache/sec-policy/selinux-at-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=df9075013a263721a2cecfc0052c69d8
diff --git a/metadata/md5-cache/sec-policy/selinux-automount-9999 b/metadata/md5-cache/sec-policy/selinux-automount-9999
index 8dab87ed5de0..d54be5412112 100644
--- a/metadata/md5-cache/sec-policy/selinux-automount-9999
+++ b/metadata/md5-cache/sec-policy/selinux-automount-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=647771e915f38e621b7a9c904f0431a7
diff --git a/metadata/md5-cache/sec-policy/selinux-avahi-9999 b/metadata/md5-cache/sec-policy/selinux-avahi-9999
index 589a17f352c5..773ab9993eb2 100644
--- a/metadata/md5-cache/sec-policy/selinux-avahi-9999
+++ b/metadata/md5-cache/sec-policy/selinux-avahi-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=577275e2a68a513f01bebf1333a46e38
diff --git a/metadata/md5-cache/sec-policy/selinux-awstats-9999 b/metadata/md5-cache/sec-policy/selinux-awstats-9999
index c98ebc65475e..4b4a87e64b57 100644
--- a/metadata/md5-cache/sec-policy/selinux-awstats-9999
+++ b/metadata/md5-cache/sec-policy/selinux-awstats-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5cb0e71daa10a93360584e658407a17f
diff --git a/metadata/md5-cache/sec-policy/selinux-backup-9999 b/metadata/md5-cache/sec-policy/selinux-backup-9999
index fc86851196b9..72a1376de485 100644
--- a/metadata/md5-cache/sec-policy/selinux-backup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-backup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=da8d38471b79cb31a8dfad77601423d5
diff --git a/metadata/md5-cache/sec-policy/selinux-bacula-9999 b/metadata/md5-cache/sec-policy/selinux-bacula-9999
index aab4639766e4..13c7e469acf3 100644
--- a/metadata/md5-cache/sec-policy/selinux-bacula-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bacula-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c76443d7fb6ddd4d8302789b6e3fb3d
diff --git a/metadata/md5-cache/sec-policy/selinux-base-9999 b/metadata/md5-cache/sec-policy/selinux-base-9999
index b4f9d20ea32d..f709c4de58fa 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-9999
@@ -7,5 +7,5 @@ IUSE=+peer_perms +open_perms +ubac +unconfined doc
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.1.10 virtual/udev !<=sec-policy/selinux-base-policy-2.20120725
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3fb55f366ad05877ae63a10f5e4d6f88
diff --git a/metadata/md5-cache/sec-policy/selinux-base-policy-9999 b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
index a9eb48ed645c..8ecef677f5b3 100644
--- a/metadata/md5-cache/sec-policy/selinux-base-policy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-base-policy-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PDEPEND=unconfined? ( sec-policy/selinux-unconfined )
 RDEPEND==sec-policy/selinux-base-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5a1a8d5c48b99cd3b051a4b8f33e4529
diff --git a/metadata/md5-cache/sec-policy/selinux-bind-9999 b/metadata/md5-cache/sec-policy/selinux-bind-9999
index 94ac53d339d6..065cbe7d3464 100644
--- a/metadata/md5-cache/sec-policy/selinux-bind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bind-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=66d25670a305edc26d816cd3b83e9421
diff --git a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999 b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
index abb05c9f6dc5..a240879b9c5c 100644
--- a/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bitlbee-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bc49760be96a380858f487b78414474d
diff --git a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999 b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
index 813e81e3a420..22f8c7988bf7 100644
--- a/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
+++ b/metadata/md5-cache/sec-policy/selinux-bluetooth-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d81af6d23a003e251b2d320ce563655
diff --git a/metadata/md5-cache/sec-policy/selinux-brctl-9999 b/metadata/md5-cache/sec-policy/selinux-brctl-9999
index 7f08dec496ed..4568f792cce4 100644
--- a/metadata/md5-cache/sec-policy/selinux-brctl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-brctl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02dd4f46e691a9eb539e4ec653889b65
diff --git a/metadata/md5-cache/sec-policy/selinux-calamaris-9999 b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
index f4908f6a61d9..81a5f400b711 100644
--- a/metadata/md5-cache/sec-policy/selinux-calamaris-9999
+++ b/metadata/md5-cache/sec-policy/selinux-calamaris-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1b71aab9aafea000c238b83126b5e191
diff --git a/metadata/md5-cache/sec-policy/selinux-canna-9999 b/metadata/md5-cache/sec-policy/selinux-canna-9999
index f0d43f31e728..a51da5725239 100644
--- a/metadata/md5-cache/sec-policy/selinux-canna-9999
+++ b/metadata/md5-cache/sec-policy/selinux-canna-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1c24c62b995bdcff3aefa0546e40a6be
diff --git a/metadata/md5-cache/sec-policy/selinux-ccs-9999 b/metadata/md5-cache/sec-policy/selinux-ccs-9999
index 31bf91e2499b..3a01d0f8e52e 100644
--- a/metadata/md5-cache/sec-policy/selinux-ccs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ccs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8455bf205d38a804bc971775372fb033
diff --git a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999 b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
index 9fc85561721f..401d2ce1576e 100644
--- a/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cdrecord-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=167db68dc15fddd6d796537d286a423d
diff --git a/metadata/md5-cache/sec-policy/selinux-cgroup-9999 b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
index aeb5fc87cf4b..41b6e6635ced 100644
--- a/metadata/md5-cache/sec-policy/selinux-cgroup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cgroup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31e375b983d06f96d47a14a0960873c4
diff --git a/metadata/md5-cache/sec-policy/selinux-chromium-9999 b/metadata/md5-cache/sec-policy/selinux-chromium-9999
index 894ff9eff87b..40b1191cae28 100644
--- a/metadata/md5-cache/sec-policy/selinux-chromium-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chromium-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=926ecb2300939f5c9414b4d7ef5fa0c2
diff --git a/metadata/md5-cache/sec-policy/selinux-chronyd-9999 b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
index 98c273373609..090822bfa7d7 100644
--- a/metadata/md5-cache/sec-policy/selinux-chronyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-chronyd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=14377b502c184b08aa03c2a9f937b54d
diff --git a/metadata/md5-cache/sec-policy/selinux-clamav-9999 b/metadata/md5-cache/sec-policy/selinux-clamav-9999
index 9c31f6340a47..655fc3b8c3e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-clamav-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clamav-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d0bf0612083ed86d8eaab63f6794d93b
diff --git a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999 b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
index 77e4098e63d8..69f5ce18f033 100644
--- a/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
+++ b/metadata/md5-cache/sec-policy/selinux-clockspeed-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cd355fbb709e6279ebbdf665a41dd1be
diff --git a/metadata/md5-cache/sec-policy/selinux-consolekit-9999 b/metadata/md5-cache/sec-policy/selinux-consolekit-9999
index 9941d61b9f29..97d09eaf7382 100644
--- a/metadata/md5-cache/sec-policy/selinux-consolekit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-consolekit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5b15593989ccd2064a56f96d4922287a
diff --git a/metadata/md5-cache/sec-policy/selinux-corosync-9999 b/metadata/md5-cache/sec-policy/selinux-corosync-9999
index 46c0b1a63559..b810e23b01ad 100644
--- a/metadata/md5-cache/sec-policy/selinux-corosync-9999
+++ b/metadata/md5-cache/sec-policy/selinux-corosync-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bf10460d011f8397c14a56411fb66ba
diff --git a/metadata/md5-cache/sec-policy/selinux-courier-9999 b/metadata/md5-cache/sec-policy/selinux-courier-9999
index 475a8c497a79..311087e791a1 100644
--- a/metadata/md5-cache/sec-policy/selinux-courier-9999
+++ b/metadata/md5-cache/sec-policy/selinux-courier-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9befee5b630bebe3eac0da98c07133a0
diff --git a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999 b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
index b28855af8308..b9fad7b51b84 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpucontrol-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35762516ce4f5dc16498087f1afb0fdf
diff --git a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999 b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
index 77d1aa4d2836..6453e303466a 100644
--- a/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cpufreqselector-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=921898f586c76c955b4297b1994e35b3
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-9999 b/metadata/md5-cache/sec-policy/selinux-cups-9999
index c75d9bf2a74b..a1f6be7eebcb 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cups-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-lpd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee710bb2abc1e5ad13dc785420e13d85
diff --git a/metadata/md5-cache/sec-policy/selinux-cvs-9999 b/metadata/md5-cache/sec-policy/selinux-cvs-9999
index 612dba02a719..9bcbd59df409 100644
--- a/metadata/md5-cache/sec-policy/selinux-cvs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cvs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4f748c8c36f09a1addf4fab575f6ca57
diff --git a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999 b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
index bea892aaa340..cfdd3142bcbc 100644
--- a/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-cyphesis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a0da436e83d3ff2c9041d15adf4f41a
diff --git a/metadata/md5-cache/sec-policy/selinux-daemontools-9999 b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
index 879dea9375c1..18d868bfddbb 100644
--- a/metadata/md5-cache/sec-policy/selinux-daemontools-9999
+++ b/metadata/md5-cache/sec-policy/selinux-daemontools-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c124babd2147d50238bcc900f7afe083
diff --git a/metadata/md5-cache/sec-policy/selinux-dante-9999 b/metadata/md5-cache/sec-policy/selinux-dante-9999
index 19578424103b..f6ab77ed949f 100644
--- a/metadata/md5-cache/sec-policy/selinux-dante-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dante-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae45eb116030d74fea0373b4fe3b7d00
diff --git a/metadata/md5-cache/sec-policy/selinux-dbadm-9999 b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
index 470769b9c1c1..b7ed0f65a3c6 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbadm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbadm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1242b87e0d2e0946da1a094b926f348
diff --git a/metadata/md5-cache/sec-policy/selinux-dbskk-9999 b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
index a6b734d1be0b..c0c42b955404 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbskk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbskk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a2ac90226f50ff00abb012dc8faade5a
diff --git a/metadata/md5-cache/sec-policy/selinux-dbus-9999 b/metadata/md5-cache/sec-policy/selinux-dbus-9999
index 37ee28880673..0ca825086789 100644
--- a/metadata/md5-cache/sec-policy/selinux-dbus-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dbus-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f791b7efe094b11216894ee509c85b34
diff --git a/metadata/md5-cache/sec-policy/selinux-dcc-9999 b/metadata/md5-cache/sec-policy/selinux-dcc-9999
index 7e23b60bb1fb..e43b481ac88a 100644
--- a/metadata/md5-cache/sec-policy/selinux-dcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dcc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f56294e80a30b16785847f9818d993df
diff --git a/metadata/md5-cache/sec-policy/selinux-ddclient-9999 b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
index b86a07eb29a9..f4ffdf561064 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddclient-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddclient-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=578904330af07dbe35a2f753a0da4911
diff --git a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999 b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
index 4104f747c959..5b0d23df71a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ddcprobe-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4a525400de938a77678393febb60328c
diff --git a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999 b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
index 187f011fcf29..c64a3457d89e 100644
--- a/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
+++ b/metadata/md5-cache/sec-policy/selinux-denyhosts-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=64c05f14f09292d6a1f94f7c65a6508b
diff --git a/metadata/md5-cache/sec-policy/selinux-devicekit-9999 b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
index 5376faf6ad7b..72a2551b3e17 100644
--- a/metadata/md5-cache/sec-policy/selinux-devicekit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-devicekit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63e27a99edb957c5f51ce4878fd0d135
diff --git a/metadata/md5-cache/sec-policy/selinux-dhcp-9999 b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
index a088c2f43c79..6d90842c2561 100644
--- a/metadata/md5-cache/sec-policy/selinux-dhcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dhcp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f18f4b261a8e43d32bdd286e72651f8c
diff --git a/metadata/md5-cache/sec-policy/selinux-dictd-9999 b/metadata/md5-cache/sec-policy/selinux-dictd-9999
index 236e212b7c12..5abd70f55419 100644
--- a/metadata/md5-cache/sec-policy/selinux-dictd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dictd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=35c91c11b49df7215cb730454323c80b
diff --git a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999 b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
index a9823c1bd6d5..b22c40f2d048 100644
--- a/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dirsrv-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2e4056e9d647ac34550813d59e4b5a5a
diff --git a/metadata/md5-cache/sec-policy/selinux-distcc-9999 b/metadata/md5-cache/sec-policy/selinux-distcc-9999
index 9bb9cc727fef..7ce5f8e02eb1 100644
--- a/metadata/md5-cache/sec-policy/selinux-distcc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-distcc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a869f815366107ed54aca87baad51031
diff --git a/metadata/md5-cache/sec-policy/selinux-djbdns-9999 b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
index 4dc7dfccb70a..7ce3d6668ef6 100644
--- a/metadata/md5-cache/sec-policy/selinux-djbdns-9999
+++ b/metadata/md5-cache/sec-policy/selinux-djbdns-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-daemontools >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3a375f7806ee9f5adc0e74cebffb0432
diff --git a/metadata/md5-cache/sec-policy/selinux-dkim-9999 b/metadata/md5-cache/sec-policy/selinux-dkim-9999
index a94209672c82..7240e21e8743 100644
--- a/metadata/md5-cache/sec-policy/selinux-dkim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dkim-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2afee1d044163daa2712e473986bdec4
diff --git a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999 b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
index 1b70ddaeae05..41f6a8f3c860 100644
--- a/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dmidecode-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c03ff19ec41608ded2e16d84d4dd2856
diff --git a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999 b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
index f5aad0feed2f..76604a678b11 100644
--- a/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dnsmasq-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bda4d24ae0a7be7fbb342f8dcdd79aed
diff --git a/metadata/md5-cache/sec-policy/selinux-dovecot-9999 b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
index a6148e4ba003..8c3adab8ccb3 100644
--- a/metadata/md5-cache/sec-policy/selinux-dovecot-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dovecot-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ec7f91ce101f4696a378d6c860d46712
diff --git a/metadata/md5-cache/sec-policy/selinux-dpkg-9999 b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
index 853538066792..170771257be8 100644
--- a/metadata/md5-cache/sec-policy/selinux-dpkg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dpkg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e0b34046215c50dde89dcdeeb81e009c
diff --git a/metadata/md5-cache/sec-policy/selinux-dracut-9999 b/metadata/md5-cache/sec-policy/selinux-dracut-9999
index 68190a66fb43..19a80a64f527 100644
--- a/metadata/md5-cache/sec-policy/selinux-dracut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-dracut-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d16f0e6731e917e5d4aaff5af609ded0
diff --git a/metadata/md5-cache/sec-policy/selinux-entropyd-9999 b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
index 5ca5b3bc65a1..1f8fa749dbcb 100644
--- a/metadata/md5-cache/sec-policy/selinux-entropyd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-entropyd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7a480e93ab712c89639acdd1d98aa847
diff --git a/metadata/md5-cache/sec-policy/selinux-evolution-9999 b/metadata/md5-cache/sec-policy/selinux-evolution-9999
index 3619a8b3c028..439d6f71c5e1 100644
--- a/metadata/md5-cache/sec-policy/selinux-evolution-9999
+++ b/metadata/md5-cache/sec-policy/selinux-evolution-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d1e3d22e67f4cd66e6cb2697d016d3c2
diff --git a/metadata/md5-cache/sec-policy/selinux-exim-9999 b/metadata/md5-cache/sec-policy/selinux-exim-9999
index c9e9c3b9e015..3fbcd429121b 100644
--- a/metadata/md5-cache/sec-policy/selinux-exim-9999
+++ b/metadata/md5-cache/sec-policy/selinux-exim-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b90d266a6a24b521e30ac4bd8895ae98
diff --git a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999 b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
index 1f8171db34d8..8407bd95d5e0 100644
--- a/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fail2ban-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4b380bca7dff26da38e009432cdf7fdf
diff --git a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999 b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
index 7f794066cbfb..4466541d3ec1 100644
--- a/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fetchmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4d4647f61831750d0f29d9f6fc2445d7
diff --git a/metadata/md5-cache/sec-policy/selinux-finger-9999 b/metadata/md5-cache/sec-policy/selinux-finger-9999
index a4b092506882..a0a013ce298b 100644
--- a/metadata/md5-cache/sec-policy/selinux-finger-9999
+++ b/metadata/md5-cache/sec-policy/selinux-finger-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7057d1fff97f084dec092f32c3a66fd
diff --git a/metadata/md5-cache/sec-policy/selinux-flash-9999 b/metadata/md5-cache/sec-policy/selinux-flash-9999
index aa478503350f..8e0e6a021877 100644
--- a/metadata/md5-cache/sec-policy/selinux-flash-9999
+++ b/metadata/md5-cache/sec-policy/selinux-flash-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db464cab1cd6830ec2a87b25aebb8da7
diff --git a/metadata/md5-cache/sec-policy/selinux-fprintd-9999 b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
index e73253a37701..e930718742b4 100644
--- a/metadata/md5-cache/sec-policy/selinux-fprintd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-fprintd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c69410f26de7e801d48d06da6f920d4a
diff --git a/metadata/md5-cache/sec-policy/selinux-ftp-9999 b/metadata/md5-cache/sec-policy/selinux-ftp-9999
index 0b5eadbe312b..6e8b86086810 100644
--- a/metadata/md5-cache/sec-policy/selinux-ftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ftp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=aac2e1fdc28107c278d220c45023009b
diff --git a/metadata/md5-cache/sec-policy/selinux-games-9999 b/metadata/md5-cache/sec-policy/selinux-games-9999
index 4ec858b61979..c28496a1c03b 100644
--- a/metadata/md5-cache/sec-policy/selinux-games-9999
+++ b/metadata/md5-cache/sec-policy/selinux-games-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d2558401f683b00c7a4355ee6ed8fb4
diff --git a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999 b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
index ea2191e1de1e..922465cf092e 100644
--- a/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gatekeeper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=803aa95ba314b0e10a05b86781205261
diff --git a/metadata/md5-cache/sec-policy/selinux-gift-9999 b/metadata/md5-cache/sec-policy/selinux-gift-9999
index 564b2fc4291f..33a6634455eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-gift-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gift-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8810c62a097bcce7ec24cc86f7d8c7c6
diff --git a/metadata/md5-cache/sec-policy/selinux-gitosis-9999 b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
index 144fcce4d9bb..2519a1e3d4c0 100644
--- a/metadata/md5-cache/sec-policy/selinux-gitosis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gitosis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=42adccec4426efc53933d7d8cc08cf73
diff --git a/metadata/md5-cache/sec-policy/selinux-gnome-9999 b/metadata/md5-cache/sec-policy/selinux-gnome-9999
index a7f3a82b56ed..cb0e9c8609b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-gnome-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gnome-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93cce8c884198e198efa1c1b1ba6625d
diff --git a/metadata/md5-cache/sec-policy/selinux-googletalk-9999 b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
index 86d14c2b7a42..528508b3cda6 100644
--- a/metadata/md5-cache/sec-policy/selinux-googletalk-9999
+++ b/metadata/md5-cache/sec-policy/selinux-googletalk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71c3de19da8e895d785059fb87acef0e
diff --git a/metadata/md5-cache/sec-policy/selinux-gorg-9999 b/metadata/md5-cache/sec-policy/selinux-gorg-9999
index 4bf282d5c5d1..ec5670b6ddf7 100644
--- a/metadata/md5-cache/sec-policy/selinux-gorg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gorg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d770fc170d9e58602a056272da813aa3
diff --git a/metadata/md5-cache/sec-policy/selinux-gpg-9999 b/metadata/md5-cache/sec-policy/selinux-gpg-9999
index 9f2695c8242d..c0655e18be67 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ca30ebc34d0ec8b71b02272313586ab3
diff --git a/metadata/md5-cache/sec-policy/selinux-gpm-9999 b/metadata/md5-cache/sec-policy/selinux-gpm-9999
index d396d4c40ea1..513b66d44fe4 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=045289237f3a062222f56ba31e3650c3
diff --git a/metadata/md5-cache/sec-policy/selinux-gpsd-9999 b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
index 0733073b8592..9f6370edb516 100644
--- a/metadata/md5-cache/sec-policy/selinux-gpsd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-gpsd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4010b23f91cc2315459b530149b5789c
diff --git a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999 b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
index 7a03699ada64..6005373fc2d3 100644
--- a/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-hddtemp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3297d4766bf5c4158bbda9e3bd34ee15
diff --git a/metadata/md5-cache/sec-policy/selinux-howl-9999 b/metadata/md5-cache/sec-policy/selinux-howl-9999
index 64facc98e2d7..e8afa1b3bcc1 100644
--- a/metadata/md5-cache/sec-policy/selinux-howl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-howl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0098368b944323eab614fc787968d2da
diff --git a/metadata/md5-cache/sec-policy/selinux-icecast-9999 b/metadata/md5-cache/sec-policy/selinux-icecast-9999
index 531965693259..de9f8e56e524 100644
--- a/metadata/md5-cache/sec-policy/selinux-icecast-9999
+++ b/metadata/md5-cache/sec-policy/selinux-icecast-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bf821e28aba47ebae98f55233ce967c8
diff --git a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999 b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
index a9f5c80eaa83..fc01ca74e2f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ifplugd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=461139ef57991f95d3a5aa9e8c028a2f
diff --git a/metadata/md5-cache/sec-policy/selinux-imaze-9999 b/metadata/md5-cache/sec-policy/selinux-imaze-9999
index 58209a852842..9ffb429706fc 100644
--- a/metadata/md5-cache/sec-policy/selinux-imaze-9999
+++ b/metadata/md5-cache/sec-policy/selinux-imaze-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=435aa2fcdc93134a0e82eb14195ad4ac
diff --git a/metadata/md5-cache/sec-policy/selinux-inetd-9999 b/metadata/md5-cache/sec-policy/selinux-inetd-9999
index 0f6ab8433ae4..2bf2ee2996f3 100644
--- a/metadata/md5-cache/sec-policy/selinux-inetd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inetd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a591f9f4fe4f54708b19ed4f25293ecc
diff --git a/metadata/md5-cache/sec-policy/selinux-inn-9999 b/metadata/md5-cache/sec-policy/selinux-inn-9999
index d24b01e4aca6..973d96294ed3 100644
--- a/metadata/md5-cache/sec-policy/selinux-inn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-inn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a6903bd1e4e68b519c0bcc2c347f185
diff --git a/metadata/md5-cache/sec-policy/selinux-ipsec-9999 b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
index e424d8712f8c..bf3c04ee353a 100644
--- a/metadata/md5-cache/sec-policy/selinux-ipsec-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ipsec-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=47076bff0cacc123a3d7fa2d4777d431
diff --git a/metadata/md5-cache/sec-policy/selinux-irc-9999 b/metadata/md5-cache/sec-policy/selinux-irc-9999
index f26aee835ff6..e88a97906c22 100644
--- a/metadata/md5-cache/sec-policy/selinux-irc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2a00e6f8a6e0a1edcab3fc45fae61b0d
diff --git a/metadata/md5-cache/sec-policy/selinux-ircd-9999 b/metadata/md5-cache/sec-policy/selinux-ircd-9999
index 72e8606e1b66..978521d4c778 100644
--- a/metadata/md5-cache/sec-policy/selinux-ircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ircd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1642282602f799ae926cdeadc348cfa2
diff --git a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999 b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
index d90a6b35364a..821d51ac2d18 100644
--- a/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
+++ b/metadata/md5-cache/sec-policy/selinux-irqbalance-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b3edf874357151da580ca0962b0506e7
diff --git a/metadata/md5-cache/sec-policy/selinux-jabber-9999 b/metadata/md5-cache/sec-policy/selinux-jabber-9999
index 9d49da06a466..d949106ed1dc 100644
--- a/metadata/md5-cache/sec-policy/selinux-jabber-9999
+++ b/metadata/md5-cache/sec-policy/selinux-jabber-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fe146320c8b653c5141462910bc2b6e2
diff --git a/metadata/md5-cache/sec-policy/selinux-java-9999 b/metadata/md5-cache/sec-policy/selinux-java-9999
index 2dc2784a1aaa..e51b5384e81a 100644
--- a/metadata/md5-cache/sec-policy/selinux-java-9999
+++ b/metadata/md5-cache/sec-policy/selinux-java-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db41a72afd8d75941db91f24080728ff
diff --git a/metadata/md5-cache/sec-policy/selinux-kdump-9999 b/metadata/md5-cache/sec-policy/selinux-kdump-9999
index 90c3b00a32b3..0180cf3a23e8 100644
--- a/metadata/md5-cache/sec-policy/selinux-kdump-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kdump-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=329b9d0605e4747c625d5b8ae750f95b
diff --git a/metadata/md5-cache/sec-policy/selinux-kerberos-9999 b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
index fca50e1c385d..ea295c58810e 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerberos-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerberos-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78665b51e7297c17fa6177974df59e76
diff --git a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999 b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
index 391897e120cd..5214b2423725 100644
--- a/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kerneloops-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ba5fb89f524ad8d6a1c904cc50b7b95e
diff --git a/metadata/md5-cache/sec-policy/selinux-kismet-9999 b/metadata/md5-cache/sec-policy/selinux-kismet-9999
index 2981bb1d431f..4039b92056eb 100644
--- a/metadata/md5-cache/sec-policy/selinux-kismet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kismet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7d9cb7b7a742ffe5be1a7b568def16a
diff --git a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999 b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
index ec73cab96a54..fb80b2773d51 100644
--- a/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ksmtuned-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=677250f87b7466aeef3cd5d97aa799ff
diff --git a/metadata/md5-cache/sec-policy/selinux-kudzu-9999 b/metadata/md5-cache/sec-policy/selinux-kudzu-9999
index 6dd8eb4b98c6..7c75e1a242ca 100644
--- a/metadata/md5-cache/sec-policy/selinux-kudzu-9999
+++ b/metadata/md5-cache/sec-policy/selinux-kudzu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62b43d192b8f9d1e65bffbe4b0c5e1f5
diff --git a/metadata/md5-cache/sec-policy/selinux-ldap-9999 b/metadata/md5-cache/sec-policy/selinux-ldap-9999
index 6fd7facad425..68c6d5b279e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-ldap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ldap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73a039ef7a6eb02f4ae6cc15fdbe1993
diff --git a/metadata/md5-cache/sec-policy/selinux-links-9999 b/metadata/md5-cache/sec-policy/selinux-links-9999
index 0ca78b2186e2..dfe645c475b0 100644
--- a/metadata/md5-cache/sec-policy/selinux-links-9999
+++ b/metadata/md5-cache/sec-policy/selinux-links-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4afde39ff85b8bdf796cf21f640b7a1e
diff --git a/metadata/md5-cache/sec-policy/selinux-lircd-9999 b/metadata/md5-cache/sec-policy/selinux-lircd-9999
index c0dd8817fa16..26d15cd640b1 100644
--- a/metadata/md5-cache/sec-policy/selinux-lircd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lircd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=260a7cad688afe8f9aa55d146524bb17
diff --git a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999 b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
index 3afe70ab1e72..2d2458e3fbfd 100644
--- a/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
+++ b/metadata/md5-cache/sec-policy/selinux-loadkeys-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=17a74d0991d529538126ebf35a248bbb
diff --git a/metadata/md5-cache/sec-policy/selinux-lockdev-9999 b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
index c651f983a5c8..b9624285d42d 100644
--- a/metadata/md5-cache/sec-policy/selinux-lockdev-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lockdev-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dbc8902fb3c7187aa615863b22f81430
diff --git a/metadata/md5-cache/sec-policy/selinux-logrotate-9999 b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
index 79df5eda45b3..f2e5a7f311cb 100644
--- a/metadata/md5-cache/sec-policy/selinux-logrotate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logrotate-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5295b20eecc9c3e0024d9839f326bb63
diff --git a/metadata/md5-cache/sec-policy/selinux-logsentry-9999 b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
index 08918c0d735c..87747d4dfd2e 100644
--- a/metadata/md5-cache/sec-policy/selinux-logsentry-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logsentry-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45d4d3e8fb5d3434255af8a327286228
diff --git a/metadata/md5-cache/sec-policy/selinux-logwatch-9999 b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
index 740ce2f931ee..1c60888753a9 100644
--- a/metadata/md5-cache/sec-policy/selinux-logwatch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-logwatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3c558a86b5e179167114b50fbd2c5e05
diff --git a/metadata/md5-cache/sec-policy/selinux-lpd-9999 b/metadata/md5-cache/sec-policy/selinux-lpd-9999
index 95a9fd672f6d..942bc0f2ea60 100644
--- a/metadata/md5-cache/sec-policy/selinux-lpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-lpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54a93f7171231fb437a3947f7b5c72fc
diff --git a/metadata/md5-cache/sec-policy/selinux-mailman-9999 b/metadata/md5-cache/sec-policy/selinux-mailman-9999
index 81c719840f1d..1fdad3d73058 100644
--- a/metadata/md5-cache/sec-policy/selinux-mailman-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mailman-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78891edc99c290a2a5d5c689219587ab
diff --git a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999 b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
index bffb734f89e7..fd6dc1af07de 100644
--- a/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
+++ b/metadata/md5-cache/sec-policy/selinux-makewhatis-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=93c5415220efe63c5fa87abcfdc0e026
diff --git a/metadata/md5-cache/sec-policy/selinux-mcelog-9999 b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
index 84f3b2a0e2dc..33dab38a43a0 100644
--- a/metadata/md5-cache/sec-policy/selinux-mcelog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mcelog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=742ae1d4b568ba84e4697f39298fe79c
diff --git a/metadata/md5-cache/sec-policy/selinux-memcached-9999 b/metadata/md5-cache/sec-policy/selinux-memcached-9999
index ec2cd004290c..d546714a0e22 100644
--- a/metadata/md5-cache/sec-policy/selinux-memcached-9999
+++ b/metadata/md5-cache/sec-policy/selinux-memcached-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=eb8b6c2064a568f0ffc36bca32137672
diff --git a/metadata/md5-cache/sec-policy/selinux-milter-9999 b/metadata/md5-cache/sec-policy/selinux-milter-9999
index 81517da34012..6c3f0f225abc 100644
--- a/metadata/md5-cache/sec-policy/selinux-milter-9999
+++ b/metadata/md5-cache/sec-policy/selinux-milter-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d06c8d27d54a04f1ffac74bd080800c8
diff --git a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999 b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
index 8082bbdf76b4..f1ab3a0fd627 100644
--- a/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-modemmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55bb7f32a590f5bb2fd3274a334efe95
diff --git a/metadata/md5-cache/sec-policy/selinux-mono-9999 b/metadata/md5-cache/sec-policy/selinux-mono-9999
index cd2e586e93d7..bad754ec4954 100644
--- a/metadata/md5-cache/sec-policy/selinux-mono-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mono-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=041a951d0e03f18e27aadd1552144c46
diff --git a/metadata/md5-cache/sec-policy/selinux-mozilla-9999 b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
index 0b8dda0c3770..f2b95a73028d 100644
--- a/metadata/md5-cache/sec-policy/selinux-mozilla-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mozilla-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b6499e72a22bde97ab0c8d110ed01cda
diff --git a/metadata/md5-cache/sec-policy/selinux-mpd-9999 b/metadata/md5-cache/sec-policy/selinux-mpd-9999
index 1469edd032ac..d5f03f1da072 100644
--- a/metadata/md5-cache/sec-policy/selinux-mpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8c92b69ec527fa736d29a7ba910fb0af
diff --git a/metadata/md5-cache/sec-policy/selinux-mplayer-9999 b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
index cfcf47fc69f3..2805a12a7db8 100644
--- a/metadata/md5-cache/sec-policy/selinux-mplayer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mplayer-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2dcca415cca663b6df4c8d51ee4a0c2
diff --git a/metadata/md5-cache/sec-policy/selinux-mrtg-9999 b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
index d0c56812741a..8475a0ec3eb6 100644
--- a/metadata/md5-cache/sec-policy/selinux-mrtg-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mrtg-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=55f393c828638f775791b7132ed80a9f
diff --git a/metadata/md5-cache/sec-policy/selinux-munin-9999 b/metadata/md5-cache/sec-policy/selinux-munin-9999
index 4e84f57011d5..004d8a5b4aeb 100644
--- a/metadata/md5-cache/sec-policy/selinux-munin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-munin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b2190311bd7493d954879e9ef8fc9118
diff --git a/metadata/md5-cache/sec-policy/selinux-mutt-9999 b/metadata/md5-cache/sec-policy/selinux-mutt-9999
index 23bcf6f2fcde..5a48fd928a0f 100644
--- a/metadata/md5-cache/sec-policy/selinux-mutt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mutt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e40edd45b1210ad59f42115833594011
diff --git a/metadata/md5-cache/sec-policy/selinux-mysql-9999 b/metadata/md5-cache/sec-policy/selinux-mysql-9999
index 28fb77b2650f..931b1e4f7ad7 100644
--- a/metadata/md5-cache/sec-policy/selinux-mysql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-mysql-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9229c6a08d19f5fa0aa68175bdb5736e
diff --git a/metadata/md5-cache/sec-policy/selinux-nagios-9999 b/metadata/md5-cache/sec-policy/selinux-nagios-9999
index 2363a40a221b..a4ce1287c29c 100644
--- a/metadata/md5-cache/sec-policy/selinux-nagios-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nagios-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e19c9533e6d236a9d6dfa67d3f74a5d0
diff --git a/metadata/md5-cache/sec-policy/selinux-ncftool-9999 b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
index d80ca4dbe6ee..84b8ab4953ef 100644
--- a/metadata/md5-cache/sec-policy/selinux-ncftool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ncftool-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7ad3c192a9ec9f9e4b76d99e48dac4c3
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-9999 b/metadata/md5-cache/sec-policy/selinux-nessus-9999
index b322617aca97..798636ff644f 100644
--- a/metadata/md5-cache/sec-policy/selinux-nessus-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nessus-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31c1355f316578abaeb05ecbf5b13910
diff --git a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999 b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
index c496b6f7a853..61f9b2785c2a 100644
--- a/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-networkmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c357f9581a99179ce0d8b9c877277266
diff --git a/metadata/md5-cache/sec-policy/selinux-nginx-9999 b/metadata/md5-cache/sec-policy/selinux-nginx-9999
index efcba4d27261..2f089851095c 100644
--- a/metadata/md5-cache/sec-policy/selinux-nginx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nginx-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7b1ef442aa48658d65a83c02bee89c06
diff --git a/metadata/md5-cache/sec-policy/selinux-nslcd-9999 b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
index 1bf57504a7c2..68e5298091f3 100644
--- a/metadata/md5-cache/sec-policy/selinux-nslcd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nslcd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c446f7012ace9a9db43a518c2347680
diff --git a/metadata/md5-cache/sec-policy/selinux-ntop-9999 b/metadata/md5-cache/sec-policy/selinux-ntop-9999
index b15a792e0633..ce71f10ac387 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntop-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntop-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fbf103caaf3cca031324f16979ce16a7
diff --git a/metadata/md5-cache/sec-policy/selinux-ntp-9999 b/metadata/md5-cache/sec-policy/selinux-ntp-9999
index d190af81d74f..2fdb44bf66d0 100644
--- a/metadata/md5-cache/sec-policy/selinux-ntp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ntp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=87b68d30bceb84b9c11b12be1977fd2d
diff --git a/metadata/md5-cache/sec-policy/selinux-nut-9999 b/metadata/md5-cache/sec-policy/selinux-nut-9999
index 2dae4f5902fc..00c842d68a0d 100644
--- a/metadata/md5-cache/sec-policy/selinux-nut-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nut-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1d30a6aa234768d3095ae53fc3152780
diff --git a/metadata/md5-cache/sec-policy/selinux-nx-9999 b/metadata/md5-cache/sec-policy/selinux-nx-9999
index aff6a34bb643..b0f17ddcdbd4 100644
--- a/metadata/md5-cache/sec-policy/selinux-nx-9999
+++ b/metadata/md5-cache/sec-policy/selinux-nx-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=acf3e6f4965fe2ff30b6914d485b9c2d
diff --git a/metadata/md5-cache/sec-policy/selinux-oddjob-9999 b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
index 0c7a43c55956..014b17d9ed86 100644
--- a/metadata/md5-cache/sec-policy/selinux-oddjob-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oddjob-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db16ec3b349b92fc833ced064440425e
diff --git a/metadata/md5-cache/sec-policy/selinux-oident-9999 b/metadata/md5-cache/sec-policy/selinux-oident-9999
index e94394ab09f5..26ba2671a1b6 100644
--- a/metadata/md5-cache/sec-policy/selinux-oident-9999
+++ b/metadata/md5-cache/sec-policy/selinux-oident-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=03b95659edaef8cb784fd83ee20276ec
diff --git a/metadata/md5-cache/sec-policy/selinux-openct-9999 b/metadata/md5-cache/sec-policy/selinux-openct-9999
index f5b3fd980c04..d73ea6171cc6 100644
--- a/metadata/md5-cache/sec-policy/selinux-openct-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openct-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0bdd6f58464bf50d67b4202df3c9b49c
diff --git a/metadata/md5-cache/sec-policy/selinux-openrc-9999 b/metadata/md5-cache/sec-policy/selinux-openrc-9999
index 9c691f8203f4..0f671a5913f3 100644
--- a/metadata/md5-cache/sec-policy/selinux-openrc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openrc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=01930e3b7bdfda342f0a0ec7021c0e5a
diff --git a/metadata/md5-cache/sec-policy/selinux-openvpn-9999 b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
index dd2bd65dc0ac..aa8494a0d794 100644
--- a/metadata/md5-cache/sec-policy/selinux-openvpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-openvpn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ef797ddfe97dcf1815d3554fd62e6d35
diff --git a/metadata/md5-cache/sec-policy/selinux-pan-9999 b/metadata/md5-cache/sec-policy/selinux-pan-9999
index 97e684d18938..3021ca16973f 100644
--- a/metadata/md5-cache/sec-policy/selinux-pan-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pan-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=71622a9bd5d884c5960ae5e8ad16887b
diff --git a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999 b/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
index 68d3497a184f..d5e4ad282104 100644
--- a/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pcmcia-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ed5d1752911258e913795544ec9c8412
diff --git a/metadata/md5-cache/sec-policy/selinux-perdition-9999 b/metadata/md5-cache/sec-policy/selinux-perdition-9999
index cb1d19a08e9c..7c040f94ae59 100644
--- a/metadata/md5-cache/sec-policy/selinux-perdition-9999
+++ b/metadata/md5-cache/sec-policy/selinux-perdition-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e9d087a0cdef9c5feca7976fe9a842d5
diff --git a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999 b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
index 3213ed97fe46..3d85dfc67631 100644
--- a/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-phpfpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e6dd81435be732d55d2dfb856cc5fcd9
diff --git a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999 b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
index de6a81cffa19..6dc35c6a05e5 100644
--- a/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-plymouthd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=925b0aecd1c8662a8533d1f0c0fbe11e
diff --git a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999 b/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
index a2c324c470ac..9b9da07ad603 100644
--- a/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
+++ b/metadata/md5-cache/sec-policy/selinux-podsleuth-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3d207e3fa4f8504bf8aad604b3de9192
diff --git a/metadata/md5-cache/sec-policy/selinux-policykit-9999 b/metadata/md5-cache/sec-policy/selinux-policykit-9999
index bc0312dd9a66..6b1d0cc03ca5 100644
--- a/metadata/md5-cache/sec-policy/selinux-policykit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-policykit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bb67b60543bec039820b963b948f3cc6
diff --git a/metadata/md5-cache/sec-policy/selinux-portmap-9999 b/metadata/md5-cache/sec-policy/selinux-portmap-9999
index 7996dfa81a6f..ce23e57fe9e4 100644
--- a/metadata/md5-cache/sec-policy/selinux-portmap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-portmap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3b2d5986e74ff0edebf9a83527a4936a
diff --git a/metadata/md5-cache/sec-policy/selinux-postfix-9999 b/metadata/md5-cache/sec-policy/selinux-postfix-9999
index dae19f777381..2e114b1a3708 100644
--- a/metadata/md5-cache/sec-policy/selinux-postfix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postfix-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16b0a59719359041d2eeaca0e7a3fbd5
diff --git a/metadata/md5-cache/sec-policy/selinux-postgresql-9999 b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
index e0c704725d2e..0318cc6ea92b 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgresql-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgresql-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=16246582f289cf05cf0ad3e812ee8977
diff --git a/metadata/md5-cache/sec-policy/selinux-postgrey-9999 b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
index 866ebaf7db24..365f934a6a59 100644
--- a/metadata/md5-cache/sec-policy/selinux-postgrey-9999
+++ b/metadata/md5-cache/sec-policy/selinux-postgrey-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de286acf3d1229af95a3e31443df4e17
diff --git a/metadata/md5-cache/sec-policy/selinux-ppp-9999 b/metadata/md5-cache/sec-policy/selinux-ppp-9999
index 96449f70ad95..d9efad40b863 100644
--- a/metadata/md5-cache/sec-policy/selinux-ppp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ppp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e5ce12a3e8cba63ff948f2e4ed0d5bd5
diff --git a/metadata/md5-cache/sec-policy/selinux-prelink-9999 b/metadata/md5-cache/sec-policy/selinux-prelink-9999
index 444528415a61..af9a342dba6e 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelink-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelink-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=45585ee6c1fccae1da55a79b7539bcf8
diff --git a/metadata/md5-cache/sec-policy/selinux-prelude-9999 b/metadata/md5-cache/sec-policy/selinux-prelude-9999
index fc247c0fa4ed..758b0ee1e5f2 100644
--- a/metadata/md5-cache/sec-policy/selinux-prelude-9999
+++ b/metadata/md5-cache/sec-policy/selinux-prelude-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f9c02f2eea0348782069db76a267ee7
diff --git a/metadata/md5-cache/sec-policy/selinux-privoxy-9999 b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
index 490b6a73cd7e..e3c9def16ddc 100644
--- a/metadata/md5-cache/sec-policy/selinux-privoxy-9999
+++ b/metadata/md5-cache/sec-policy/selinux-privoxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd493a60c0724bce37ab568e3deed53d
diff --git a/metadata/md5-cache/sec-policy/selinux-procmail-9999 b/metadata/md5-cache/sec-policy/selinux-procmail-9999
index 5d0a94b236dd..cf76ffb4aa4f 100644
--- a/metadata/md5-cache/sec-policy/selinux-procmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-procmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be1b938014f3ec642efedd7340547814
diff --git a/metadata/md5-cache/sec-policy/selinux-psad-9999 b/metadata/md5-cache/sec-policy/selinux-psad-9999
index 5d6edafd000f..644fae426dc0 100644
--- a/metadata/md5-cache/sec-policy/selinux-psad-9999
+++ b/metadata/md5-cache/sec-policy/selinux-psad-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f1aee32cceca01830dd126be2c951ecb
diff --git a/metadata/md5-cache/sec-policy/selinux-publicfile-9999 b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
index 5fd24bb0815e..05f396accb7e 100644
--- a/metadata/md5-cache/sec-policy/selinux-publicfile-9999
+++ b/metadata/md5-cache/sec-policy/selinux-publicfile-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=31a2f29e7fe97290d30e5d9d481c1ac0
diff --git a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999 b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
index e438dffd0511..f37056d7d83f 100644
--- a/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pulseaudio-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f5e01081c09de9f3533d1dd941b15a62
diff --git a/metadata/md5-cache/sec-policy/selinux-puppet-9999 b/metadata/md5-cache/sec-policy/selinux-puppet-9999
index 72bcea1b6018..10f29e2e0c25 100644
--- a/metadata/md5-cache/sec-policy/selinux-puppet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-puppet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=797c203f8bf1bb83c8d9e6f9b8930fa2
diff --git a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999 b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
index 646cf66bd051..a081f2d1044d 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyicqt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fb73c68574bf92e55290ef96f2c34af5
diff --git a/metadata/md5-cache/sec-policy/selinux-pyzor-9999 b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
index 8cd3141be6b3..7dd5f97029de 100644
--- a/metadata/md5-cache/sec-policy/selinux-pyzor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-pyzor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=679a892cfd18fca5c955d73a34e6fc97
diff --git a/metadata/md5-cache/sec-policy/selinux-qemu-9999 b/metadata/md5-cache/sec-policy/selinux-qemu-9999
index e26e7f46bb46..ab2b444584f9 100644
--- a/metadata/md5-cache/sec-policy/selinux-qemu-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qemu-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-virt >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b76e10186f6791c155418c72b7c90854
diff --git a/metadata/md5-cache/sec-policy/selinux-qmail-9999 b/metadata/md5-cache/sec-policy/selinux-qmail-9999
index e097a7b59e83..caf99ff5600e 100644
--- a/metadata/md5-cache/sec-policy/selinux-qmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-qmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d84fb31015e14ba99b429f718e729464
diff --git a/metadata/md5-cache/sec-policy/selinux-quota-9999 b/metadata/md5-cache/sec-policy/selinux-quota-9999
index f02a6d93dc47..4a495d4864f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-quota-9999
+++ b/metadata/md5-cache/sec-policy/selinux-quota-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0880daea429f9d5f7addda71dae305b2
diff --git a/metadata/md5-cache/sec-policy/selinux-radius-9999 b/metadata/md5-cache/sec-policy/selinux-radius-9999
index 362e5d35dfe6..37c24fcee4a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-radius-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radius-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e773d1f404c99e8aa78fcc9dfbdd0ed4
diff --git a/metadata/md5-cache/sec-policy/selinux-radvd-9999 b/metadata/md5-cache/sec-policy/selinux-radvd-9999
index 123da21bc305..c19021a5e7ce 100644
--- a/metadata/md5-cache/sec-policy/selinux-radvd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-radvd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f15c3a5ecdb3508c42dc07c9bfaa20cf
diff --git a/metadata/md5-cache/sec-policy/selinux-razor-9999 b/metadata/md5-cache/sec-policy/selinux-razor-9999
index bf5f2aad6534..44e1c4312de2 100644
--- a/metadata/md5-cache/sec-policy/selinux-razor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-razor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=db399d1fd123e80cb1a5b0ab065f210a
diff --git a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999 b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
index 6f7a0d477c4a..fa56be68b010 100644
--- a/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-remotelogin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a00e61f07f4f9d8c982e1782b7a4849b
diff --git a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999 b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
index c13f151b3a06..1c2b61c26678 100644
--- a/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rgmanager-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6567975beb4effd7f7d1513e414618db
diff --git a/metadata/md5-cache/sec-policy/selinux-roundup-9999 b/metadata/md5-cache/sec-policy/selinux-roundup-9999
index 722d07e9c660..fec0aad26774 100644
--- a/metadata/md5-cache/sec-policy/selinux-roundup-9999
+++ b/metadata/md5-cache/sec-policy/selinux-roundup-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d864685e208b030f52de6fe5c282871e
diff --git a/metadata/md5-cache/sec-policy/selinux-rpc-9999 b/metadata/md5-cache/sec-policy/selinux-rpc-9999
index a847011b60e9..e96b73f19547 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpc-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a12ba2ef79add79192763495b488883
diff --git a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999 b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
index 2447137ecc26..5ecba01877fe 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpcbind-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=95fd381a5ceda7ddcab3a539333054f4
diff --git a/metadata/md5-cache/sec-policy/selinux-rpm-9999 b/metadata/md5-cache/sec-policy/selinux-rpm-9999
index 087268b627a0..7ac62063123b 100644
--- a/metadata/md5-cache/sec-policy/selinux-rpm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rpm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9e16906b80559023a931e648aeaec827
diff --git a/metadata/md5-cache/sec-policy/selinux-rssh-9999 b/metadata/md5-cache/sec-policy/selinux-rssh-9999
index 8ba936290c9e..7115dd2ffa42 100644
--- a/metadata/md5-cache/sec-policy/selinux-rssh-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rssh-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=814094a08da42fd945798952919b3ae8
diff --git a/metadata/md5-cache/sec-policy/selinux-rtkit-9999 b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
index b9cff7f2654a..8162aacce87c 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtkit-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtkit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-dbus >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=134d8cb509ca231930c6c072065517d8
diff --git a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999 b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
index 5838108357c3..2c61fceb322d 100644
--- a/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-rtorrent-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9262225e169c7bf40f4b12e74802a9e1
diff --git a/metadata/md5-cache/sec-policy/selinux-samba-9999 b/metadata/md5-cache/sec-policy/selinux-samba-9999
index c56a7388fd8b..370cf784d1d2 100644
--- a/metadata/md5-cache/sec-policy/selinux-samba-9999
+++ b/metadata/md5-cache/sec-policy/selinux-samba-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=22deaa2760d0601f31902565f71ceb66
diff --git a/metadata/md5-cache/sec-policy/selinux-sasl-9999 b/metadata/md5-cache/sec-policy/selinux-sasl-9999
index 844925e50143..24b3e72cd654 100644
--- a/metadata/md5-cache/sec-policy/selinux-sasl-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sasl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=bde697766f334583b2cc9c49d0800bc3
diff --git a/metadata/md5-cache/sec-policy/selinux-screen-9999 b/metadata/md5-cache/sec-policy/selinux-screen-9999
index 9dcc13d0d1b6..a1f6bd97536b 100644
--- a/metadata/md5-cache/sec-policy/selinux-screen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-screen-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6b76168a4822a73c8e3f4c51071b677e
diff --git a/metadata/md5-cache/sec-policy/selinux-sendmail-9999 b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
index 678e7e1841af..eb3ed9f7f5f0 100644
--- a/metadata/md5-cache/sec-policy/selinux-sendmail-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sendmail-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cba778d8ecd97f89e4595bebedc0bccf
diff --git a/metadata/md5-cache/sec-policy/selinux-sensord-9999 b/metadata/md5-cache/sec-policy/selinux-sensord-9999
index abe2c1a8b031..a5c8fc6d8f02 100644
--- a/metadata/md5-cache/sec-policy/selinux-sensord-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sensord-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=09a0307ff9b3e1affd79d19e78928dbf
diff --git a/metadata/md5-cache/sec-policy/selinux-shorewall-9999 b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
index 32e0897e5e4f..cdbb468076b8 100644
--- a/metadata/md5-cache/sec-policy/selinux-shorewall-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shorewall-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e51b7470f4c5bde4b58da85cd76630d4
diff --git a/metadata/md5-cache/sec-policy/selinux-shutdown-9999 b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
index a8fe7cbf56fb..94650c2fe820 100644
--- a/metadata/md5-cache/sec-policy/selinux-shutdown-9999
+++ b/metadata/md5-cache/sec-policy/selinux-shutdown-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6837b97ec6220a78f575902a6f14e12e
diff --git a/metadata/md5-cache/sec-policy/selinux-skype-9999 b/metadata/md5-cache/sec-policy/selinux-skype-9999
index eb0ec969bdd4..7b6c99316e2a 100644
--- a/metadata/md5-cache/sec-policy/selinux-skype-9999
+++ b/metadata/md5-cache/sec-policy/selinux-skype-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=58daf747f170d1acea95e2ac58b047f2
diff --git a/metadata/md5-cache/sec-policy/selinux-slocate-9999 b/metadata/md5-cache/sec-policy/selinux-slocate-9999
index 2ced01c115a1..f80ad6fe585a 100644
--- a/metadata/md5-cache/sec-policy/selinux-slocate-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slocate-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c54b04e295612920ce2e17bb82bb0e9c
diff --git a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999 b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
index c11bd9126579..88ae391cec6b 100644
--- a/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
+++ b/metadata/md5-cache/sec-policy/selinux-slrnpull-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4b72693d920e5c9b2bb354ca2391154
diff --git a/metadata/md5-cache/sec-policy/selinux-smartmon-9999 b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
index 63a75dfdfa99..c0cf047cc665 100644
--- a/metadata/md5-cache/sec-policy/selinux-smartmon-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smartmon-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2efa5bcc352104513375e5e335fb738b
diff --git a/metadata/md5-cache/sec-policy/selinux-smokeping-9999 b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
index 96735f27b8ff..07f56c9a609a 100644
--- a/metadata/md5-cache/sec-policy/selinux-smokeping-9999
+++ b/metadata/md5-cache/sec-policy/selinux-smokeping-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e70ad093fe34f9edd510bc43c80d47b2
diff --git a/metadata/md5-cache/sec-policy/selinux-snmp-9999 b/metadata/md5-cache/sec-policy/selinux-snmp-9999
index 8a042170cb03..4e19e1c5abc5 100644
--- a/metadata/md5-cache/sec-policy/selinux-snmp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snmp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1ffdfe50797d5c054dbbb67b2035a7fe
diff --git a/metadata/md5-cache/sec-policy/selinux-snort-9999 b/metadata/md5-cache/sec-policy/selinux-snort-9999
index 0331e53ca468..12b37032f2ee 100644
--- a/metadata/md5-cache/sec-policy/selinux-snort-9999
+++ b/metadata/md5-cache/sec-policy/selinux-snort-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b569a3aa2b67d0abae905a394438c5fc
diff --git a/metadata/md5-cache/sec-policy/selinux-soundserver-9999 b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
index 904ea171f5b2..a98ff697ff8b 100644
--- a/metadata/md5-cache/sec-policy/selinux-soundserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-soundserver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c4cc4e4e24051965780a1a0c642ec037
diff --git a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999 b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
index acbf6e1f82e0..9e38dc49b0b5 100644
--- a/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
+++ b/metadata/md5-cache/sec-policy/selinux-spamassassin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=6e380c4f34d5d40321eb4e76a818afbc
diff --git a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999 b/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
index 94d448683146..684d1c406218 100644
--- a/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
+++ b/metadata/md5-cache/sec-policy/selinux-speedtouch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=83765a8e2a584201f90944d6f66580ff
diff --git a/metadata/md5-cache/sec-policy/selinux-squid-9999 b/metadata/md5-cache/sec-policy/selinux-squid-9999
index 6d2f5b097613..409dc5aff6f1 100644
--- a/metadata/md5-cache/sec-policy/selinux-squid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-squid-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-apache >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ccede77c4481a9a0756b538c23f2b70d
diff --git a/metadata/md5-cache/sec-policy/selinux-sssd-9999 b/metadata/md5-cache/sec-policy/selinux-sssd-9999
index 4e33468ddfe1..d8cb3116d5ed 100644
--- a/metadata/md5-cache/sec-policy/selinux-sssd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sssd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d9893c2092fefd92c5571cee3aae3a50
diff --git a/metadata/md5-cache/sec-policy/selinux-stunnel-9999 b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
index ffb80eb41e7e..cca817af4cb0 100644
--- a/metadata/md5-cache/sec-policy/selinux-stunnel-9999
+++ b/metadata/md5-cache/sec-policy/selinux-stunnel-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=853f89eeb7a76767dfe0080345a9f40f
diff --git a/metadata/md5-cache/sec-policy/selinux-sudo-9999 b/metadata/md5-cache/sec-policy/selinux-sudo-9999
index 0bd0871ca4b4..bfc58dc25097 100644
--- a/metadata/md5-cache/sec-policy/selinux-sudo-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sudo-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0be6c35c36eba9ce7eba36534a6d1bd1
diff --git a/metadata/md5-cache/sec-policy/selinux-sxid-9999 b/metadata/md5-cache/sec-policy/selinux-sxid-9999
index bc01017fb3a2..253e5d58cb29 100644
--- a/metadata/md5-cache/sec-policy/selinux-sxid-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sxid-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5ba0b51b6015078d569cec6c57f2efca
diff --git a/metadata/md5-cache/sec-policy/selinux-sysstat-9999 b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
index a5b68ebfba73..ccfa37943acf 100644
--- a/metadata/md5-cache/sec-policy/selinux-sysstat-9999
+++ b/metadata/md5-cache/sec-policy/selinux-sysstat-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7df21360f2415b7a84a001d67d3cf349
diff --git a/metadata/md5-cache/sec-policy/selinux-tcpd-9999 b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
index d96464562baf..de6b0d5208bc 100644
--- a/metadata/md5-cache/sec-policy/selinux-tcpd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tcpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=a73afb38985c520f4fe3120b616f0a11
diff --git a/metadata/md5-cache/sec-policy/selinux-telnet-9999 b/metadata/md5-cache/sec-policy/selinux-telnet-9999
index 81a51dfcdeba..47995276e86b 100644
--- a/metadata/md5-cache/sec-policy/selinux-telnet-9999
+++ b/metadata/md5-cache/sec-policy/selinux-telnet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-remotelogin >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fedcdb54dc06c4a3f24d7f8037ef6789
diff --git a/metadata/md5-cache/sec-policy/selinux-tftp-9999 b/metadata/md5-cache/sec-policy/selinux-tftp-9999
index 872dff405b0e..7e3b74c9cd4c 100644
--- a/metadata/md5-cache/sec-policy/selinux-tftp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tftp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51a75d653ba6f1aae80bfd522fa20fed
diff --git a/metadata/md5-cache/sec-policy/selinux-tgtd-9999 b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
index fc24323eedeb..fa998d8d1317 100644
--- a/metadata/md5-cache/sec-policy/selinux-tgtd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tgtd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f605d940f6692eb5963e65c8cd73232b
diff --git a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999 b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
index 9053b944568d..7485e215e67e 100644
--- a/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
+++ b/metadata/md5-cache/sec-policy/selinux-thunderbird-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=54e8019da93829580852d3a9c40633ff
diff --git a/metadata/md5-cache/sec-policy/selinux-timidity-9999 b/metadata/md5-cache/sec-policy/selinux-timidity-9999
index b3fe8a770d21..e51a57e4418e 100644
--- a/metadata/md5-cache/sec-policy/selinux-timidity-9999
+++ b/metadata/md5-cache/sec-policy/selinux-timidity-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=2b740083888fba5e5d4d8499b4765d63
diff --git a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999 b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
index cd91f4eb8a65..99275861399b 100644
--- a/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tmpreaper-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd1e9d2ed39761c55a6fc88a677a8131
diff --git a/metadata/md5-cache/sec-policy/selinux-tor-9999 b/metadata/md5-cache/sec-policy/selinux-tor-9999
index 1c8d99917bd4..f2e84487ffad 100644
--- a/metadata/md5-cache/sec-policy/selinux-tor-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tor-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae21be8ed96690d1035559854aa49fdb
diff --git a/metadata/md5-cache/sec-policy/selinux-tripwire-9999 b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
index c5836491633e..80bd04e9ddb8 100644
--- a/metadata/md5-cache/sec-policy/selinux-tripwire-9999
+++ b/metadata/md5-cache/sec-policy/selinux-tripwire-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0c5ac9c4738742c9a4940a8f4a33b2cf
diff --git a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999 b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
index 655c0d048d4d..c89a49b6fb75 100644
--- a/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ucspitcp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b9e56b93fecc9f0b19b2504ab0ea5502
diff --git a/metadata/md5-cache/sec-policy/selinux-ulogd-9999 b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
index c376c592f5c1..0af5f1872671 100644
--- a/metadata/md5-cache/sec-policy/selinux-ulogd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-ulogd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=274b085419c7910cadaaa95d371aee87
diff --git a/metadata/md5-cache/sec-policy/selinux-uml-9999 b/metadata/md5-cache/sec-policy/selinux-uml-9999
index 50847cd2aa8f..0462a4303a7d 100644
--- a/metadata/md5-cache/sec-policy/selinux-uml-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uml-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=568738239cc4bb514a1c60e74f6e0af4
diff --git a/metadata/md5-cache/sec-policy/selinux-unconfined-9999 b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
index caa9739f2e30..c0618ac2cc6d 100644
--- a/metadata/md5-cache/sec-policy/selinux-unconfined-9999
+++ b/metadata/md5-cache/sec-policy/selinux-unconfined-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8a6ebf4bcc9789c6fc54858ec50f3688
diff --git a/metadata/md5-cache/sec-policy/selinux-uptime-9999 b/metadata/md5-cache/sec-policy/selinux-uptime-9999
index 762bca143b44..239192fe264b 100644
--- a/metadata/md5-cache/sec-policy/selinux-uptime-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uptime-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=92264523b3107c8a788f85151b71658a
diff --git a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999 b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
index b93f1074c6ba..5b9fd80ca133 100644
--- a/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-usbmuxd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e29d95d236498e4da0a436e95b37eaa
diff --git a/metadata/md5-cache/sec-policy/selinux-uucp-9999 b/metadata/md5-cache/sec-policy/selinux-uucp-9999
index 338150697fd2..4b6824057a1d 100644
--- a/metadata/md5-cache/sec-policy/selinux-uucp-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uucp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-inetd >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e084fd8e91fc7e4b87b35eeab66248b7
diff --git a/metadata/md5-cache/sec-policy/selinux-uwimap-9999 b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
index 8c670b58547c..34f169c47368 100644
--- a/metadata/md5-cache/sec-policy/selinux-uwimap-9999
+++ b/metadata/md5-cache/sec-policy/selinux-uwimap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5d1d68bbf360cb031d443ab6960964df
diff --git a/metadata/md5-cache/sec-policy/selinux-varnishd-9999 b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
index 25cf049ea955..06e44853da30 100644
--- a/metadata/md5-cache/sec-policy/selinux-varnishd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-varnishd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=34c8230d6309d29edfbb263cadbc51b4
diff --git a/metadata/md5-cache/sec-policy/selinux-vbetool-9999 b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
index 90bb5bd54892..2b2ac9fb3d17 100644
--- a/metadata/md5-cache/sec-policy/selinux-vbetool-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vbetool-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=b03cb4e2605bfcf755dd2d660097ff5d
diff --git a/metadata/md5-cache/sec-policy/selinux-vdagent-9999 b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
index 7a5aa2724e43..6faf23c67c27 100644
--- a/metadata/md5-cache/sec-policy/selinux-vdagent-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vdagent-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c788c25d2e3bc6733921cd0be5ee9185
diff --git a/metadata/md5-cache/sec-policy/selinux-vde-9999 b/metadata/md5-cache/sec-policy/selinux-vde-9999
index 993c7e66a8d3..211cc353b092 100644
--- a/metadata/md5-cache/sec-policy/selinux-vde-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vde-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=51540d4876c67a6e3c55d5948e6b7854
diff --git a/metadata/md5-cache/sec-policy/selinux-virt-9999 b/metadata/md5-cache/sec-policy/selinux-virt-9999
index 256f2800c39c..2b66cea1f4f5 100644
--- a/metadata/md5-cache/sec-policy/selinux-virt-9999
+++ b/metadata/md5-cache/sec-policy/selinux-virt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=beb2505b21e805b09b0e03da2e84fd83
diff --git a/metadata/md5-cache/sec-policy/selinux-vlock-9999 b/metadata/md5-cache/sec-policy/selinux-vlock-9999
index 94e20d7b24c9..be956d40be07 100644
--- a/metadata/md5-cache/sec-policy/selinux-vlock-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vlock-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d7e02271347c2c2b500a50dbacd721b7
diff --git a/metadata/md5-cache/sec-policy/selinux-vmware-9999 b/metadata/md5-cache/sec-policy/selinux-vmware-9999
index 03cd21072a23..4d278e0d38a2 100644
--- a/metadata/md5-cache/sec-policy/selinux-vmware-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vmware-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ebf0296105ed020f04f69e5c2819e721
diff --git a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999 b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
index 84c5d213f216..f455ef1e816a 100644
--- a/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vnstatd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e8c5f33b45fe2822eb030e1c521e41b2
diff --git a/metadata/md5-cache/sec-policy/selinux-vpn-9999 b/metadata/md5-cache/sec-policy/selinux-vpn-9999
index 20efaa93f303..24e4d9b46a6b 100644
--- a/metadata/md5-cache/sec-policy/selinux-vpn-9999
+++ b/metadata/md5-cache/sec-policy/selinux-vpn-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7dd6ce2ae262b4ade60a3aa7677ee0a8
diff --git a/metadata/md5-cache/sec-policy/selinux-watchdog-9999 b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
index 600404fdb8b3..769ee7167c0e 100644
--- a/metadata/md5-cache/sec-policy/selinux-watchdog-9999
+++ b/metadata/md5-cache/sec-policy/selinux-watchdog-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dac7cf78aa75f072591aa3ad7e80c483
diff --git a/metadata/md5-cache/sec-policy/selinux-webalizer-9999 b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
index 1371420da0d4..8548a51b441e 100644
--- a/metadata/md5-cache/sec-policy/selinux-webalizer-9999
+++ b/metadata/md5-cache/sec-policy/selinux-webalizer-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=768492da6eee2d8e9ade30695385f98d
diff --git a/metadata/md5-cache/sec-policy/selinux-wine-9999 b/metadata/md5-cache/sec-policy/selinux-wine-9999
index b18352a4b8dc..a41bf4fabefc 100644
--- a/metadata/md5-cache/sec-policy/selinux-wine-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wine-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=02841869179f6fb28fa5b21c2d630466
diff --git a/metadata/md5-cache/sec-policy/selinux-wireshark-9999 b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
index 449aabb02333..0358aeb32e58 100644
--- a/metadata/md5-cache/sec-policy/selinux-wireshark-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wireshark-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4453e81f9a37182cdcb86c2133190e52
diff --git a/metadata/md5-cache/sec-policy/selinux-wm-9999 b/metadata/md5-cache/sec-policy/selinux-wm-9999
index c8f1dadc1187..2f5e5c5f9843 100644
--- a/metadata/md5-cache/sec-policy/selinux-wm-9999
+++ b/metadata/md5-cache/sec-policy/selinux-wm-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ac0bc28beb773750e0363d1c86219413
diff --git a/metadata/md5-cache/sec-policy/selinux-xen-9999 b/metadata/md5-cache/sec-policy/selinux-xen-9999
index 31711c82351c..4b5efff53788 100644
--- a/metadata/md5-cache/sec-policy/selinux-xen-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xen-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=239bb651a938014a124e9b396f8d8e6b
diff --git a/metadata/md5-cache/sec-policy/selinux-xfs-9999 b/metadata/md5-cache/sec-policy/selinux-xfs-9999
index 73a207d9e7be..4d406eea24e3 100644
--- a/metadata/md5-cache/sec-policy/selinux-xfs-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xfs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4055c15ab037f7459616821dcef1741f
diff --git a/metadata/md5-cache/sec-policy/selinux-xprint-9999 b/metadata/md5-cache/sec-policy/selinux-xprint-9999
index 5e7168f450c7..eed2ca3edf51 100644
--- a/metadata/md5-cache/sec-policy/selinux-xprint-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xprint-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=07d80bfb55ce623008c6d03a12ccb5ba
diff --git a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999 b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
index 0f16dd7898cc..69462180562a 100644
--- a/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xscreensaver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=sec-policy/selinux-xserver >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2313b099428a7017f85c753b06d722a
diff --git a/metadata/md5-cache/sec-policy/selinux-xserver-9999 b/metadata/md5-cache/sec-policy/selinux-xserver-9999
index fef1c7e385c5..b6e81b579f2c 100644
--- a/metadata/md5-cache/sec-policy/selinux-xserver-9999
+++ b/metadata/md5-cache/sec-policy/selinux-xserver-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=20e4334b820c3a074315d72d87317722
diff --git a/metadata/md5-cache/sec-policy/selinux-zabbix-9999 b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
index 7d4dad031c9a..2aa534f9bf3a 100644
--- a/metadata/md5-cache/sec-policy/selinux-zabbix-9999
+++ b/metadata/md5-cache/sec-policy/selinux-zabbix-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	selinux-policy-2	8e5b959b72fbb85e6205bbde0c5414fa	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c55a6df1915debad1bc15c7028e7b025
diff --git a/metadata/md5-cache/sys-apps/bleachbit-0.9.6 b/metadata/md5-cache/sys-apps/bleachbit-0.9.6
index 0af1b8544e97..bdc5bb151f80 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-0.9.6
+++ b/metadata/md5-cache/sys-apps/bleachbit-0.9.6
@@ -4,11 +4,11 @@ DESCRIPTION=Clean junk to free disk space and to maintain privacy
 EAPI=5
 HOMEPAGE=http://bleachbit.sourceforge.net/
 IUSE=nls python_targets_python2_7 linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_AU linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_it linguas_ja linguas_ko linguas_ku linguas_ky linguas_lt linguas_ms linguas_my linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_ug linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7[sqlite] ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bleachbit/bleachbit-0.9.6.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d2f32d72681f94df2dd91e456fe8aa78
+_md5_=98f527aa8fa1ad56eaadf4e41744c0e0
diff --git a/metadata/md5-cache/sys-apps/busybox-1.19.3-r1 b/metadata/md5-cache/sys-apps/busybox-1.19.3-r1
deleted file mode 100644
index 4ba5c0fc279d..000000000000
--- a/metadata/md5-cache/sys-apps/busybox-1.19.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam ) >=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for rescue and embedded systems
-EAPI=3
-HOMEPAGE=http://www.busybox.net/
-IUSE=ipv6 livecd make-symlinks mdev -pam selinux static elibc_glibc savedconfig
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.busybox.net/downloads/busybox-1.19.3.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5689abdcd14f07ce40da43d9a937f8b0
diff --git a/metadata/md5-cache/sys-apps/busybox-1.20.0 b/metadata/md5-cache/sys-apps/busybox-1.20.0
deleted file mode 100644
index 82cc9012149b..000000000000
--- a/metadata/md5-cache/sys-apps/busybox-1.20.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam ) >=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for rescue and embedded systems
-EAPI=4
-HOMEPAGE=http://www.busybox.net/
-IUSE=ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.busybox.net/downloads/busybox-1.20.0.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=110a2f05714edd60444eef99cd1a254e
diff --git a/metadata/md5-cache/sys-apps/busybox-1.20.1 b/metadata/md5-cache/sys-apps/busybox-1.20.1
deleted file mode 100644
index 6e3228b9706b..000000000000
--- a/metadata/md5-cache/sys-apps/busybox-1.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam ) >=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for rescue and embedded systems
-EAPI=4
-HOMEPAGE=http://www.busybox.net/
-IUSE=ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static savedconfig
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.busybox.net/downloads/busybox-1.20.1.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3ed4d1fc7eb099bbbd0966cfeaa68891
diff --git a/metadata/md5-cache/sys-apps/busybox-9999 b/metadata/md5-cache/sys-apps/busybox-9999
index e2ac2cd661a8..3921e438747d 100644
--- a/metadata/md5-cache/sys-apps/busybox-9999
+++ b/metadata/md5-cache/sys-apps/busybox-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam )
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06f3baa32c4c3198ebd7c738801439fc
diff --git a/metadata/md5-cache/sys-apps/dtc-9999 b/metadata/md5-cache/sys-apps/dtc-9999
index 5776cde518d3..23b9535bb2f1 100644
--- a/metadata/md5-cache/sys-apps/dtc-9999
+++ b/metadata/md5-cache/sys-apps/dtc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://git.jdl.com/gitweb/?p=dtc.git
 IUSE=static-libs
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=642cf4730955f5f40c9c91a19f208ffb
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 7ec07c0aed81..c716a0f2fe56 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -7,5 +7,5 @@ IUSE=python static-libs zlib
 LICENSE=BSD-2
 RDEPEND=zlib? ( sys-libs/zlib ) python? ( dev-lang/python )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e1faef8b5bb374abe74128eeca17e3f4
diff --git a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999 b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
index 718b8b66a3be..cb8e61d8e4a1 100644
--- a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
+++ b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/gentoo-systemd-integration
 LICENSE=BSD
 RDEPEND=!<=sys-apps/systemd-206 !=sys-apps/systemd-9999
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fc8e18da1501c7fa3d845390616b6463
diff --git a/metadata/md5-cache/sys-apps/hwids-99999999 b/metadata/md5-cache/sys-apps/hwids-99999999
index ea13017e47d2..2760a9c07731 100644
--- a/metadata/md5-cache/sys-apps/hwids-99999999
+++ b/metadata/md5-cache/sys-apps/hwids-99999999
@@ -7,5 +7,5 @@ IUSE=+udev
 LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=!<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=be452ba60760dda21016d0a2f2ce5075
diff --git a/metadata/md5-cache/sys-apps/iproute2-9999 b/metadata/md5-cache/sys-apps/iproute2-9999
index 8fddbae0babc..b15900aaaf3b 100644
--- a/metadata/md5-cache/sys-apps/iproute2-9999
+++ b/metadata/md5-cache/sys-apps/iproute2-9999
@@ -7,5 +7,5 @@ IUSE=atm berkdb +iptables ipv6 minimal
 LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=edaf234b560df078f583c0df4b29dbe3
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-9999 b/metadata/md5-cache/sys-apps/kexec-tools-9999
index 565aaed8b46e..093fcbf2ba01 100644
--- a/metadata/md5-cache/sys-apps/kexec-tools-9999
+++ b/metadata/md5-cache/sys-apps/kexec-tools-9999
@@ -7,5 +7,5 @@ IUSE=xen zlib
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=8d6561593ff2a1c6d9d3e57c3736a1f3
diff --git a/metadata/md5-cache/sys-apps/kmod-9999 b/metadata/md5-cache/sys-apps/kmod-9999
index f7cc5c1ccfda..733d62361252 100644
--- a/metadata/md5-cache/sys-apps/kmod-9999
+++ b/metadata/md5-cache/sys-apps/kmod-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) openrc? ( !<sys-apps/openrc-0.12 ) zlib? ( >=sys-libs/zlib-1.2.6 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58c9d7ebb5156010497b4c50a047741e
diff --git a/metadata/md5-cache/sys-apps/kmscon-9999 b/metadata/md5-cache/sys-apps/kmscon-9999
index a67de6a37c36..3987b9bdb45c 100644
--- a/metadata/md5-cache/sys-apps/kmscon-9999
+++ b/metadata/md5-cache/sys-apps/kmscon-9999
@@ -8,5 +8,5 @@ LICENSE=MIT LGPL-2.1 BSD-2
 RDEPEND=dev-libs/glib:2 >=virtual/udev-172 x11-libs/libxkbcommon dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm >=media-libs/mesa-8.0.3[egl,gbm] ) truetype? ( media-libs/freetype:2 ) gles2? ( >=media-libs/mesa-8.0.3[gles2] ) pango? ( x11-libs/pango ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) cairo? ( x11-libs/cairo ) pixman? ( x11-libs/pixman ) wayland? ( dev-libs/wayland ) x11-misc/xkeyboard-config
 REQUIRED_USE=gles2? ( drm ) multiseat? ( systemd )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=62b12c76121abd33c2e87c57f735deac
diff --git a/metadata/md5-cache/sys-apps/net-tools-9999 b/metadata/md5-cache/sys-apps/net-tools-9999
index ccc056b4699f..49a9dc73ce32 100644
--- a/metadata/md5-cache/sys-apps/net-tools-9999
+++ b/metadata/md5-cache/sys-apps/net-tools-9999
@@ -7,5 +7,5 @@ IUSE=nls old-output selinux static
 LICENSE=GPL-2
 RDEPEND=!<sys-apps/openrc-0.9.9.3 selinux? ( sys-libs/libselinux )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05bcb138a041814869a891d2e4b4f9ef
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index 2e6dfc184eca..430aaf240138 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=>=sys-apps/baselayout-2.1-r1 kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) tools? ( dev-lang/perl ) kernel_linux? ( sys-process/psmisc ) selinux? ( sec-policy/selinux-openrc ) !<sys-fs/udev-init-scripts-17 !<sys-fs/udev-133 !prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8703608cf5343c14ed5848ecc14b55b3
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.1.10 b/metadata/md5-cache/sys-apps/pciutils-3.1.10
deleted file mode 100644
index 96bf21bdd1e4..000000000000
--- a/metadata/md5-cache/sys-apps/pciutils-3.1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) )
-DESCRIPTION=Various utilities dealing with the PCI bus
-EAPI=4
-HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git
-IUSE=static-libs zlib
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=static-libs? ( zlib? ( sys-libs/zlib[static-libs(+)] ) ) !static-libs? ( zlib? ( sys-libs/zlib ) ) sys-apps/hwids
-SLOT=0
-SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.1.10.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5f489516396dc6f89d0be62d391a9c9d
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.1.9-r1 b/metadata/md5-cache/sys-apps/pciutils-3.1.9-r1
deleted file mode 100644
index 7d0f5448c69c..000000000000
--- a/metadata/md5-cache/sys-apps/pciutils-3.1.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=zlib? ( sys-libs/zlib )
-DESCRIPTION=Various utilities dealing with the PCI bus
-EAPI=4
-HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git
-IUSE=compress-db network-cron static-libs zlib
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=zlib? ( sys-libs/zlib )
-REQUIRED_USE=compress-db? ( zlib )
-SLOT=0
-SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.1.9.tar.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2f243dad7b47dda69740bf9b7c338e3c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index cd2767ecd144..44a16d03d099 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -7,5 +7,5 @@ IUSE=+doc
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.5 =dev-python/snakeoil-9999 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) dev-lang/python
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=618fb08c641664e0757eba00cd464352
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index b82ff57bcef8..c328301463d5 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=234d26e2426aec5be0421ba728ea41f9
diff --git a/metadata/md5-cache/sys-apps/systemd-9999-r1 b/metadata/md5-cache/sys-apps/systemd-9999-r1
index 395e25859e26..a1962d787cbc 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999-r1
+++ b/metadata/md5-cache/sys-apps/systemd-9999-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1 MIT
 PDEPEND=>=sys-apps/hwids-20130717-r1[udev] policykit? ( sys-auth/polkit )
 RDEPEND=>=sys-apps/dbus-1.6.8-r1 >=sys-apps/util-linux-2.20 sys-libs/libcap acl? ( sys-apps/acl ) audit? ( >=sys-process/audit-2 ) cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) gudev? ( >=dev-libs/glib-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) http? ( net-libs/libmicrohttpd ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pam? ( virtual/pam ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode ) selinux? ( sys-libs/libselinux ) tcpd? ( sys-apps/tcp-wrappers ) xattr? ( sys-apps/attr ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 openrc? ( >=sys-fs/udev-init-scripts-25 ) || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !vanilla? ( sys-apps/gentoo-systemd-integration ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.10 !sys-fs/udev
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8ca4237e18e60f45aa654b83fc190e9c
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-9999 b/metadata/md5-cache/sys-apps/systemd-ui-9999
index a073ab8c1972..0fea8f47b0d1 100644
--- a/metadata/md5-cache/sys-apps/systemd-ui-9999
+++ b/metadata/md5-cache/sys-apps/systemd-ui-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
 LICENSE=GPL-2
 RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:2 >=x11-libs/libnotify-0.7
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=b12e3fb1d8a19b33b10a03232045e5e5
diff --git a/metadata/md5-cache/sys-apps/uam-9999 b/metadata/md5-cache/sys-apps/uam-9999
index 0562dff098b2..868801ccf755 100644
--- a/metadata/md5-cache/sys-apps/uam-9999
+++ b/metadata/md5-cache/sys-apps/uam-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/uam/
 LICENSE=BSD
 RDEPEND=virtual/udev
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5adb07e4c21ee624bc38aa4ba0f4b1af
diff --git a/metadata/md5-cache/sys-apps/usbredir-9999 b/metadata/md5-cache/sys-apps/usbredir-9999
index 4a119419cf51..7fcc6ac165a7 100644
--- a/metadata/md5-cache/sys-apps/usbredir-9999
+++ b/metadata/md5-cache/sys-apps/usbredir-9999
@@ -7,5 +7,5 @@ IUSE=static-libs
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=98099e9674b55225aecfe401fe3f564c
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.23.2-r1 b/metadata/md5-cache/sys-apps/util-linux-2.23.2-r1
new file mode 100644
index 000000000000..13e52bcdfc67
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.23.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r5 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-1.3-r2 caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) udev? ( virtual/udev ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers
+DESCRIPTION=Various useful Linux utilities
+EAPI=4
+HOMEPAGE=http://www.kernel.org/pub/linux/utils/util-linux/
+IUSE=bash-completion caps +cramfs cytune fdformat ncurses nls old-linux selinux slang static-libs +suid test +tty-helpers udev unicode
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r5 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-1.3-r2 caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) udev? ( virtual/udev )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.23/util-linux-2.23.2.tar.xz
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=018d5e091780cd5f6defa49aebe34591
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index d226781d5b2d..77ea57beaeb7 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -7,5 +7,5 @@ IUSE=bash-completion caps +cramfs cytune fdformat ncurses nls old-linux selinux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r5 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-1.3-r2 caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) udev? ( virtual/udev )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=299fb10d6901e4661ee0e8f3ea042463
diff --git a/metadata/md5-cache/sys-auth/keystone-2013.1.9999 b/metadata/md5-cache/sys-auth/keystone-2013.1.9999
index 64c3cb0c74f4..f91e10c5613f 100644
--- a/metadata/md5-cache/sys-auth/keystone-2013.1.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2013.1.9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( ldap mysql postgres sqlite ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=grizzly
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d47d67e22274a62c39c8610a4d582c4d
diff --git a/metadata/md5-cache/sys-auth/keystone-9999 b/metadata/md5-cache/sys-auth/keystone-9999
index f971d664ea90..12257d0dda60 100644
--- a/metadata/md5-cache/sys-auth/keystone-9999
+++ b/metadata/md5-cache/sys-auth/keystone-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( ldap mysql postgres sqlite ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=git-head
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=78101262eef9df38ff77e12c5763aa86
diff --git a/metadata/md5-cache/sys-block/lio-utils-9999 b/metadata/md5-cache/sys-block/lio-utils-9999
index 7bec4ae8adc5..9c7db7dc8b26 100644
--- a/metadata/md5-cache/sys-block/lio-utils-9999
+++ b/metadata/md5-cache/sys-block/lio-utils-9999
@@ -7,5 +7,5 @@ IUSE=snmp
 LICENSE=GPL-3
 RDEPEND=snmp? ( net-analyzer/net-snmp ) =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d38d4d5671870472aa1aa3a980cdb896
diff --git a/metadata/md5-cache/sys-block/rtsadmin-9999 b/metadata/md5-cache/sys-block/rtsadmin-9999
index a6f791e78cca..86a5d09c049c 100644
--- a/metadata/md5-cache/sys-block/rtsadmin-9999
+++ b/metadata/md5-cache/sys-block/rtsadmin-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://linux-iscsi.org/
 LICENSE=AGPL-3
 RDEPEND=dev-python/configshell dev-python/rtslib sys-block/lio-utils =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0b64c0cb186acb63b811faf237b6d669
diff --git a/metadata/md5-cache/sys-block/targetcli-9999 b/metadata/md5-cache/sys-block/targetcli-9999
index acbcaa638608..def7dad3cebc 100644
--- a/metadata/md5-cache/sys-block/targetcli-9999
+++ b/metadata/md5-cache/sys-block/targetcli-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://linux-iscsi.org/
 LICENSE=AGPL-3
 RDEPEND=dev-python/configshell dev-python/rtslib sys-block/lio-utils =dev-lang/python-2*
 SLOT=0
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7895bd31768a7fff8c0752adeafc1d0e
diff --git a/metadata/md5-cache/sys-block/whdd-9999 b/metadata/md5-cache/sys-block/whdd-9999
index ae14a9af4d21..5f8eb37230da 100644
--- a/metadata/md5-cache/sys-block/whdd-9999
+++ b/metadata/md5-cache/sys-block/whdd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://github.com/krieger-od/whdd
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog sys-libs/ncurses[unicode] sys-apps/smartmontools
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=23fe27eabdd1058dc058f95bd7c4351c
diff --git a/metadata/md5-cache/sys-boot/palo-9999 b/metadata/md5-cache/sys-boot/palo-9999
index 6ec1dfde1e41..774ad0cd9ac1 100644
--- a/metadata/md5-cache/sys-boot/palo-9999
+++ b/metadata/md5-cache/sys-boot/palo-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=http://parisc-linux.org/
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=1cda3aebe754510a67826c5013631462
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201 b/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
index 88562f4a0e6b..e5fdf0d52135 100644
--- a/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
+++ b/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=69fdf73e99b3a94d8fcc4cbdb1d10cb1
+_md5_=8bf946b4293569a1a00066d1dfc831de
diff --git a/metadata/md5-cache/sys-cluster/ceph-9999 b/metadata/md5-cache/sys-cluster/ceph-9999
index 07c07eb54c15..8e0b0cf800a2 100644
--- a/metadata/md5-cache/sys-cluster/ceph-9999
+++ b/metadata/md5-cache/sys-cluster/ceph-9999
@@ -7,5 +7,5 @@ IUSE=debug fuse gtk libatomic radosgw static-libs tcmalloc
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/snappy dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/leveldb dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9bee39dce8f713753c08bc857146be1f
diff --git a/metadata/md5-cache/sys-cluster/cinder-2012.2.4-r1 b/metadata/md5-cache/sys-cluster/cinder-2012.2.4-r1
deleted file mode 100644
index 0cfa080def50..000000000000
--- a/metadata/md5-cache/sys-cluster/cinder-2012.2.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Cinder is the OpenStack Block storage service. This is a spin out of nova-volumes.
-EAPI=5
-HOMEPAGE=https://launchpad.net/cinder
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/kombu-1.0.4 ~dev-python/lockfile-0.8 >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.3 <=dev-python/sqlalchemy-0.7.9 >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.8 ~dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0 <dev-python/python-glanceclient-2 >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://launchpad.net/cinder/folsom/2012.2.4/+download/cinder-2012.2.4.tar.gz
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4d5f1df64847c6ac2f8c032e843db337
diff --git a/metadata/md5-cache/sys-cluster/cinder-2012.2.4-r2 b/metadata/md5-cache/sys-cluster/cinder-2012.2.4-r2
new file mode 100644
index 000000000000..efb77002c9ae
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-2012.2.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Cinder is the OpenStack Block storage service. This is a spin out of nova-volumes.
+EAPI=5
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/lockfile-0.8 >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.3 <=dev-python/sqlalchemy-0.7.9 >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.8 ~dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/open-iscsi python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://launchpad.net/cinder/folsom/2012.2.4/+download/cinder-2012.2.4.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6737b1365589051fbae9c8e3b56153f
diff --git a/metadata/md5-cache/sys-cluster/cinder-2013.1.3 b/metadata/md5-cache/sys-cluster/cinder-2013.1.3
deleted file mode 100644
index 94624e964d69..000000000000
--- a/metadata/md5-cache/sys-cluster/cinder-2013.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Cinder is the OpenStack Block storage service. This is a spin out of nova-volumes.
-EAPI=5
-HOMEPAGE=https://launchpad.net/cinder
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND==dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lockfile-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.3 <=dev-python/sqlalchemy-0.7.9 >=dev-python/sqlalchemy-migrate-0.7.2 >=dev-python/stevedore-0.8 >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0 <dev-python/python-glanceclient-2 >=dev-python/python-keystoneclient-0.2.0 dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://launchpad.net/cinder/grizzly/2013.1.3/+download/cinder-2013.1.3.tar.gz
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dc471f1a4e20ec8db88189719d0b94d9
diff --git a/metadata/md5-cache/sys-cluster/cinder-2013.1.3-r1 b/metadata/md5-cache/sys-cluster/cinder-2013.1.3-r1
new file mode 100644
index 000000000000..ca0e22b6d353
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-2013.1.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Cinder is the OpenStack Block storage service. This is a spin out of nova-volumes.
+EAPI=5
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lockfile-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.3 <=dev-python/sqlalchemy-0.7.9 >=dev-python/sqlalchemy-migrate-0.7.2 >=dev-python/stevedore-0.8 >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/open-iscsi python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://launchpad.net/cinder/grizzly/2013.1.3/+download/cinder-2013.1.3.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5ded52e0ff4927c27cb25f670ecada9c
diff --git a/metadata/md5-cache/sys-cluster/cinder-2013.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2013.1.9999
index de0d19b9fc33..d01d8817a067 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2013.1.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2013.1.9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=Cinder is the OpenStack Block storage service. This is a spin out of nova-volumes.
 EAPI=5
 HOMEPAGE=https://launchpad.net/cinder
-IUSE=python_targets_python2_7
+IUSE=+api +scheduler +volume python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND==dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lockfile-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.3 <=dev-python/sqlalchemy-0.7.9 >=dev-python/sqlalchemy-migrate-0.7.2 >=dev-python/stevedore-0.8 >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND==dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lockfile-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.3 <=dev-python/sqlalchemy-0.7.9 >=dev-python/sqlalchemy-migrate-0.7.2 >=dev-python/stevedore-0.8 >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/open-iscsi python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=08a1e8d00912d938fe6737c85eb41958
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b68d8007eb31e29afaf9a4171347347a
diff --git a/metadata/md5-cache/sys-cluster/cinder-9999 b/metadata/md5-cache/sys-cluster/cinder-9999
index af97bfae2866..4dc2e2d013e1 100644
--- a/metadata/md5-cache/sys-cluster/cinder-9999
+++ b/metadata/md5-cache/sys-cluster/cinder-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=Cinder is the OpenStack Block storage service. This is a spin out of nova-volumes.
 EAPI=5
 HOMEPAGE=https://launchpad.net/cinder
-IUSE=python_targets_python2_7
+IUSE=+api +scheduler +volume python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND==dev-python/amqplib-0.6.1 >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lockfile-0.8 >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3 >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.3 <=dev-python/sqlalchemy-0.7.9 >=dev-python/sqlalchemy-migrate-0.7.2 >=dev-python/stevedore-0.8 >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0 <dev-python/python-glanceclient-2 >=dev-python/python-keystoneclient-0.2.0 dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.4.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lockfile-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/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/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/webob-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 >=dev-python/sqlalchemy-migrate-0.7.2 >=dev-python/stevedore-0.10 >=dev-python/suds-0.4 >=dev-python/paramiko-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/open-iscsi python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f177c1cbe618bdc84094f4fa4280222b
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9183ad452e5d1404e4f1fdab49605baf
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.4.0 b/metadata/md5-cache/sys-cluster/glusterfs-3.4.0
index 6ff848e779f8..ea514d68b314 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-3.4.0
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.4.0
@@ -11,4 +11,4 @@ REQUIRED_USE=georeplication? ( python_single_target_python2_6? ( python_targets_
 SLOT=0
 SRC_URI=http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.0/glusterfs-3.4.0.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e5e2634e6da8efbeb80e681f9bbb10f8
+_md5_=4bb05cdee67be2d21fb7687cb842bdd0
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-3.4.0-r1 b/metadata/md5-cache/sys-cluster/glusterfs-3.4.0-r1
index 07a2be52f094..752054897710 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-3.4.0-r1
+++ b/metadata/md5-cache/sys-cluster/glusterfs-3.4.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=georeplication? ( python_single_target_python2_6? ( python_targets_
 SLOT=0
 SRC_URI=http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.0/glusterfs-3.4.0.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	elisp-common	57a17c02cd0f6f0c423e3d6de5c83f13	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3311bc38573ce003ed8b8dfd4ccd0755
+_md5_=b13e46c69b5f5e458d43aa5beb9c66ea
diff --git a/metadata/md5-cache/sys-cluster/neutron-2012.2.4-r1 b/metadata/md5-cache/sys-cluster/neutron-2012.2.4-r1
deleted file mode 100644
index fd7b6b70a2c8..000000000000
--- a/metadata/md5-cache/sys-cluster/neutron-2012.2.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/mox-0.5.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Quantum is a virtual network service for Openstack.
-EAPI=5
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND==dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/amqplib-0.6.1 =dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr >=dev-python/python-quantumclient-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev >dev-python/sqlalchemy-0.6.4 <=dev-python/sqlalchemy-0.7.9 =dev-python/webob-1.0.8-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://launchpad.net/neutron/folsom/2012.2.4/+download/quantum-2012.2.4.tar.gz
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=808a081d15e8acdb7b5f142993a1db0f
diff --git a/metadata/md5-cache/sys-cluster/neutron-2012.2.4-r2 b/metadata/md5-cache/sys-cluster/neutron-2012.2.4-r2
new file mode 100644
index 000000000000..a196f9162756
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-2012.2.4-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/mox-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Quantum is a virtual network service for Openstack.
+EAPI=5
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=+dhcp +l3 +metadata +openvswitch +server test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND==dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/sqlalchemy-0.6.4 <=dev-python/sqlalchemy-0.7.9 ~dev-python/webob-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch dhcp? ( net-dns/dnsmasq ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://launchpad.net/neutron/folsom/2012.2.4/+download/quantum-2012.2.4.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7b71e8debe85c666e61c542b9a311268
diff --git a/metadata/md5-cache/sys-cluster/neutron-2013.1.3 b/metadata/md5-cache/sys-cluster/neutron-2013.1.3
deleted file mode 100644
index f4945f2e5a39..000000000000
--- a/metadata/md5-cache/sys-cluster/neutron-2013.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/mox-0.5.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Quantum is a virtual network service for Openstack.
-EAPI=5
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr =dev-python/pyparsing-1.5.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-quantumclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev >dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://launchpad.net/neutron/grizzly/2013.1.3/+download/quantum-2013.1.3.tar.gz
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fbb437494560a15e788d368f7b10249a
diff --git a/metadata/md5-cache/sys-cluster/neutron-2013.1.3-r1 b/metadata/md5-cache/sys-cluster/neutron-2013.1.3-r1
new file mode 100644
index 000000000000..329f35a17c7b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-2013.1.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/mox-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Quantum is a virtual network service for Openstack.
+EAPI=5
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=+dhcp +l3 +metadata +openvswitch +server test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pyparsing-1.5.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-quantumclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch dhcp? ( net-dns/dnsmasq ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://launchpad.net/neutron/grizzly/2013.1.3/+download/quantum-2013.1.3.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3dea8a0ae4d4c6f937ee2e09f780be13
diff --git a/metadata/md5-cache/sys-cluster/neutron-2013.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2013.1.9999
index 7658b0158302..606b8685f935 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2013.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2013.1.9999
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/mox-0.5.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
+DEFINED_PHASES=compile config configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/mox-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=Quantum is a virtual network service for Openstack.
 EAPI=5
 HOMEPAGE=https://launchpad.net/neutron
-IUSE=test python_targets_python2_7
+IUSE=+dhcp +l3 +metadata +openvswitch +server test python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr =dev-python/pyparsing-1.5.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-quantumclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev >dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pyparsing-1.5.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-quantumclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch dhcp? ( net-dns/dnsmasq ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1e816bfb15a2b9dbbb29a0c7c4483741
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=385f312f2f92027fd5635553e3919808
diff --git a/metadata/md5-cache/sys-cluster/neutron-9999 b/metadata/md5-cache/sys-cluster/neutron-9999
index 28a1f0e3b018..1f2a32f49147 100644
--- a/metadata/md5-cache/sys-cluster/neutron-9999
+++ b/metadata/md5-cache/sys-cluster/neutron-9999
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/mox-0.5.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
+DEFINED_PHASES=compile config configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo test? ( dev-python/cliff[python_targets_python2_7] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/mox-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosehtmloutput[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nosexcover dev-python/openstack-nose-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pep8-1.3.3 >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webtest-1.3.3 virtual/python-unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=Quantum is a virtual network service for Openstack.
 EAPI=5
 HOMEPAGE=https://launchpad.net/neutron
-IUSE=test python_targets_python2_7
+IUSE=+dhcp +l3 +metadata +openvswitch +server test python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr =dev-python/pyparsing-1.5.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-neutronclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev >dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/amqplib-0.6.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pyparsing-1.5.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-novaclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-neutronclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 >=dev-python/webob-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/openvswitch dhcp? ( net-dns/dnsmasq ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=90383becc475c038c495aeca8347eb3f
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c3f887d7dfb9b530fb36baa1090470bf
diff --git a/metadata/md5-cache/sys-cluster/nova-2012.2.4-r4 b/metadata/md5-cache/sys-cluster/nova-2012.2.4-r4
deleted file mode 100644
index 65b4bf33017c..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-2012.2.4-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Nova is a cloud computing fabric controller (main part of an IaaS system). It is written in Python.
-EAPI=5
-HOMEPAGE=https://launchpad.net/nova
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND==dev-python/amqplib-0.6.1 >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.9 =dev-python/boto-2.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17 =dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.0.8-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2 dev-python/netaddr =dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://launchpad.net/nova/folsom/2012.2.4/+download/nova-2012.2.4.tar.gz
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f2b29740d7db27d53045b188719c3ece
diff --git a/metadata/md5-cache/sys-cluster/nova-2012.2.4-r5 b/metadata/md5-cache/sys-cluster/nova-2012.2.4-r5
new file mode 100644
index 000000000000..e1430817cbc0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-2012.2.4-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Nova is a cloud computing fabric controller (main part of an IaaS system). It is written in Python.
+EAPI=5
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.9 =dev-python/boto-2.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/kombu-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webob-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://launchpad.net/nova/folsom/2012.2.4/+download/nova-2012.2.4.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9ed2903e85e3b21d3fb396c065fc9001
diff --git a/metadata/md5-cache/sys-cluster/nova-2013.1.3 b/metadata/md5-cache/sys-cluster/nova-2013.1.3-r2
similarity index 50%
rename from metadata/md5-cache/sys-cluster/nova-2013.1.3
rename to metadata/md5-cache/sys-cluster/nova-2013.1.3-r2
index 2acdd5b0eeab..f8d0b1e0cdce 100644
--- a/metadata/md5-cache/sys-cluster/nova-2013.1.3
+++ b/metadata/md5-cache/sys-cluster/nova-2013.1.3-r2
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Nova is a cloud computing fabric controller (main part of an IaaS system). It is written in Python.
 EAPI=5
 HOMEPAGE=https://launchpad.net/nova
-IUSE=python_targets_python2_7
+IUSE=+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cheetah-2.4.4 >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2 dev-python/netaddr >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-quantumclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.7 <dev-python/websockify-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cheetah-2.4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-neutronclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websockify-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/nova/grizzly/2013.1.3/+download/nova-2013.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=915fea6c80fe117fdc9445faf4492415
+_md5_=7cefbac5d9e2dd026696a57f3b2b2873
diff --git a/metadata/md5-cache/sys-cluster/nova-2013.1.9999 b/metadata/md5-cache/sys-cluster/nova-2013.1.9999
index f850d921edeb..4fde40774b8c 100644
--- a/metadata/md5-cache/sys-cluster/nova-2013.1.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2013.1.9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=Nova is a cloud computing fabric controller (main part of an IaaS system). It is written in Python.
 EAPI=5
 HOMEPAGE=https://launchpad.net/nova
-IUSE=python_targets_python2_7
+IUSE=+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cheetah-2.4.4 >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2 dev-python/netaddr >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-quantumclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.7 <dev-python/websockify-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cheetah-2.4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-neutronclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websockify-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d5a234b9e4472dba63ebe7daad7583b8
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6435456dab2d41cc589a580dbe3b4a30
diff --git a/metadata/md5-cache/sys-cluster/nova-9999 b/metadata/md5-cache/sys-cluster/nova-9999
index 7a35005375c0..82edda45e773 100644
--- a/metadata/md5-cache/sys-cluster/nova-9999
+++ b/metadata/md5-cache/sys-cluster/nova-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
 DESCRIPTION=Nova is a cloud computing fabric controller (main part of an IaaS system). It is written in Python.
 EAPI=5
 HOMEPAGE=https://launchpad.net/nova
-IUSE=python_targets_python2_7
+IUSE=+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/cheetah-2.4.4 >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2 dev-python/netaddr >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-git-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-neutronclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.7 <dev-python/websockify-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/amqplib-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/anyjson-0.2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8 <=dev-python/sqlalchemy-0.7.99 dev-python/boto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/d2to1-0.2.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/d2to1-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.17[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jinja-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/jsonschema-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-1.0.4-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.5.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-migrate-0.7.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-0.9.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/python-neutronclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websockify-0.5.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websockify-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-argparse[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6924c1c3780866dbbd73565ee6056f75
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=97df4646d7488208f9c47ff2e5871114
diff --git a/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1 b/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
index db292c7b4463..6e655828d868 100644
--- a/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
+++ b/metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.sara.nl/pub/outgoing/pbs_python-4.3.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ae881c004c2f88b4b25bfeed0c99de0a
+_md5_=a0329742f4da26c890fb914606f30248
diff --git a/metadata/md5-cache/sys-cluster/ploop-1.8 b/metadata/md5-cache/sys-cluster/ploop-1.8
index 43bc9e4fab37..58a38094e914 100644
--- a/metadata/md5-cache/sys-cluster/ploop-1.8
+++ b/metadata/md5-cache/sys-cluster/ploop-1.8
@@ -4,10 +4,10 @@ DESCRIPTION=openvz tool and a library to control ploop block devices
 EAPI=5
 HOMEPAGE=http://wiki.openvz.org/Download/ploop
 IUSE=debug static-libs
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/ploop/1.8/src/ploop-1.8.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7d741af67a64e089a5dbacba79e80ca6
+_md5_=05b59a83a6eea0e1bd5889d58dc294f2
diff --git a/metadata/md5-cache/sys-cluster/polysh-0.4-r1 b/metadata/md5-cache/sys-cluster/polysh-0.4-r1
index b67de4744922..9056609b2359 100644
--- a/metadata/md5-cache/sys-cluster/polysh-0.4-r1
+++ b/metadata/md5-cache/sys-cluster/polysh-0.4-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/polysh/files/polysh-0.4.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b580be9e620c0d329af3a229fc968252
+_md5_=c2c7edb1afe2af7eff48f97b52f33f94
diff --git a/metadata/md5-cache/sys-cluster/swift-2013.1.9999 b/metadata/md5-cache/sys-cluster/swift-2013.1.9999
index bbb6bc49c547..79f649945cc9 100644
--- a/metadata/md5-cache/sys-cluster/swift-2013.1.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2013.1.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/eventlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netifaces dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/webob-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcache? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8a28da60368456251bfb99a4f0eeccc5
diff --git a/metadata/md5-cache/sys-cluster/swift-9999 b/metadata/md5-cache/sys-cluster/swift-9999
index 9dbcce4ffbd7..4545d9988371 100644
--- a/metadata/md5-cache/sys-cluster/swift-9999
+++ b/metadata/md5-cache/sys-cluster/swift-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/eventlet-0.9.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dnspython-1.10.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-swiftclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcache? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2a8d72be085d5e83b88a395798d7a10
diff --git a/metadata/md5-cache/sys-devel/autoconf-9999 b/metadata/md5-cache/sys-devel/autoconf-9999
index d2fc33390fa6..52d15390bd71 100644
--- a/metadata/md5-cache/sys-devel/autoconf-9999
+++ b/metadata/md5-cache/sys-devel/autoconf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-10
 SLOT=2.5
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c0f4f0f3acdad80626c3cb9d168f321c
diff --git a/metadata/md5-cache/sys-devel/automake-1.13.4 b/metadata/md5-cache/sys-devel/automake-1.13.4
index c04dec0b3e8f..e5a6ee21fa5d 100644
--- a/metadata/md5-cache/sys-devel/automake-1.13.4
+++ b/metadata/md5-cache/sys-devel/automake-1.13.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install test unpack
 DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-8 >=sys-devel/autoconf-2.62 sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 HOMEPAGE=http://www.gnu.org/software/automake/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-8 >=sys-devel/autoconf-2.62 sys-devel/gnuconfig
 SLOT=1.13
 SRC_URI=mirror://gnu/automake/automake-1.13.4.tar.xz ftp://alpha.gnu.org/pub/gnu/automake/automake-1.13.4.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9ef5a90f77e09d7d9e5ed530be1999b5
+_md5_=69f82d689a30cc7097c176e9001d116b
diff --git a/metadata/md5-cache/sys-devel/automake-9999 b/metadata/md5-cache/sys-devel/automake-9999
index 68ccb9a86d12..407592d88a03 100644
--- a/metadata/md5-cache/sys-devel/automake-9999
+++ b/metadata/md5-cache/sys-devel/automake-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gnu.org/software/automake/
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-2 >=sys-devel/autoconf-2.60 >=sys-apps/texinfo-4.7 sys-devel/gnuconfig
 SLOT=9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=06920e332a932041e921f72d420afc36
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 53aae4b820b1..dfe2327fed81 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -6,5 +6,5 @@ IUSE=cxx nls multitarget multislot static-libs test vanilla zlib
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-binutils	03ae6687f791060a62a15efeff1a9bc6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-binutils	03ae6687f791060a62a15efeff1a9bc6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0bce97c0ef865e145c20ff034e7d3423
diff --git a/metadata/md5-cache/sys-devel/clang-3.2 b/metadata/md5-cache/sys-devel/clang-3.2
index 5c7221329d57..a6f46be17eab 100644
--- a/metadata/md5-cache/sys-devel/clang-3.2
+++ b/metadata/md5-cache/sys-devel/clang-3.2
@@ -10,4 +10,4 @@ RDEPEND=~sys-devel/llvm-3.2[debug=,multitarget=] python_targets_python2_6? ( dev
 SLOT=0/3.2
 SRC_URI=http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz http://llvm.org/releases/3.2/compiler-rt-3.2.src.tar.gz http://llvm.org/releases/3.2/clang-3.2.src.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e981cb2fa15c79c017ef772c5acef08e
+_md5_=c28051a3ae362b75ab637f3058e56465
diff --git a/metadata/md5-cache/sys-devel/clang-3.3 b/metadata/md5-cache/sys-devel/clang-3.3
index bd9f3054c04b..26d5b38ee89c 100644
--- a/metadata/md5-cache/sys-devel/clang-3.3
+++ b/metadata/md5-cache/sys-devel/clang-3.3
@@ -10,4 +10,4 @@ RDEPEND=~sys-devel/llvm-3.3[debug=,multitarget=] python_targets_python2_6? ( dev
 SLOT=0/3.3
 SRC_URI=http://llvm.org/releases/3.3/llvm-3.3.src.tar.gz http://llvm.org/releases/3.3/compiler-rt-3.3.src.tar.gz http://llvm.org/releases/3.3/cfe-3.3.src.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=367e8c0c7a1c20aa1eaa3bca68656a3b
+_md5_=b535ae7f09fdcd1a86f0aaca1ed8f3ca
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index 9dbf021eccb2..4560aabfe866 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -8,4 +8,4 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-9999[debug=,multitarget=] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 SLOT=0/9999
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0231b889a66c11d57bcc82f156daa52b
+_md5_=6b4a9996a05e642e4fcfb78e5c4dda45
diff --git a/metadata/md5-cache/sys-devel/crossdev-99999999 b/metadata/md5-cache/sys-devel/crossdev-99999999
index 0bbcfac3ab48..99b11b08a291 100644
--- a/metadata/md5-cache/sys-devel/crossdev-99999999
+++ b/metadata/md5-cache/sys-devel/crossdev-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.gentoo.org/
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 app-shells/bash !sys-devel/crossdev-wrappers
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=e61bda64f34b25eae8d2e2fc8ddab30c
diff --git a/metadata/md5-cache/sys-devel/distcc-3.1-r7 b/metadata/md5-cache/sys-devel/distcc-3.1-r7
index 9f866c7cda05..48c4b05c727b 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.1-r7
+++ b/metadata/md5-cache/sys-devel/distcc-3.1-r7
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.1.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=efff16c9da70dea96ea3cb6877882b5a
+_md5_=6a5c50305d23783c4967548ff792e798
diff --git a/metadata/md5-cache/sys-devel/distcc-3.1-r8 b/metadata/md5-cache/sys-devel/distcc-3.1-r8
index 7582746af747..3b9e09e8912a 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.1-r8
+++ b/metadata/md5-cache/sys-devel/distcc-3.1-r8
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://distcc.googlecode.com/files/distcc-3.1.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eb6d0639e705e8e9bfacb1920c836109
+_md5_=f486803f65dc98ceeefdd677cc203e25
diff --git a/metadata/md5-cache/sys-devel/gdb-9999 b/metadata/md5-cache/sys-devel/gdb-9999
index e7b06159a761..8b535764320a 100644
--- a/metadata/md5-cache/sys-devel/gdb-9999
+++ b/metadata/md5-cache/sys-devel/gdb-9999
@@ -7,5 +7,5 @@ IUSE=+client expat multitarget nls +python +server test vanilla zlib
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) python? ( =dev-lang/python-2* ) zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5f1a724c64038b405f92019e81c332f7
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-99999999 b/metadata/md5-cache/sys-devel/gnuconfig-99999999
index 9bb73ffab888..e3e9caf6aeb7 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-99999999
+++ b/metadata/md5-cache/sys-devel/gnuconfig-99999999
@@ -5,5 +5,5 @@ EAPI=2
 HOMEPAGE=http://savannah.gnu.org/projects/config
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73e0445ef4d98a0e498de9405048d3bf
diff --git a/metadata/md5-cache/sys-devel/libtool-9999 b/metadata/md5-cache/sys-devel/libtool-9999
index 6ad0b1728bef..014d78a84ea8 100644
--- a/metadata/md5-cache/sys-devel/libtool-9999
+++ b/metadata/md5-cache/sys-devel/libtool-9999
@@ -7,5 +7,5 @@ IUSE=static-libs test vanilla
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.65 >=sys-devel/automake-1.11.1
 SLOT=2
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=86ad7f39dadb63660eee922299ae0a5a
diff --git a/metadata/md5-cache/sys-devel/llvm-3.2 b/metadata/md5-cache/sys-devel/llvm-3.2
index 836aad0bc444..219576991d56 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.2
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/
 SLOT=0/3.2
 SRC_URI=http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.2-manpages.tar.bz2 )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=62eedb9197caca4264c731c42dcc4ec4
+_md5_=197a92e192983fa0833bb310a05d2d70
diff --git a/metadata/md5-cache/sys-devel/llvm-3.3 b/metadata/md5-cache/sys-devel/llvm-3.3
index df6b23a85d84..80da5f8cc5bb 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.3
+++ b/metadata/md5-cache/sys-devel/llvm-3.3
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/
 SLOT=0/3.3
 SRC_URI=http://llvm.org/releases/3.3/llvm-3.3.src.tar.gz !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.3-manpages.tar.bz2 )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0839c572c261c2e84f2ccec35f3d4771
+_md5_=589dff2642c07a6401e05026052f9669
diff --git a/metadata/md5-cache/sys-devel/llvm-3.3-r1 b/metadata/md5-cache/sys-devel/llvm-3.3-r1
index 3167404375ca..5743f03ee643 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.3-r1
+++ b/metadata/md5-cache/sys-devel/llvm-3.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0/3.3
 SRC_URI=http://llvm.org/releases/3.3/llvm-3.3.src.tar.gz clang? ( http://llvm.org/releases/3.3/compiler-rt-3.3.src.tar.gz http://llvm.org/releases/3.3/cfe-3.3.src.tar.gz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.3-manpages.tar.bz2 )
 _eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=37f4127a059aeca9555cbade70d26819
+_md5_=46afb786c6132cb2752abb14972bab4b
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index ea947f8cb0a7..c8b554abc5cc 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl libffi? ( virtual/libffi[abi_x86_32(-)?,abi_x86_64(-)?,abi
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 ) test? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=0/9999
 _eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=caaae420b85962173d47c20f0a9b77f3
+_md5_=9e359e2c1d8a06ffad2ca330b7bd1e2f
diff --git a/metadata/md5-cache/sys-devel/smatch-9999 b/metadata/md5-cache/sys-devel/smatch-9999
index c2a34f647abe..19bbb9c0cf7a 100644
--- a/metadata/md5-cache/sys-devel/smatch-9999
+++ b/metadata/md5-cache/sys-devel/smatch-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://smatch.sourceforge.net/
 LICENSE=OSL-1.1
 RDEPEND=dev-db/sqlite
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=8d59d8d7359910c65ab6c5a98d62d238
diff --git a/metadata/md5-cache/sys-devel/sparse-9999 b/metadata/md5-cache/sys-devel/sparse-9999
index 2e4d9dbf46cc..64dfa67f1315 100644
--- a/metadata/md5-cache/sys-devel/sparse-9999
+++ b/metadata/md5-cache/sys-devel/sparse-9999
@@ -7,5 +7,5 @@ IUSE=gtk llvm test xml
 LICENSE=OSL-1.1
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) llvm? ( >=sys-devel/llvm-3.0 ) xml? ( dev-libs/libxml2 )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=63edde0952b6cecbb5b44712631871b8
diff --git a/metadata/md5-cache/sys-devel/systemd-sdk-9999 b/metadata/md5-cache/sys-devel/systemd-sdk-9999
index 66ce0d489dcf..35479226e7eb 100644
--- a/metadata/md5-cache/sys-devel/systemd-sdk-9999
+++ b/metadata/md5-cache/sys-devel/systemd-sdk-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=https://bitbucket.org/mgorny/systemd-sdk/
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=5e9dd22c1b040fca305a2c17611c99a1
diff --git a/metadata/md5-cache/sys-devel/ucpp-9999 b/metadata/md5-cache/sys-devel/ucpp-9999
index f70d938a957f..e6b1283a7dcd 100644
--- a/metadata/md5-cache/sys-devel/ucpp-9999
+++ b/metadata/md5-cache/sys-devel/ucpp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://code.google.com/p/ucpp/
 IUSE=static-libs
 LICENSE=BSD
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d2602ef28692bb44f561e7726ea86933
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-9999 b/metadata/md5-cache/sys-fs/bcache-tools-9999
index 7359919da572..ac9b5642ceab 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-9999
+++ b/metadata/md5-cache/sys-fs/bcache-tools-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=http://bcache.evilpiepirate.org/
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de
 _md5_=1698c96272f79de77e34e6f12cf2ba67
diff --git a/metadata/md5-cache/sys-fs/bedup-9999 b/metadata/md5-cache/sys-fs/bedup-9999
index 46e0104235d2..abaa275852ee 100644
--- a/metadata/md5-cache/sys-fs/bedup-9999
+++ b/metadata/md5-cache/sys-fs/bedup-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-python/cffi-0.5[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] >=dev-python/pycparser-2.09.1-r1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] >=sys-fs/btrfs-progs-9999 dev-python/alembic[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/pyxdg[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] dev-python/sqlalchemy[sqlite,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] virtual/python-argparse[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d4054266d868cfefe2a78df05e2e0817
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 5c6fea252e3d..9e856fbdaec0 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://btrfs.wiki.kernel.org
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo sys-libs/zlib sys-apps/acl sys-fs/e2fsprogs
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=436e2b27414f458e39ec962f869172c1
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-1.6.1 b/metadata/md5-cache/sys-fs/cryptsetup-1.6.1
index 91debfe0346d..06f99876b0e3 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-1.6.1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-1.6.1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( python_single_target_
 SLOT=0
 SRC_URI=http://cryptsetup.googlecode.com/files/cryptsetup-1.6.1.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=184bf0155d4e8292442e65f1ef5db044
+_md5_=5ab6637b3671ea2199a18a9c9a5eb889
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index 868831b01709..9b546863a991 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=virtual/udev-180 openrc? ( >=sys-fs/udev-init-scripts-18 )
 RDEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !<sys-libs/glibc-2.11 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) hwdb? ( >=sys-apps/hwids-20121202.2[udev] ) keymap? ( >=sys-apps/hwids-20130717-r1[udev] ) !sys-fs/udev !sys-apps/coldplug !sys-apps/systemd !<sys-fs/lvm2-2.02.97 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-18
 REQUIRED_USE=keymap? ( hwdb )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb4479f9c69bf4c9f118cb493da38ab4
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.1.0-r1 b/metadata/md5-cache/sys-fs/f2fs-tools-1.1.0-r1
index 6687fefa77f5..268ec7253f09 100644
--- a/metadata/md5-cache/sys-fs/f2fs-tools-1.1.0-r1
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.1.0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=Tools for Flash-Friendly File System (F2FS)
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/f2fs-tools/ http://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary
-KEYWORDS=amd64 arm ppc ~ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/f2fs-tools/f2fs-tools-1.1.0.tar.gz
-_md5_=4b0b4f7d23f94f4f92efc44c5104ff87
+_md5_=a5107d677e117c857957c782baa7ec57
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-99999999 b/metadata/md5-cache/sys-fs/mtd-utils-99999999
index 7eecd83163dc..4197a34236c9 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-99999999
+++ b/metadata/md5-cache/sys-fs/mtd-utils-99999999
@@ -7,5 +7,5 @@ IUSE=xattr
 LICENSE=GPL-2
 RDEPEND=!sys-fs/mtd dev-libs/lzo sys-libs/zlib >=sys-apps/util-linux-2.16
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=a1d8b7f33af68d517f496ca833edbca2
diff --git a/metadata/md5-cache/sys-fs/redirfs-9999 b/metadata/md5-cache/sys-fs/redirfs-9999
index 9caabb9a1b14..b8213390cc47 100644
--- a/metadata/md5-cache/sys-fs/redirfs-9999
+++ b/metadata/md5-cache/sys-fs/redirfs-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=GPL-3
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a020c3c4d8fb25f969256c061e41e8af
diff --git a/metadata/md5-cache/sys-fs/simple-mtpfs-9999 b/metadata/md5-cache/sys-fs/simple-mtpfs-9999
index c3283bcd72f1..a730b4d45eba 100644
--- a/metadata/md5-cache/sys-fs/simple-mtpfs-9999
+++ b/metadata/md5-cache/sys-fs/simple-mtpfs-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/phatina/simple-mtpfs
 LICENSE=GPL-2+
 RDEPEND=media-libs/libmtp >=sys-fs/fuse-2.8
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=3cc1a28621cfab4af4b7e095fd2e7dde
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 2b592f7d5749..7ce7a52bd590 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=virtual/udev-206-r2 >=sys-apps/hwids-20130717-r1[udev] openrc? ( >=sys
 RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14-r1 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) openrc? ( !<sys-apps/openrc-0.9.9 ) !sys-apps/coldplug !<sys-fs/lvm2-2.02.97-r1 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-22 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8fcfbf67f8c8ce2c19ea393e76bfcc06
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-9999 b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
index c33aff99dd91..96accae55cbe 100644
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-9999
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/udev-180 sys-apps/openrc !<sys-fs/udev-186
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=937904c5aaa86074efc9f8a535214591
diff --git a/metadata/md5-cache/sys-fs/yaffs-utils-9999 b/metadata/md5-cache/sys-fs/yaffs-utils-9999
index 93e89f8f58c0..73f8c160adef 100644
--- a/metadata/md5-cache/sys-fs/yaffs-utils-9999
+++ b/metadata/md5-cache/sys-fs/yaffs-utils-9999
@@ -5,5 +5,5 @@ EAPI=2
 HOMEPAGE=http://www.aleph1.co.uk/yaffs/
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50488520252bae792b843fbca6ca750d
diff --git a/metadata/md5-cache/sys-fs/yaffs2-utils-9999 b/metadata/md5-cache/sys-fs/yaffs2-utils-9999
index d36470d265e8..ff28e5fd929f 100644
--- a/metadata/md5-cache/sys-fs/yaffs2-utils-9999
+++ b/metadata/md5-cache/sys-fs/yaffs2-utils-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=http://www.aleph1.co.uk/yaffs/
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=d5abca4b4fcb4593205faa90d8283930
diff --git a/metadata/md5-cache/sys-fs/zfs-0.6.2 b/metadata/md5-cache/sys-fs/zfs-0.6.2
index 183b6e7a5233..97226eb6c0ee 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.6.2
+++ b/metadata/md5-cache/sys-fs/zfs-0.6.2
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/archive/zfs-0.6.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=dab95f41d3afae66c0d1872af85bc61f
+_md5_=d66f6664ed2608dc4e33aeb5da975d56
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index ef96f45c3aac..47791ef932e0 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=selinux? ( sys-libs/libselinux ) sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-9999* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6f87fe639434bfd3706232f1fc8401ca
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=46a478d22d8ffca1da2cb5a7c7c8d9aa
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index 84814861e2ee..db187722f3a1 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -8,5 +8,5 @@ LICENSE=CDDL debug? ( GPL-2+ )
 RDEPEND==sys-kernel/spl-9999* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c7d48cf688d7d8967d751ff427d36308
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.7 b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.7
index 20c7a5856f9c..b06ff1272c52 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.7
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-13.base.tar.xz mirror://gentoo/genpatches-3.10-13.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10_p20130812.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=04a581b702215dd85dab2b3b4ea3dec2
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.9 b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.9
index 34cede84c9c7..7a57cf7f0569 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.9
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.9
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.9
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-16.base.tar.xz mirror://gentoo/genpatches-3.10-16.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10_p20130821.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cc768708ad151120d2128bfbebe8f27a
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.55 b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.55
index 0ff735706189..3000439e60a2 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.55
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.55
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.55
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-37.base.tar.xz mirror://gentoo/genpatches-3.4-37.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.4_p20130722.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dbfe921f8db0ec6afdd447cfdd4ee954
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.57 b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.57
index f2362a5ebedb..87a768689d66 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.57
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.57
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.57
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-38.base.tar.xz mirror://gentoo/genpatches-3.4-38.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.4_p20130812.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ec4eefcd6e645545c27167858269f065
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.58 b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.58
index 6df1274a5f10..3a7c57a5c1cb 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.58
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.58
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.58
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-39.base.tar.xz mirror://gentoo/genpatches-3.4-39.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.4_p20130812.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8e1fa4dffbc16647044a284fddc80d2b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.59 b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.59
index c76c575ed2ba..11c4def9ad80 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.4.59
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.4.59
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.59
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-40.base.tar.xz mirror://gentoo/genpatches-3.4-40.extras.tar.xz http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.4_p20130821.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=261575bfac88a5b5d19437106840a4fd
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3 b/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3
index e6ec9eb218b1..be89ff5b7e93 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3
+++ b/metadata/md5-cache/sys-kernel/ck-sources-2.6.38-r3
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.38-r3
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 ) mirror://gentoo/genpatches-2.6.38-8.base.tar.xz mirror://gentoo/genpatches-2.6.38-8.extras.tar.xz mirror://kernel/linux/kernel/people/ck/patches/2.6/2.6.38/2.6.38-ck3/patch-2.6.38-ck3.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a83552f4db3b422848a9c7b17b8065b4
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.4.43 b/metadata/md5-cache/sys-kernel/ck-sources-3.4.43
index b3a75d84a9cf..7edcc84bdae5 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.4.43
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.4.43
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.43
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-25.base.tar.xz mirror://gentoo/genpatches-3.4-25.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patch-3.4-ck3.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/3.4-sched-bfs-424.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/bfs424-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/urw-locks.patch ) )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7ea48d1f6fa954100b369b6fc856c009
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.4.54 b/metadata/md5-cache/sys-kernel/ck-sources-3.4.54
index 3111e137db97..d469d6c33e0f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.4.54
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.4.54
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.54
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-36.base.tar.xz mirror://gentoo/genpatches-3.4-36.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patch-3.4-ck3.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/3.4-sched-bfs-424.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/bfs424-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/urw-locks.patch ) )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5f3cf493dcf6cc65fcda20cb04da064
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.5.7-r2 b/metadata/md5-cache/sys-kernel/ck-sources-3.5.7-r2
index 70f9c4f6da8e..1d476f48234e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.5.7-r2
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.5.7-r2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.5.7-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.5.N/deblob-3.5 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.5.N/deblob-check -> deblob-check-3.5 ) mirror://gentoo/genpatches-3.5-8.base.tar.xz mirror://gentoo/genpatches-3.5-8.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.5/3.5-ck1/patch-3.5-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.5/3.5-ck1/patches/3.5-sched-bfs-424.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.5/3.5-ck1/patches/bfs424-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.5/3.5-ck1/patches/urw-locks.patch ) )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=767751f0991c702d89878930c7178267
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.6.11-r2 b/metadata/md5-cache/sys-kernel/ck-sources-3.6.11-r2
index 823dbb82a878..060878bfcd89 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.6.11-r2
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.6.11-r2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.6.11-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-3.6 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-check -> deblob-check-3.6 ) mirror://gentoo/genpatches-3.6-13.base.tar.xz mirror://gentoo/genpatches-3.6-13.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.6/3.6-ck1/patch-3.6-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.6/3.6-ck1/patches/3.5-sched-bfs-425.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.6/3.6-ck1/patches/bfs425-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.6/3.6-ck1/patches/urw-locks.patch ) )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e975e4877528550e151d1b7434165121
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.7.10-r1 b/metadata/md5-cache/sys-kernel/ck-sources-3.7.10-r1
index 44015a331f59..9b6e6e092e5f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.7.10-r1
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.7.10-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.7.10-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-3.7 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-check -> deblob-check-3.7 ) mirror://gentoo/genpatches-3.7-14.base.tar.xz mirror://gentoo/genpatches-3.7-14.extras.tar.xz http://ck.kolivas.org/patches/bfs/3.0/3.7/3.7-bfs426-427.patch !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.7/3.7-ck1/patch-3.7-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.7/3.7-ck1/patches/3.7-sched-bfs-426.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.7/3.7-ck1/patches/bfs426-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.7/3.7-ck1/patches/urw-locks.patch ) )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30b38d5a9e526babf993096febec5088
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.8.13 b/metadata/md5-cache/sys-kernel/ck-sources-3.8.13
index 3639734add41..702b360dd26e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.8.13
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.8.13
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.8.13
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 ) mirror://gentoo/genpatches-3.8-16.base.tar.xz mirror://gentoo/genpatches-3.8-16.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.8/3.8-ck1/patch-3.8-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.8/3.8-ck1/patches/3.8-sched-bfs-428.patch )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0138256bf33d051218e6a0f8298748a7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.9.11 b/metadata/md5-cache/sys-kernel/ck-sources-3.9.11
index 9e0c18275bd2..ca68b2f944a8 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.9.11
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.9.11
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.11
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-3.9 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-check -> deblob-check-3.9 ) mirror://gentoo/genpatches-3.9-16.base.tar.xz mirror://gentoo/genpatches-3.9-16.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.9/3.9-ck1/patch-3.9-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.9/3.9-ck1/patches/3.9-sched-bfs-430.patch )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=48faef4850372fb6363f23948034f080
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.9.2 b/metadata/md5-cache/sys-kernel/ck-sources-3.9.2
index 93906462cd14..d8fb309dff3d 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.9.2
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.9.2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-3.9 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-check -> deblob-check-3.9 ) mirror://gentoo/genpatches-3.9-5.base.tar.xz mirror://gentoo/genpatches-3.9-5.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.9/3.9-ck1/patch-3.9-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.9/3.9-ck1/patches/3.9-sched-bfs-430.patch )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=00a4907190116a1c0a7e5658f17dfafd
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.9.7 b/metadata/md5-cache/sys-kernel/ck-sources-3.9.7
index cb0469aa4897..633b1a51e831 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.9.7
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.9.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-3.9 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-check -> deblob-check-3.9 ) mirror://gentoo/genpatches-3.9-12.base.tar.xz mirror://gentoo/genpatches-3.9-12.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.9/3.9-ck1/patch-3.9-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.9/3.9-ck1/patches/3.9-sched-bfs-430.patch )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a3c5a76e4d3b16fe8fd8b82a7555f02e
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index a384ed4acf7f..7d049b9f893d 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-0.2.1 !<sys-apps/openrc-0.9.9
 SLOT=0
 SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz http://www.busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=e203367a1e0dc0e4fc863430103bef06
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.88 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.88
index 3e2df417eae2..d732a3c50683 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.88
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.88
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.88
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-59.base.tar.xz mirror://gentoo/genpatches-3.0-59.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9c4877f43e7494b4d1091ca33236c661
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.90 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.90
index 9a596f001c59..7a6e695b9977 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.90
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.90
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.90
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-60.base.tar.xz mirror://gentoo/genpatches-3.0-60.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=30b4728e18744a3779e9fa92195a6d79
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.91 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.91
index 3ed8ae7c4a7d..9eda739e9140 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.91
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.91
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.91
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-61.base.tar.xz mirror://gentoo/genpatches-3.0-61.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2981de4cbceb3ba05d529bb2781e85cd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.92 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.92
index 739f33e452a6..67fdfbce46b0 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.92
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.92
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.92
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-62.base.tar.xz mirror://gentoo/genpatches-3.0-62.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d93f0a46423a068aca370678b5d25027
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.93 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.93
index 35d4db2024c7..6c9579264e47 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.93
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.93
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.93
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-63.base.tar.xz mirror://gentoo/genpatches-3.0-63.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=78bd74a813e72794550c8e8ea4ae868b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.94 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.94
index 813638a9f9d2..b93355ca095e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.94
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.0.94
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.94
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 ) mirror://gentoo/genpatches-3.0-64.base.tar.xz mirror://gentoo/genpatches-3.0-64.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ce9bbc3a30b0519e7d86e3f1ccd9bbfb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.10
index 4da8ebd95e7c..dd5719009d01 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.10
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.10
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.10
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-17.base.tar.xz mirror://gentoo/genpatches-3.10-17.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5e9c6b222fe186dd5ceeb48b657e9e89
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.7
index 3661851fdd9d..0afea7df7f02 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-13.base.tar.xz mirror://gentoo/genpatches-3.10-13.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d667568fedfd8cec5aaa8781e7de1f7d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.8
index 7e02a798a5de..295ebb35f8cd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.8
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.8
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-14.base.tar.xz mirror://gentoo/genpatches-3.10-14.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=09b52517a2e519a957a27fe3c77a87a3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.9
index f42380cd9d16..2c5199ee3f7f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.9
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.9
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.9
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-16.base.tar.xz mirror://gentoo/genpatches-3.10-16.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1b7a1955f5867ad8b3ca5ccb3b1d42a7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.11.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.11.0
index 82262c6f7d13..1978674f04c8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.11.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.11.0
@@ -3,13 +3,13 @@ DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev
 DESCRIPTION=Full sources including the Gentoo patchset for the 3.11 kernel tree
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
-IUSE=deblob symlink build deblob
+IUSE=deblob experimental symlink build deblob
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( 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=3.11.0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.11.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-3.11 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-check -> deblob-check-3.11 ) mirror://gentoo/genpatches-3.11-1.base.tar.xz mirror://gentoo/genpatches-3.11-1.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=84d670fb3094c8078493c2c97376274f
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.11.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-3.11 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-check -> deblob-check-3.11 ) mirror://gentoo/genpatches-3.11-3.base.tar.xz mirror://gentoo/genpatches-3.11-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.11-3.experimental.tar.xz )
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=a23dec7a27494b8fed511ce29dd18f7d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.48 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.48
index 097b517d4be4..d9f52d68a162 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.48
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.2.48
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.2.48
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) mirror://gentoo/genpatches-3.2-28.base.tar.xz mirror://gentoo/genpatches-3.2-28.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c6937382ade1a1ba2d099bbf83fa1ec6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.55 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.55
index cce7ee69d433..36f3aa440484 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.55
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.55
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.55
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-37.base.tar.xz mirror://gentoo/genpatches-3.4-37.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d28fb822c74f51a1014d1e8cefd06816
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.57 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.57
index 165e23c5d0f0..aae56c9ac4e3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.57
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.57
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.57
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-38.base.tar.xz mirror://gentoo/genpatches-3.4-38.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9ed7bb831ba1a7d884e353dffbb3fbc6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.58 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.58
index 1b5e4dbefcc8..e295c74e2e3c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.58
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.58
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.58
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-39.base.tar.xz mirror://gentoo/genpatches-3.4-39.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5428521c925d3f5ef37ab427d6a67f23
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.59 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.59
index aaf04820cc51..da1988ca5e08 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.59
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.59
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.59
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-40.base.tar.xz mirror://gentoo/genpatches-3.4-40.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=455b1decc96e6475a5349b82ff65efc5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.60 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.60
index dd5d9aca4d20..7a73dc28f9ef 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.60
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.60
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.60
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-41.base.tar.xz mirror://gentoo/genpatches-3.4-41.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=041d3aebea477c7af823664982e6a643
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.8.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.8.13
index 203d670af75f..39f8863029c7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.8.13
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.8.13
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.8.13
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 ) mirror://gentoo/genpatches-3.8-16.base.tar.xz mirror://gentoo/genpatches-3.8-16.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=98cf4040e79f697733ef26cc84856f38
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.9.11-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.9.11-r1
index 12cbf729e78b..c5b1b38b8acd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.9.11-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.9.11-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.11-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-3.9 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-check -> deblob-check-3.9 ) mirror://gentoo/genpatches-3.9-17.base.tar.xz mirror://gentoo/genpatches-3.9-17.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d8d4fe1655bf294671b81e1cd57ead8
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc1 b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc1
index 133dc5e949dc..cb0adee8d57b 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11_rc1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.11-rc1.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8bef25c5a7a3ac796e9d31563fa40674
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc2 b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc2
index 9e77ddd9d28d..8189027b9297 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11_rc2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.11-rc2.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=363430741d25dc705710db5d634b5f64
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc3 b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc3
index ddea4ce3bd81..046c00efef85 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc3
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11_rc3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.11-rc3.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e6b0cda9ccf2ac2239ec4fb6f1678b1c
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc4 b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc4
index d53a21c50e1e..94f6d45d094c 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11_rc4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.11-rc4.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=905fe12b8c78d14b06ca7cfc86a24299
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc5 b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc5
index dc6256e4a660..58ae96649431 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc5
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11_rc5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.11-rc5.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=51afcb4040775cd6c5276bdf1caa2f7c
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc6 b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc6
index 458800c25478..a2c8253a56c6 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc6
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11_rc6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.11-rc6.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d77b5129bafb17fce882529c8a7af554
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc7 b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc7
index 20307f1eb86e..b2af93a3f41b 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-3.11_rc7
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.11_rc7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11_rc7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.11-rc7.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=214ebb4f7b872acab0878b1e91681b7a
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r170 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r170
deleted file mode 100644
index c2a780917c3c..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r170
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
-DESCRIPTION=Hardened kernel sources (kernel series 2.6)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=2.6.32-r170
-SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-175.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.xz mirror://gentoo/genpatches-2.6.32-48.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bc9faec05453bcfeb56cd71ed23b2bc0
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r175 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r175
index 91d218537197..e901dcefbf36 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r175
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r175
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=2.6.32-r175
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-180.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.xz mirror://gentoo/genpatches-2.6.32-48.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1fb8c9ee18697ceea7d2bd6c8a56ff24
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r178 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r178
index c3204951c946..be4f401a9939 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r178
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r178
@@ -4,12 +4,12 @@ DESCRIPTION=Hardened kernel sources (kernel series 2.6)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=2.6.32-r178
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-183.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.xz mirror://gentoo/genpatches-2.6.32-48.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=42d51a350acf517e05ccd2b849e4e37a
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=875684eb2073543b31163208cfcda014
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r181 b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r181
index 55708336f5ce..bc6a2d5dbab4 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r181
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-2.6.32-r181
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=2.6.32-r181
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-186.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-48.base.tar.xz mirror://gentoo/genpatches-2.6.32-48.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b45528e26e1cd2ed418fdb38d95c1d07
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.1-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.10.1-r1
index 181681ed1b28..260bc7fbcf34 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.1-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.10.1-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Hardened kernel sources (kernel series 3.10)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.10.1-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.10.1-2.extras.tar.bz2 mirror://gentoo/genpatches-3.10-3.base.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b51ae105959acb7ef9e409162f8c650f
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3f5dfbefa469554e436ceb781e0576f7
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.7-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.10.10
similarity index 77%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.10.7-r1
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.10.10
index 5aee55783d65..be15c84b18b8 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.7-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.10.10
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.7-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.10.7-2.extras.tar.bz2 mirror://gentoo/genpatches-3.10-13.base.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2d4006623260ac50c05faee2cbfa6a71
+SLOT=3.10.10
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.10.10-1.extras.tar.bz2 mirror://gentoo/genpatches-3.10-17.base.tar.xz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2e7075344d8ab61c43e3385876478fac
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.9-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.10.9-r1
deleted file mode 100644
index 266be672e930..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.10.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
-DESCRIPTION=Hardened kernel sources (kernel series 3.10)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.9-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.10.9-2.extras.tar.bz2 mirror://gentoo/genpatches-3.10-16.base.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=fbdeb7c0443791f6f7552abdf927d3b0
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.46-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.46-r1
deleted file mode 100644
index 1667cd1288a1..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.46-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.46-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.46-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8db77a8596c12fb7cfbb0684ab588ff1
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r1
index 7eab886c952e..259e360fa733 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.2.48-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.48-2.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=73e80f96f4c4461a52866d35321c4c7e
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r4
index d75a8c557716..454d4dc42dc9 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r4
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.48-r4
@@ -4,12 +4,12 @@ DESCRIPTION=Hardened kernel sources (kernel series 3.2)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
 IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.2.48-r4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.48-5.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=587febbc9d3ff4b4edd0bbee54a7f740
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c27d14f5090b87979cea560b8e35eb12
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r2
deleted file mode 100644
index a0e8c705fd6c..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
-DESCRIPTION=Hardened kernel sources (kernel series 3.2)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.2.50-r2
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.50-3.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f9de19a6e1ca7e6a917116d283d283fd
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r5
similarity index 82%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r4
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r5
index cc50bc781087..4313ef064e8d 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r4
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.50-r5
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.2.50-r4
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.50-5.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=404229bb749a057190b2dc686f1815cb
+SLOT=3.2.50-r5
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.50-6.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3cada81fa94a6d5c8f3233a8ddf3835d
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.9.5 b/metadata/md5-cache/sys-kernel/hardened-sources-3.9.5
deleted file mode 100644
index 9c2102183601..000000000000
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.9.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( =dev-lang/python-2* )
-DESCRIPTION=Hardened kernel sources (kernel series 3.9)
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
-IUSE=deblob symlink build deblob
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2 !deblob? ( freedist )
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.9.5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-3.9 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-check -> deblob-check-3.9 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.9.5-1.extras.tar.bz2 mirror://gentoo/genpatches-3.9-9.base.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a6f1eb1f88e804af2f33fb3db53a50a1
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.9.9 b/metadata/md5-cache/sys-kernel/hardened-sources-3.9.9
index eea22e6ea60d..22ea3519ace6 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.9.9
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.9.9
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.9.9
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-3.9 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.9.N/deblob-check -> deblob-check-3.9 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.9.9-1.extras.tar.bz2 mirror://gentoo/genpatches-3.9-14.base.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7747638422e698e1751cc785903bc695
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 5bf2d0cf28c6..45c185cd2047 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -7,5 +7,5 @@ IUSE=savedconfig savedconfig
 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
 RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !x11-drivers/radeon-ucode )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65
 _md5_=b183f72f77dc17af9cf5fdf6d6ba288f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
index 0d6f614488e6..5b0b94bb5890 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/patch-2.4.33.3.xz mirror://kernel/linux/kernel/v2.4/linux-2.4.33.tar.xz mirror://gentoo/gentoo-headers-2.4.33-1.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5d12862e648887fc3c200891cc3e568f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
index 2cddf516e8d4..a9fe98bd0f43 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/linux-2.4.36.tar.xz mirror://gentoo/gentoo-headers-2.4.36-1.tar.lzma
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=55810c0e42717305b282cb2ce51f85d9
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.1 b/metadata/md5-cache/sys-kernel/linux-headers-3.1
index 6c096d0b40a3..c1747afe3dd3 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.1.tar.xz mirror://gentoo/gentoo-headers-3.1-2.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eff2bb73a854ba6b3f76bb9cf65ecd34
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.10 b/metadata/md5-cache/sys-kernel/linux-headers-3.10
index 9aa799478bdf..2e531242a202 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.10
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.10
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.10.tar.xz mirror://gentoo/gentoo-headers-3.10-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74262d08b199f6a0bbab54aa13a0c8c8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.11 b/metadata/md5-cache/sys-kernel/linux-headers-3.11
index 24a400eaedca..6d5838222cb9 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.11
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.11
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.11.tar.xz mirror://gentoo/gentoo-headers-3.11-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=348542832fb8e7cfcf97184f44b378f8
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1 b/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
index 5fb47c7c8420..6ddc696c5f5f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.2.tar.xz mirror://gentoo/gentoo-headers-3.2-3.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cb83a8f51725ac56939d03217f92e8d2
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.3 b/metadata/md5-cache/sys-kernel/linux-headers-3.3
index 33ae2a9ec420..3ef08760c5a7 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.3.tar.xz mirror://gentoo/gentoo-headers-3.3-2.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=eab5bb6562e27a177982f8d6ea4d5d56
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.4 b/metadata/md5-cache/sys-kernel/linux-headers-3.4
index c2b48e790b97..c1ff9f5f2ed6 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5ce3762db98d8572ea6a7616e8e0ab1b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1
index 7d954730373f..e9aa8075e6d0 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-2.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=68690332831a99d9b7f19b127f86d16b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2 b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2
index 56fc048efda2..69f61c2b1ed4 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-3.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29eaeac7062fcee44fee7238980c25f5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.5 b/metadata/md5-cache/sys-kernel/linux-headers-3.5
index ca9c83f2be54..dd794f9feeab 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.5
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.5.tar.xz mirror://gentoo/gentoo-headers-3.5-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f9db94b8137695cac0606540d625f3c4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.6 b/metadata/md5-cache/sys-kernel/linux-headers-3.6
index f1a8420240df..02dfa8eb981b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.6
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.6.tar.xz mirror://gentoo/gentoo-headers-3.6-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=be2031f5fc744b5b3fb26305a4cd57d5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.7 b/metadata/md5-cache/sys-kernel/linux-headers-3.7
index 86b88009d540..30f9d0521793 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.7
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.7.tar.xz mirror://gentoo/gentoo-headers-3.7-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=f3e868a99d7a81d6d70495684a4e92e6
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.8 b/metadata/md5-cache/sys-kernel/linux-headers-3.8
index 9fc2ef51a453..cbfab72dc9c4 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.8
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.8.tar.xz mirror://gentoo/gentoo-headers-3.8-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=af4305ac0cf48b61b88d61ada4406e7a
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.9 b/metadata/md5-cache/sys-kernel/linux-headers-3.9
index 56fa2faf7c94..6391729dc450 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.9
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils dev-lang/perl
 DESCRIPTION=Linux system headers
 EAPI=3
 HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.9.tar.xz mirror://gentoo/gentoo-headers-3.9-1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=10e8b0c39fec452221e1fa769f7265b3
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0a6d046c20ab5f11e6ba29dcd12b114c
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1 b/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1
index 4236960216ef..ec51d1d13eb3 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1
+++ b/metadata/md5-cache/sys-kernel/mips-sources-2.6.29.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.29
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.29.1.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.29.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.29.N/deblob-2.6.29 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.29.N/deblob-check -> deblob-check-2.6.29 ) mirror://gentoo/mipsgit-2.6.29-20090324.diff.bz2 mirror://gentoo/mips-sources-2.6.29-patches-v3.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6149723e9c4909569089dd65d706c29
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.10.4 b/metadata/md5-cache/sys-kernel/mips-sources-3.10.4
index f7c14876f0f8..53ce6d90c1bb 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-3.10.4
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.10.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.4.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/mipsgit-3.10.0-20130729.diff.xz mirror://gentoo/mips-sources-3.10.0-patches-v1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=91933a084058279342d7a2eb0798acb4
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.9.11 b/metadata/md5-cache/sys-kernel/mips-sources-3.9.11
index 21904e4987a1..6760db79668d 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-3.9.11
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.9.11
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.11
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.9.11.xz mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz mirror://gentoo/mipsgit-3.9.0-20130721.diff.xz mirror://gentoo/mips-sources-3.9.0-patches-v1.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c108e1ea6018764cd3b39c6ded7c801e
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.5 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.5
index 87c1f954c82d..73234391d782 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.5
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32.79.5
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab079.5/patches/patch-042stab079.5-combined.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=163995480a19018f0aae758030a0246f
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.6 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.6
index 4410f63c44d7..d88fb1bd6fdf 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.6
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.79.6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32.79.6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab079.6/patches/patch-042stab079.6-combined.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e1f2362d048334e957aea476aae64518
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
index ea21059466f6..84246d3e98d7 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.31_p9
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.31.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-2.6.31 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.31.N/deblob-check -> deblob-check-2.6.31 ) http://pf.natalenko.name/sources/2.6.31/patch-2.6.31-pf9.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=83b7e414faec5f4e839c539e0b54327a
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
index 2bfe143a1d2b..a03c641229c8 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32_p16
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://pf.natalenko.name/sources/2.6.32/patch-2.6.32-pf16.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=453534c39d4a7770f2ce817aa8c313cb
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
index b6d09fb146e3..a39c713ee722 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.33_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-2.6.33 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.33.N/deblob-check -> deblob-check-2.6.33 ) http://pf.natalenko.name/sources/2.6.33/patch-2.6.33-pf4.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=05cc04456a8b95814a455a8dd18f5de5
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
index 775b2005901b..dd1a01b335ad 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.34_p7
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.34.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-2.6.34 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.34.N/deblob-check -> deblob-check-2.6.34 ) http://pf.natalenko.name/sources/2.6.34/patch-2.6.34-pf7.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c07848061e38da1f5001fafcbe74863a
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
index 82b60e1d610c..37cd73467afc 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.35_p11
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-check -> deblob-check-2.6.35 ) http://pf.natalenko.name/sources/2.6.35/patch-2.6.35-pf11.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=965062753e0b9b99cb1573fa830d6398
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
index fc450a54099a..cd02216a0b06 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.36_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-2.6.36 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.36.N/deblob-check -> deblob-check-2.6.36 ) http://pf.natalenko.name/sources/2.6.36/patch-2.6.36-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f547ba09610df072f5f36a9e3757941
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
index 19041d956742..7fc4d04c25c0 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.37_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.37.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-2.6.37 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.37.N/deblob-check -> deblob-check-2.6.37 ) http://pf.natalenko.name/sources/2.6.37/patch-2.6.37-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e3742ef1d07e3e99981764174ce3f810
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
index 5a1e4e6cecd8..307f44ac32b3 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.38_p8
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-2.6.38 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.38.N/deblob-check -> deblob-check-2.6.38 ) http://pf.natalenko.name/sources/2.6.38/patch-2.6.38-pf8.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c2ceba337a95d6ba34fe410bb6bb45ad
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
index 5c3f6165977a..918fbe4f1699 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.39_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.xz http://pf.natalenko.name/sources/2.6.39/patch-2.6.39-pf4.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=55cf78e7ce46e5b4ed59a93041549375
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
index 659ac628079d..0a8b693e66f4 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.7-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz http://pf.natalenko.name/sources/3.0/patch-3.0.7-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=94435e6fc9f1720f37adfdf2d60d5422
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
index b7ce5363709e..c54d0a9b4d96 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.1.6-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.xz http://pf.natalenko.name/sources/3.1/patch-3.1.6-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b8acc7a823253817cec85de90ed5cc1
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.10.0 b/metadata/md5-cache/sys-kernel/pf-sources-3.10.0
index 41f134f775ef..710b05f71857 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.10.0
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.10.0
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://pf.natalenko.name/sources/3.10/patch-3.10.0-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a2b36ca465bd3d9ebbd49c09b5427469
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.10.1 b/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
index 5751d09fc316..86d27c834468 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://pf.natalenko.name/sources/3.10/patch-3.10.1-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=c626f80741357c2139b0172e2bac24a7
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7 b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
index 965b23a92fe7..c202abcc1c8e 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.2.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz http://pf.natalenko.name/sources/3.2/patch-3.2.7-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=df99e14eea391d236bc6553e15aa74a0
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6 b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
index aeb56e4ebb96..96c0c89af2b4 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.3.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.xz http://pf.natalenko.name/sources/3.3/patch-3.3.6-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4eca91876268b206f008f3ed65161421
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.4.6 b/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
index d36a7f1f5cbe..fb02cfe1f365 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz http://pf.natalenko.name/sources/3.4/patch-3.4.6-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b1bad93758c386dd1edb16e32206f45d
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.5.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
index 22e3d6175f97..e8f6648eff77 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.5.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://pf.natalenko.name/sources/3.5/patch-3.5.4-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=601d6039031635c15e4ddb9d9059143a
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.6.12 b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
index 531f2d61253a..d802c3cb5095 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.6.12
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.xz http://pf.natalenko.name/sources/3.6/patch-3.6.12-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7f05b55f7826303d6e29e6156af03d55
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.7.5 b/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
index 38e7cb4fb410..ade1fd875598 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.7.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://pf.natalenko.name/sources/3.7/patch-3.7.5-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d7794b5f12e141f25ff0f467b5f24b1f
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.8.2 b/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
index 80c6469da360..66bbf1df689d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.8.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz http://pf.natalenko.name/sources/3.8/patch-3.8.2-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4c5cb7ea192553a1f35c38e842608d5
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.9.1 b/metadata/md5-cache/sys-kernel/pf-sources-3.9.1
index 91f31585cde8..26e19884eca3 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.9.1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.9.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.1-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=de850b7a977e5d04c8cbd47109c7c40a
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.9.2 b/metadata/md5-cache/sys-kernel/pf-sources-3.9.2
index d8594e267e10..c096875538b8 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.9.2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.9.2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.2-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=9baaa6d9532dd07e7760f63470fabcc0
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.9.3 b/metadata/md5-cache/sys-kernel/pf-sources-3.9.3
index 81ed8ae1afc4..e51a77103b2a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.9.3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.9.3
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.3-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=dfebc1e3115eb8150d53c20b22f7a752
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.9.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.9.4
index 2b2fedfb3197..9d68cd66e149 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.9.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.9.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.4-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=0ef49ba15ba93de60f06ffb350bfe69d
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.9.5 b/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
index 267026b0f2c2..aa52b73e8235 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.5-pf.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ab1a8079e94b114e71104f82ed6f2ff5
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-3.10.10_pre-r20130830 b/metadata/md5-cache/sys-kernel/raspberrypi-image-3.10.10_pre-r20130830
new file mode 100644
index 000000000000..739438b67a9a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-3.10.10_pre-r20130830
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Raspberry PI precompiled kernel and modules
+EAPI=5
+HOMEPAGE=https://github.com/raspberrypi/firmware
+KEYWORDS=~arm -*
+LICENSE=GPL-2
+RESTRICT=binchecks mirror strip
+SLOT=3.10.10_pre-r20130830
+SRC_URI=https://dev.gentoo.org/~xmw/raspberrypi-image/raspberrypi-image-3.10.10_pre-r20130830.tar.xz
+_md5_=cebc34a88156fc6fd0a9eba900804de1
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-3.6.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-image-3.6.9999
index 9cbd54f093ff..3e317e98fcbc 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-3.6.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-3.6.9999
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2 raspberrypi-videocore-bin
 RESTRICT=binchecks strip
 SLOT=3.6.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5a1b895a2813571b91713c61eec24ab5
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-3.9.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-image-3.9.9999
index f1b1203261d2..1d79ccd44a0e 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-3.9.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-3.9.9999
@@ -7,5 +7,5 @@ IUSE=doc
 LICENSE=GPL-2 raspberrypi-videocore-bin
 RESTRICT=binchecks strip
 SLOT=3.9.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=93b32a9dd8c86156a9a9f84181855705
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
index aa293d997f23..5b067c9efd67 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.1_pre-r20130719
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://dev.gentoo.org/~xmw/raspberrypi-sources/raspberrypi-sources-3.10.1_pre-r20130719.patch.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=4772cc56eed38ef06fafd245e481ad86
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
index 7c2238a1e85d..4f0f7392df9b 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
@@ -9,5 +9,5 @@ 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=3.10.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=a66f16cacc26afb0497cb8254fcb8a3a
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.11-r20130711 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.11-r20130711
index aa383ad5034e..59020d473066 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.11-r20130711
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.11-r20130711
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.6.11-r20130711
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.6.11.xz mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.xz http://dev.gentoo.org/~xmw/raspberrypi-sources/raspberrypi-sources-3.6.11-r20130711.patch.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=2f103c994c66e9ee3195c8969ecda8bd
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.9999
index a0845f64d3b1..9b289511340d 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.6.9999
@@ -9,5 +9,5 @@ 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=3.6.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d43aa646e583e8c02984cb9bc66fcb7d
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.8.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.8.9999
index 34a084f28c4e..3d3b52e1e90f 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.8.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.8.9999
@@ -9,5 +9,5 @@ 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=3.8.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5b000260cf799b778463e2d923980e04
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.10_pre-r20130715 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.10_pre-r20130715
index 132c22a0bc16..8cebf22a1af1 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.10_pre-r20130715
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.10_pre-r20130715
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.10_pre-r20130715
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.9.10.xz mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://dev.gentoo.org/~xmw/raspberrypi-sources/raspberrypi-sources-3.9.10_pre-r20130715.patch.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3bc981b6e2a44b760286212be2624b0d
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.9999
index 18f9028b39ee..964b027b0dfd 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.9.9999
@@ -9,5 +9,5 @@ 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=3.9.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=fa8217d0efa3f5dd8fbe876cee6e5484
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
index 33de39ea0d01..ee1a3b4c396f 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://download.rsbac.org/patches/1.4.7/patch-linux-3.10.7-rsbac-1.4.7.diff.xz mirror://gentoo/genpatches-3.10-13.base.tar.xz mirror://gentoo/genpatches-3.10-13.extras.tar.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=92abb33225e60a82f382288eeba1b4be
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.10.6_p3 b/metadata/md5-cache/sys-kernel/rt-sources-3.10.6_p3
index 43c3a6acdbd4..45e9347bbb37 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.10.6_p3
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.10.6_p3
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.6_p3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.6.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://kernel/linux/kernel/projects/rt/3.10/patch-3.10.6-rt3.patch.xz mirror://kernel/linux/kernel/projects/rt/3.10/older/patch-3.10.6-rt3.patch.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1f02c796dacccabd12914292ae2b0fde
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72 b/metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72
index a47176ffe4b9..e367f29c4666 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.4.57_p72
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.57_p72
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.57.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://kernel/linux/kernel/projects/rt/3.4/patch-3.4.57-rt72.patch.xz mirror://kernel/linux/kernel/projects/rt/3.4/older/patch-3.4.57-rt72.patch.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=cbc5ee019b89b5adba2a143c4c056acc
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15 b/metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15
index 2624e954e67c..5824f81830e9 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.8.13_p15
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.8.13_p15
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.8.13.xz mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-3.8 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.8.N/deblob-check -> deblob-check-3.8 ) mirror://kernel/linux/kernel/projects/rt/3.8/patch-3.8.13-rt15.patch.xz mirror://kernel/linux/kernel/projects/rt/3.8/older/patch-3.8.13-rt15.patch.xz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e0c9e88f5c560d202a3678c1e59b5d0d
diff --git a/metadata/md5-cache/sys-kernel/spl-9999 b/metadata/md5-cache/sys-kernel/spl-9999
index 45f676375ad9..c2f79cbebe6e 100644
--- a/metadata/md5-cache/sys-kernel/spl-9999
+++ b/metadata/md5-cache/sys-kernel/spl-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=99b7fcef2df854c7294d1565ce619bcc
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.78 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.78
index 6fc480f2a22a..a3ed40299f2b 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.78
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.78
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.0.78
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz mirror://gentoo/genpatches-3.0-49.base.tar.xz mirror://gentoo/genpatches-3.0-49.extras.tar.xz http://tuxonice.net/downloads/all/tuxonice-for-linux-3.0-78-2013-05-12.patch.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=77c38dcf0a859a5535eba5c591d098d2
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.80 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.80
index 571ac5b51cd7..ad15f9d0684b 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.80
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.0.80
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.0.80
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz mirror://gentoo/genpatches-3.0-51.base.tar.xz mirror://gentoo/genpatches-3.0-51.extras.tar.xz http://tuxonice.net/downloads/all/tuxonice-for-linux-3.0-80-2013-05-26.patch.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=08a0e8ead660e3f3d1d7a0c80270b842
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.45 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.45
index 21d642406fa0..cc1485aa2a0d 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.45
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.45
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.4.45
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-27.base.tar.xz mirror://gentoo/genpatches-3.4-27.extras.tar.xz http://tuxonice.net/downloads/all/tuxonice-for-linux-3.4-45-2013-05-12.patch.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7054593ae6f21b322516c1d2a6e2c961
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.47 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.47
index 441642691b2b..cee3aaeb62d8 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.47
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.47
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.4.47
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-29.base.tar.xz mirror://gentoo/genpatches-3.4-29.extras.tar.xz http://tuxonice.net/downloads/all/tuxonice-for-linux-3.4-47-2013-05-26.patch.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6d55fb7163b82523a8ad2e7a13a53fc8
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.8.13 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.8.13
index a56681dfd199..03ec27c1aa32 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.8.13
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.8.13
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.8.13
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz mirror://gentoo/genpatches-3.8-16.base.tar.xz mirror://gentoo/genpatches-3.8-16.extras.tar.xz http://tuxonice.net/downloads/all/tuxonice-for-linux-3.8-13-2013-05-12.patch.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8b9e72b11043283ed43f42f0d62786af
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.9.4 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.9.4
index 5e8e33fbf94e..ded70812caa0 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.9.4
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.9.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz mirror://gentoo/genpatches-3.9-8.base.tar.xz mirror://gentoo/genpatches-3.9-8.extras.tar.xz http://tuxonice.net/downloads/all/tuxonice-for-linux-3.9-4-2013-05-26.patch.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6b0a81314f7f6eb0ea8c553a0ff79cc5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.94 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.94
index 12c6af095f4a..b8e3886c4deb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.94
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.0.94
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.94
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.0.94.xz mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-3.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.0.N/deblob-check -> deblob-check-3.0 )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=697d110f5d47b968e7b2cfc87c9f62c6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.10 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.10
index 30af542aa103..5d687e1fd4d8 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.10
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.10
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.10
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.10.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74c57c9ddea944d79270036ab4487e32
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.0
index 8fae2803426c..2ab17725e7a3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.11.0
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11.0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.11.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-3.11 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.11.N/deblob-check -> deblob-check-3.11 )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5479f57a2df3cecf162fa16de43fd831
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.50 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.50
index ca274effc3b6..a78514835be9 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.50
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.50
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.2.50
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.50.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=375153700137c1a0bf0c2093ecdc9137
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.60 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.60
index a27f38b7845f..85cc13317364 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.60
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.60
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.60
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.60.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=5f2dd723d963c4fc46bec93fd8454d47
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
index 5b5b7740a9b2..a53178143fc4 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.0.36.32
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-2.6.35 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.35.N/deblob-check -> deblob-check-2.6.35 ) mirror://gentoo/genpatches-2.6.35-9.base.tar.xz mirror://gentoo/genpatches-2.6.35-9.extras.tar.xz http://dev.gentoo.org/~hollow/distfiles/vserver-patches-2.6.35_2.3.0.36.32.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3e1dc4107c85b6b1a5523a7748c7f6bc
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8
index 397f7f08cd74..3962491a5914 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.2.8
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.2.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.11.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.2.11-vs2.3.2.8.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=305e0940ab4e151a0ab99d0eaf47c41c
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2
index 9848fdf0a3e5..2b4735e38f63 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.3.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.3.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.3.1-vs2.3.3.2.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e4e92c1340e038f6fcb6201a6e08bdf5
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3
index e64eb94589e6..4dc7fadd321d 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.3
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.3.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.3.5.xz mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.3.5-vs2.3.3.3.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=359b3895746d5e8faeee582d3c425921
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4
index d49c0a721f77..50107b9ba0e8 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.3.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.4-vs2.3.3.4.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=be022aa25f3b180969c2e33573c42d78
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1
index fd4bba6c889a..e5af6e3a24b8 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.4-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.3.4-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.4.1-vs2.3.3.4.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=370ca7e0961d5044fbec19a89194b8c0
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5
index 304f9c5696f3..5903190ed97a 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.3.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.4.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.4.4-vs2.3.3.5.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=8937c164c2cd3350ef2771eaca90e1bc
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5-r1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5-r1
index adaf5b9c94a4..2b30d574abd9 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5-r1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.3.5-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.3.5-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.5.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.4.5-vs2.3.3.5.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b5fe0137137e470e43deb2e748310a11
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4
index 92f5c4bca25c..01be19650d8c 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.5-vs2.3.4.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=906c5dc2cd1a0adfc604db89dc5bb89c
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1
index d091386ab5b3..b7100c979e02 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.4.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.5.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.5.1-vs2.3.4.1.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=514021524f313b42804b2eeb0ce4a9fe
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1-r1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1-r1
index 307d535940bb..dd2734be6754 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1-r1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.1-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.4.1-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.5.2.xz mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.5.2-vs2.3.4.1.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=7d3595e56bc3dcf51840aa0be8092460
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.3 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.3
index 194ee4fac3eb..74837f4cd8f2 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.3
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.3
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.4.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.5.4.xz mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.5.4-vs2.3.4.3.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b6ccae31164821d99e379488394dd464
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4
index f633531d6ee2..8436312ec15e 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.4.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.5.7.xz mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.5.7-vs2.3.4.4.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=3616e9dec97364113b404d1eb0f4eab1
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4-r1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4-r1
index 0586ec264236..7a8a41194a8c 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4-r1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.4-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.4.4-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.6.9.xz mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.6.9-vs2.3.4.4.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=ccc8be77465736ccb70c8cc0b3b33d50
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.6 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.6
index 4fbd718946e2..00dd0ce3a30e 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.6
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.4.6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.4.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.6.11.xz mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.6.11-vs2.3.4.6.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=d4935ead11cd9b6cfbb99ca885b43f20
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.1
index ab49cc1f9857..e18fc59d5e2a 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.5.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.7-vs2.3.5.1.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=96c2c89319f7841cb5362859c6b88b34
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.4 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.4
index ab3bf2d04d1b..b919825fef6e 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.4
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.5.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.7.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.7.1-vs2.3.5.4.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=58821bef9e8b881ecef5162e491a29a1
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.5 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.5
index 388b36b711ea..81b73324230d 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.5
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.5.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.7.2.xz mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.7.2-vs2.3.5.5.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=bb07ce02588b90384ef4b7ee53c44eea
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6
index 47a6f52f6f2b..017256e1ccd6 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.5.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.7.9.xz mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.7.9-vs2.3.5.6.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=29dbeda639549e029168a42e1164318a
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6-r1 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6-r1
index bbc50709d503..c176dbc71a81 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6-r1
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.6-r1
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.5.6-r1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.7.10.xz mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.7.10-vs2.3.5.6.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e8cdfae0176a1498071576e56e5bdf67
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
index 0cfd105b1934..11bb81d77333 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.9.10.xz mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.9.10-vs2.3.6.5.diff
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=685e1d05496e98faa1daff4bdadefb3f
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index 687cb39d609f..74dda33353cd 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=b65eab898b45b22ff548684b94a6c882
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
index 4e64830fc243..d05f39c828b0 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
@@ -9,5 +9,5 @@ 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=3.10.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=74a1f279f1382f2650452686230919c9
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
index f79a71f5e2e9..1cebc73e4388 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
@@ -9,5 +9,5 @@ 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=3.8.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1d1595b0d86db6e36b790901026e751b
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
index e38de9981a9f..166322cd6516 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
@@ -9,5 +9,5 @@ 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=3.9.9999
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	kernel-2	cab6b3a303da6906006f0ece840e3213	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	kernel-2	72c82b0482225ffcdcdbaf48b37cea58	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e831f162877d41f34ff1d43dc973347b
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 76080ad4449e..6fb27f6f96a0 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -7,5 +7,5 @@ LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=16abfc0d6a783c098dbe0d7c09758a6b
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.7-r1 b/metadata/md5-cache/sys-libs/gpm-1.20.7-r1
index d8de53d06262..d76ea4553c75 100644
--- a/metadata/md5-cache/sys-libs/gpm-1.20.7-r1
+++ b/metadata/md5-cache/sys-libs/gpm-1.20.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Console-based mouse driver
 EAPI=4
 HOMEPAGE=http://www.nico.schottelius.org/software/gpm/
 IUSE=selinux static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses selinux? ( sec-policy/selinux-gpm )
 SLOT=0
 SRC_URI=http://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.lzma
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=63260f5f6758902d81aa5cbbb8193fce
+_md5_=2f24749f42893ba0cb8b456df494125e
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-9999 b/metadata/md5-cache/sys-libs/libcxxrt-9999
index ed305030e8fc..3c172ce3d616 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-9999
+++ b/metadata/md5-cache/sys-libs/libcxxrt-9999
@@ -7,5 +7,5 @@ IUSE=libunwind static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_x86_32 abi_x86_
 LICENSE=BSD-2
 RDEPEND=libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c2acb5474f755b65eede2f571d4e1db7
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.1.13-r4 b/metadata/md5-cache/sys-libs/libselinux-2.1.13-r4
index 7944cfebebbf..8107f64c1860 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.1.13-r4
+++ b/metadata/md5-cache/sys-libs/libselinux-2.1.13-r4
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/libsepol-2.1.9 >=dev-libs/libpcre-8.30-r2[static-libs?] pytho
 SLOT=0
 SRC_URI=http://userspace.selinuxproject.org/releases/20130423/libselinux-2.1.13.tar.gz http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-libselinux-2.1.13-r3.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=88b3122c31386cd106f99a408a9ba23e
+_md5_=32881ad5732724930443c5364d9ae0b8
diff --git a/metadata/md5-cache/sys-libs/musl-9999 b/metadata/md5-cache/sys-libs/musl-9999
index 59ce0ff60e3f..ce2f5340f7dc 100644
--- a/metadata/md5-cache/sys-libs/musl-9999
+++ b/metadata/md5-cache/sys-libs/musl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.musl-libc.org/
 IUSE=crosscompile_opts_headers-only
 LICENSE=MIT
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ae38ab17af7c456a2f008960b555c1ba
diff --git a/metadata/md5-cache/sys-libs/suacomp-9999 b/metadata/md5-cache/sys-libs/suacomp-9999
index 0e26e32a321c..8a90096c3fb6 100644
--- a/metadata/md5-cache/sys-libs/suacomp-9999
+++ b/metadata/md5-cache/sys-libs/suacomp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://suacomp.sf.net
 IUSE=debug
 LICENSE=BEER-WARE
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=035d83302ba61a76584e6bb5d9913dc0
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.19 b/metadata/md5-cache/sys-libs/tevent-0.9.19
index 80540b3fc2a2..bc367c232562 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.19
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.19
@@ -4,11 +4,11 @@ DESCRIPTION=Samba tevent library
 EAPI=5
 HOMEPAGE=http://tevent.samba.org/
 IUSE=python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/talloc-2.0.8[python] python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://samba.org/ftp/tevent/tevent-0.9.19.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=47bde83357de87909e0375e9f28dbd80
+_md5_=22ff2328e0dcafef990c197f05405c2a
diff --git a/metadata/md5-cache/sys-libs/uclibc-9999 b/metadata/md5-cache/sys-libs/uclibc-9999
index cdf1beb60b20..12e18356b293 100644
--- a/metadata/md5-cache/sys-libs/uclibc-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-9999
@@ -6,5 +6,5 @@ IUSE=debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_o
 LICENSE=LGPL-2
 RESTRICT=strip
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d1d73b00f1f4e0aad4bfab4cf41995c
diff --git a/metadata/md5-cache/sys-power/acpi_call-9999 b/metadata/md5-cache/sys-power/acpi_call-9999
index 5469e3472a8b..97b8728d6171 100644
--- a/metadata/md5-cache/sys-power/acpi_call-9999
+++ b/metadata/md5-cache/sys-power/acpi_call-9999
@@ -7,5 +7,5 @@ IUSE=kernel_linux
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=6846718def3d15ef16ab222097386864
diff --git a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r4 b/metadata/md5-cache/sys-power/phc-intel-0.3.199.11_pre
similarity index 72%
rename from metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r4
rename to metadata/md5-cache/sys-power/phc-intel-0.3.199.11_pre
index 11dc9a661b07..9881dc120991 100644
--- a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r4
+++ b/metadata/md5-cache/sys-power/phc-intel-0.3.199.11_pre
@@ -1,13 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Processor Hardware Control for Intel CPUs
-EAPI=2
-HOMEPAGE=http://www.linux-phc.org/
+EAPI=5
+HOMEPAGE=http://www.linux-phc.org/ http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=94 -> phc-intel-0.3.2.12.1.tar.bz2
+SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=58f847f2c6ed372576a899affcfdfb52
+_md5_=8c780d7e9bc6fcc8c85d1d5c54ebde95
diff --git a/metadata/md5-cache/sys-power/phc-intel-0.3.199.3_pre b/metadata/md5-cache/sys-power/phc-intel-0.3.199.3_pre
deleted file mode 100644
index 196943120116..000000000000
--- a/metadata/md5-cache/sys-power/phc-intel-0.3.199.3_pre
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Processor Hardware Control for Intel CPUs
-EAPI=2
-HOMEPAGE=http://www.linux-phc.org/
-IUSE=kernel_linux
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=86 -> phc-intel-0.3.199.3_pre.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c1c2268d968b41dea51c7a6d9e3cd7d2
diff --git a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r5 b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r5
index f7ab6f3e8581..f0df26465192 100644
--- a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r5
+++ b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r5
@@ -10,4 +10,4 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=94 -> phc-intel-0.3.2.12.1.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2a4642df39c06b5fc4bf14bec75db3a2
+_md5_=32b85ffd43fdb46c44becc53f4f8839f
diff --git a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r3 b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.11
similarity index 73%
rename from metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r3
rename to metadata/md5-cache/sys-power/phc-intel-0.3.2.12.11
index e5c2547fe0bc..20b20e67a193 100644
--- a/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.1-r3
+++ b/metadata/md5-cache/sys-power/phc-intel-0.3.2.12.11
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 DESCRIPTION=Processor Hardware Control for Intel CPUs
-EAPI=2
-HOMEPAGE=http://www.linux-phc.org/
+EAPI=5
+HOMEPAGE=http://www.linux-phc.org/ http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267
 IUSE=kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=94 -> phc-intel-0.3.2.12.1.tar.bz2
+SRC_URI=http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=13f8a32d95787ab6261bb6db13e7410f
+_md5_=8474ed54267b4fda38ea5286ca8a31f3
diff --git a/metadata/md5-cache/sys-power/powertop-2.4 b/metadata/md5-cache/sys-power/powertop-2.4
index e8a7a0377e8e..1faa22394af1 100644
--- a/metadata/md5-cache/sys-power/powertop-2.4
+++ b/metadata/md5-cache/sys-power/powertop-2.4
@@ -4,10 +4,10 @@ DESCRIPTION=tool that helps you find what software is using the most power
 EAPI=5
 HOMEPAGE=https://01.org/powertop/
 IUSE=unicode X
-KEYWORDS=amd64 ~arm ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
 SRC_URI=https://01.org/powertop/sites/default/files/downloads/powertop-2.4.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9ab5c9c6c2e1f8274cf473aebb4099b1
+_md5_=262f6c5dec1ce67ae2587676de422287
diff --git a/metadata/md5-cache/sys-power/powertop-9999 b/metadata/md5-cache/sys-power/powertop-9999
index adeeb2665908..aa786dd181f7 100644
--- a/metadata/md5-cache/sys-power/powertop-9999
+++ b/metadata/md5-cache/sys-power/powertop-9999
@@ -7,5 +7,5 @@ IUSE=unicode X
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses[unicode?] X? ( x11-apps/xset ) virtual/libintl
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=45c7d359c0bd10fef16e182115f05818
diff --git a/metadata/md5-cache/sys-power/upower-0.9.21 b/metadata/md5-cache/sys-power/upower-0.9.21
index d948dc01f556..b14d65f62c73 100644
--- a/metadata/md5-cache/sys-power/upower-0.9.21
+++ b/metadata/md5-cache/sys-power/upower-0.9.21
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices and querying history
 EAPI=5
 HOMEPAGE=http://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux systemd
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.22 sys-apps/dbus >=sys-auth/polkit-0.110 introspection? ( dev-libs/gobject-introspection ) kernel_linux? ( virtual/libusb:1 >=virtual/udev-200[gudev] ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) kernel_linux? ( !systemd? ( >=sys-power/pm-utils-1.4.1 ) systemd? ( app-shells/bash >=sys-apps/systemd-200 ) )
 SLOT=0
 SRC_URI=http://upower.freedesktop.org/releases/upower-0.9.21.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9725fbdced8b2a0f059e8b65364061bb
+_md5_=39e9448d70f5fe17f96d3405a8e1c61d
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index 3c9fb94528c2..3aee1b729c59 100644
--- a/metadata/md5-cache/sys-process/iotop-0.6
+++ b/metadata/md5-cache/sys-process/iotop-0.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=http://guichaz.free.fr/iotop//files/iotop-0.6.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e84ac8307c5f4ec1ae246d18b73c4533
+_md5_=46d7db5aa4f9ed69f753c9e46ed3ebdb
diff --git a/metadata/md5-cache/sys-process/numad-9999 b/metadata/md5-cache/sys-process/numad-9999
index 3569beb1f046..b1dd4ac1d596 100644
--- a/metadata/md5-cache/sys-process/numad-9999
+++ b/metadata/md5-cache/sys-process/numad-9999
@@ -5,5 +5,5 @@ EAPI=4
 HOMEPAGE=http://fedoraproject.org/wiki/Features/numad
 LICENSE=LGPL-2.1
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=1192f6944a909c540ff58351e4c8d1f5
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4 b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4
new file mode 100644
index 000000000000..56cdc101b3ef
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Command-1.170.0-r4
@@ -0,0 +1,6 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for ExtUtils-Command
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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
+RDEPEND=|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/ExtUtils-Command-1.170.0 )
+SLOT=0
+_md5_=cccb876cdc81bcf7ee88edabc386e992
diff --git a/metadata/md5-cache/virtual/perl-Pod-Simple-3.280.0 b/metadata/md5-cache/virtual/perl-Pod-Simple-3.280.0
index 86cf7241deea..dfc3bcf4a8bd 100644
--- a/metadata/md5-cache/virtual/perl-Pod-Simple-3.280.0
+++ b/metadata/md5-cache/virtual/perl-Pod-Simple-3.280.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Pod-Simple
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-RDEPEND=~perl-core/Pod-Simple-3.280.0
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/Pod-Simple-3.280.0 )
 SLOT=0
-_md5_=e1028b7070808d4d4b20224a7d6b8245
+_md5_=14372d86f3203131cf4b433aa055e0de
diff --git a/metadata/md5-cache/virtual/pmw-1 b/metadata/md5-cache/virtual/pmw-1
index fbdacc2fe4be..93ee0e34ae5e 100644
--- a/metadata/md5-cache/virtual/pmw-1
+++ b/metadata/md5-cache/virtual/pmw-1
@@ -6,4 +6,4 @@ KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 RDEPEND=python_targets_python2_6? ( dev-python/pmw:py2[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pmw:py2[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_2? ( dev-python/pmw:py3[python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/pmw:py3[python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] )
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=e9d4d612862c904cc7750a2ef4bb93fa
+_md5_=5497154723d9ede340bb0be76016c040
diff --git a/metadata/md5-cache/virtual/pyparsing-0 b/metadata/md5-cache/virtual/pyparsing-0
index 31191854f59a..cdb4ff8582a5 100644
--- a/metadata/md5-cache/virtual/pyparsing-0
+++ b/metadata/md5-cache/virtual/pyparsing-0
@@ -6,4 +6,4 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
 RDEPEND=<dev-python/pyparsing-1.5.6-r2
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=c9762a77a161b41bcf21386207f79d90
+_md5_=dde5b40c8bdc504268e429830f61d2bc
diff --git a/metadata/md5-cache/virtual/pyparsing-1 b/metadata/md5-cache/virtual/pyparsing-1
index f6e8c0fd4f77..a00f74a7e1b3 100644
--- a/metadata/md5-cache/virtual/pyparsing-1
+++ b/metadata/md5-cache/virtual/pyparsing-1
@@ -6,4 +6,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=<dev-python/pyparsing-1.5.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=4329d4667c58450d9af3d16e92ac13d7
+_md5_=17cb3ddea3d6da3fe773baabe4a70a8b
diff --git a/metadata/md5-cache/virtual/pyparsing-2 b/metadata/md5-cache/virtual/pyparsing-2
index bf3f4ad3d988..f0657fb73875 100644
--- a/metadata/md5-cache/virtual/pyparsing-2
+++ b/metadata/md5-cache/virtual/pyparsing-2
@@ -6,4 +6,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=python_targets_python2_6? ( dev-python/pyparsing:py2[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] ) python_targets_python2_7? ( dev-python/pyparsing:py2[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] ) python_targets_pypy2_0? ( dev-python/pyparsing:py2[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] ) python_targets_python3_2? ( dev-python/pyparsing:py3[python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/pyparsing:py3[python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] )
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=86473fecf8f5d1906fc477ab6b11165b
+_md5_=3c41f67c082b40ff65acd63d9b92efed
diff --git a/metadata/md5-cache/virtual/pyparsing-3 b/metadata/md5-cache/virtual/pyparsing-3
index 9370b693e2bf..605339c26c37 100644
--- a/metadata/md5-cache/virtual/pyparsing-3
+++ b/metadata/md5-cache/virtual/pyparsing-3
@@ -6,4 +6,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=>=dev-python/pyparsing-2.0.1:0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=a338f7030cf4ae36935a9dd647524f33
+_md5_=60890628bd6be69b83c0a4c7816d3a37
diff --git a/metadata/md5-cache/virtual/python-argparse-0 b/metadata/md5-cache/virtual/python-argparse-0
index a9b934adfbd2..6c5decfeb7d2 100644
--- a/metadata/md5-cache/virtual/python-argparse-0
+++ b/metadata/md5-cache/virtual/python-argparse-0
@@ -3,7 +3,7 @@ DESCRIPTION=A virtual for the Python argparse module
 EAPI=5
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-RDEPEND=python_targets_python2_5? ( dev-python/argparse ) python_targets_python2_6? ( dev-python/argparse ) python_targets_python3_1? ( dev-python/argparse )
+RDEPEND=python_targets_python2_6? ( dev-python/argparse )
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=9a2e4303d7004540a05370b3b795e0a4
+_md5_=bfddd1f9eee1ee602bd8378f9faf9a94
diff --git a/metadata/md5-cache/virtual/python-argparse-1 b/metadata/md5-cache/virtual/python-argparse-1
index 0bad8f5c873b..b9c2832c4817 100644
--- a/metadata/md5-cache/virtual/python-argparse-1
+++ b/metadata/md5-cache/virtual/python-argparse-1
@@ -3,7 +3,7 @@ DESCRIPTION=A virtual for the Python argparse module
 EAPI=5
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
-RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-python/argparse[python_targets_python2_5] ) python_targets_python2_6? ( dev-python/argparse[python_targets_python2_6] ) python_targets_python3_1? ( dev-python/argparse[python_targets_python3_1] )
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-python/argparse[python_targets_python2_6] )
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=c2dbdcd09a513cf712eda4fe93599041
+_md5_=aa034f6936d04b5394453d6793ff843d
diff --git a/metadata/md5-cache/virtual/python-imaging-1 b/metadata/md5-cache/virtual/python-imaging-1
index 665fbe4d43c0..52770521c5ba 100644
--- a/metadata/md5-cache/virtual/python-imaging-1
+++ b/metadata/md5-cache/virtual/python-imaging-1
@@ -3,8 +3,7 @@ DESCRIPTION=Virtual for Python Imaging Library
 EAPI=5
 IUSE=tk python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-RDEPEND=python_targets_python2_5? ( dev-python/imaging[tk?,python_targets_python2_5(-)] ) python_targets_python2_6? ( || ( dev-python/pillow[tk?,python_targets_python2_6(-)] dev-python/imaging[tk?,python_targets_python2_6(-)] ) ) python_targets_python2_7? ( || ( dev-python/pillow[tk?,python_targets_python2_7(-)] dev-python/imaging[tk?,python_targets_python2_7(-)] ) ) python_targets_python3_2? ( dev-python/pillow[tk?,python_targets_python3_2(-)] ) python_targets_python3_3? ( dev-python/pillow[tk?,python_targets_python3_3(-)] )
-REQUIRED_USE=python_targets_python2_5? ( !python_targets_python3_2 !python_targets_python3_3 )
+RDEPEND=python_targets_python2_6? ( || ( dev-python/pillow[tk?,python_targets_python2_6(-)] dev-python/imaging[tk?,python_targets_python2_6(-)] ) ) python_targets_python2_7? ( || ( dev-python/pillow[tk?,python_targets_python2_7(-)] dev-python/imaging[tk?,python_targets_python2_7(-)] ) ) python_targets_python3_2? ( dev-python/pillow[tk?,python_targets_python3_2(-)] ) python_targets_python3_3? ( dev-python/pillow[tk?,python_targets_python3_3(-)] )
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=1d7748d56c84f9408ec25ad7baaf3290
+_md5_=8f5106ea874404d706d41a5b0ae3c50b
diff --git a/metadata/md5-cache/virtual/python-json-0 b/metadata/md5-cache/virtual/python-json-0
index c9921d1f4a26..691238ea0140 100644
--- a/metadata/md5-cache/virtual/python-json-0
+++ b/metadata/md5-cache/virtual/python-json-0
@@ -3,7 +3,7 @@ DESCRIPTION=A virtual for JSON support in Python, with simplejson fallback
 EAPI=5
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=amd64 arm ~hppa ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] )
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=308dd9731800fc37cd73d48fe7e1d20c
+_md5_=6233c4a4692b223b239c5bce4377a4dc
diff --git a/metadata/md5-cache/virtual/python-unittest2-1 b/metadata/md5-cache/virtual/python-unittest2-1
index 9fc38024940e..a4ae16796982 100644
--- a/metadata/md5-cache/virtual/python-unittest2-1
+++ b/metadata/md5-cache/virtual/python-unittest2-1
@@ -6,4 +6,4 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd6
 RDEPEND=dev-python/unittest2:0
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=acdbf7480b020972bf1f2f1ad0176683
+_md5_=4a2ae9ec80d84f34b4dff05cff4c9efb
diff --git a/metadata/md5-cache/virtual/python-unittest2-1-r1 b/metadata/md5-cache/virtual/python-unittest2-1-r1
index fd84bc8cdc4a..489c49159d9d 100644
--- a/metadata/md5-cache/virtual/python-unittest2-1-r1
+++ b/metadata/md5-cache/virtual/python-unittest2-1-r1
@@ -7,4 +7,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=530ed917651c47851dd1e9b10bba089c
+_md5_=c2b56387243f60749c11335be9e423b7
diff --git a/metadata/md5-cache/virtual/python-unittest2-1-r2 b/metadata/md5-cache/virtual/python-unittest2-1-r2
index fdb31f6bcade..47bb045aced6 100644
--- a/metadata/md5-cache/virtual/python-unittest2-1-r2
+++ b/metadata/md5-cache/virtual/python-unittest2-1-r2
@@ -3,8 +3,8 @@ DESCRIPTION=A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1
 EAPI=5
 IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-python/unittest2[python_targets_python2_5] ) python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] ) python_targets_python3_1? ( dev-python/unittest2[python_targets_python3_1] )
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] )
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 _eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=dfa629bff7e61867fa81fce7e519401e
+_md5_=5c149d272c02c1d3c48cc9f14ad8e237
diff --git a/metadata/md5-cache/virtual/ruby-minitest-0-r3 b/metadata/md5-cache/virtual/ruby-minitest-0-r3
index aa107742d41d..e96b2a511adf 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-0-r3
+++ b/metadata/md5-cache/virtual/ruby-minitest-0-r3
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby minitest library
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/minitest[ruby_targets_ruby18] ) ruby_targets_ruby19? ( || ( dev-ruby/minitest[ruby_targets_ruby19] dev-lang/ruby:1.9 ) ) ruby_targets_ruby20? ( || ( dev-ruby/minitest[ruby_targets_ruby20] dev-lang/ruby:2.0 ) ) ruby_targets_jruby? ( dev-ruby/minitest[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby )
 SLOT=0
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=181105b32701dd8ffa2c2708a18bdf60
+_md5_=dd6c0e9e9358c8a021a8d8fea85f79f3
diff --git a/metadata/md5-cache/virtual/ruby-rdoc-3 b/metadata/md5-cache/virtual/ruby-rdoc-3
index 82d5a7f147c4..ccb5a50f089c 100644
--- a/metadata/md5-cache/virtual/ruby-rdoc-3
+++ b/metadata/md5-cache/virtual/ruby-rdoc-3
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=Virtual ebuild for bundled and unbundled RDoc
 EAPI=5
 IUSE=elibc_FreeBSD ruby_targets_ruby20
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 RDEPEND=|| ( dev-ruby/rdoc[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=ruby20
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0c045b94694727584e923680a062a77e
+_md5_=678f6fb4bca9bb1459fadfb08258a5e2
diff --git a/metadata/md5-cache/virtual/rubygems-6 b/metadata/md5-cache/virtual/rubygems-6
index b196dbba280d..8b424cc22611 100644
--- a/metadata/md5-cache/virtual/rubygems-6
+++ b/metadata/md5-cache/virtual/rubygems-6
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=5
 IUSE=elibc_FreeBSD ruby_targets_ruby20
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd
 RDEPEND=dev-ruby/rubygems[ruby_targets_ruby20] ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=ruby20
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b34f78bbcdc09ef572747da93533ebbf
+_md5_=abd836db00f84fc69e30199113790dc8
diff --git a/metadata/md5-cache/www-apache/mod_spdy-9999 b/metadata/md5-cache/www-apache/mod_spdy-9999
index 33bd6ca6c22c..1205c263b105 100644
--- a/metadata/md5-cache/www-apache/mod_spdy-9999
+++ b/metadata/md5-cache/www-apache/mod_spdy-9999
@@ -7,5 +7,5 @@ IUSE=debug test
 LICENSE=Apache-2.0
 RDEPEND=sys-libs/zlib[minizip] =www-servers/apache-2.2*
 SLOT=0
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	subversion	e80e84db0fc102c2959858102060bec9	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=ee422799834a92c2c0af5b9606b5b3c8
diff --git a/metadata/md5-cache/www-apache/modsec-flameeyes-99999999 b/metadata/md5-cache/www-apache/modsec-flameeyes-99999999
index 72cef6746925..a1cccbea0653 100644
--- a/metadata/md5-cache/www-apache/modsec-flameeyes-99999999
+++ b/metadata/md5-cache/www-apache/modsec-flameeyes-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.flameeyes.eu/projects/modsec
 LICENSE=CC-BY-SA-3.0
 RDEPEND=>=www-apache/mod_security-2.5.1
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=50edefe0f53bfb50f7b9ec0e41726c15
diff --git a/metadata/md5-cache/www-apps/cgit-9999 b/metadata/md5-cache/www-apps/cgit-9999
index fa5b7f0c469a..51d0f22cf633 100644
--- a/metadata/md5-cache/www-apps/cgit-9999
+++ b/metadata/md5-cache/www-apps/cgit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/git sys-libs/zlib dev-libs/openssl virtual/httpd-cgi highlight? ( app-text/highlight ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-1.7.4.tar.bz2
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=0c4af8693569ade74024bac7e7d27106
diff --git a/metadata/md5-cache/www-apps/horizon-2013.1.9999 b/metadata/md5-cache/www-apps/horizon-2013.1.9999
index ed20a3afb49e..41e45e15887d 100644
--- a/metadata/md5-cache/www-apps/horizon-2013.1.9999
+++ b/metadata/md5-cache/www-apps/horizon-2013.1.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/django-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/django-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/django-compressor >=dev-python/django-openstack-auth-1.0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr >=dev-python/python-cinderclient-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-cinderclient-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-keystoneclient[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-novaclient-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-quantumclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-quantumclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lockfile python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=05d95feab1c8315d34c96c269db2314e
diff --git a/metadata/md5-cache/www-apps/horizon-9999 b/metadata/md5-cache/www-apps/horizon-9999
index 8ef40026682e..15d0ff085806 100644
--- a/metadata/md5-cache/www-apps/horizon-9999
+++ b/metadata/md5-cache/www-apps/horizon-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/d2to1-0.2.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/d2to1-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/django-1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/django-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/django-compressor >=dev-python/django-openstack-auth-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netaddr >=dev-python/python-cinderclient-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-cinderclient-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-heatclient-0.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-keystoneclient-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-keystoneclient-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-novaclient-3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-neutronclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/lockfile[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=73f52f0671915a25c1f0826e74be364d
diff --git a/metadata/md5-cache/www-apps/roundup-1.4.21 b/metadata/md5-cache/www-apps/roundup-1.4.21
index d3bcdc2ef0c8..6237857d95af 100644
--- a/metadata/md5-cache/www-apps/roundup-1.4.21
+++ b/metadata/md5-cache/www-apps/roundup-1.4.21
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roundup/roundup-1.4.21.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9974ade26fc29a1ab68518966729dfa8
+_md5_=8a0a59614962104414721a863b5516e9
diff --git a/metadata/md5-cache/www-client/dwb-9999 b/metadata/md5-cache/www-client/dwb-9999
index 749f466aa456..60fb17fc9166 100644
--- a/metadata/md5-cache/www-client/dwb-9999
+++ b/metadata/md5-cache/www-client/dwb-9999
@@ -7,5 +7,5 @@ IUSE=examples gtk3
 LICENSE=GPL-3
 RDEPEND=>=net-libs/libsoup-2.32:2.4 dev-libs/json-c net-libs/gnutls !gtk3? ( >=net-libs/webkit-gtk-1.8.0:2 x11-libs/gtk+:2 ) gtk3? ( >=net-libs/webkit-gtk-1.8.0:3 x11-libs/gtk+:3 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=dcb2073876610ab1378ecdf589ec6a0a
diff --git a/metadata/md5-cache/www-client/google-chrome-30.0.1599.22_beta1 b/metadata/md5-cache/www-client/google-chrome-30.0.1599.28_beta1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-30.0.1599.22_beta1
rename to metadata/md5-cache/www-client/google-chrome-30.0.1599.28_beta1
index bdc569db83c9..d519ababcbc4 100644
--- a/metadata/md5-cache/www-client/google-chrome-30.0.1599.22_beta1
+++ b/metadata/md5-cache/www-client/google-chrome-30.0.1599.28_beta1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-print/cups sys-apps/dbus >=sys-devel/gcc-4.4.0[cxx] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:stable !www-client/google-chrome:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.22-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.22-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.28-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.28-1_i386.deb )
 _eclasses_=chromium	cb805b418b1d27c585f6b2a3321d19ee	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b708b7f1fc2d5a27f50c124625feec79
+_md5_=136f04d4ab0ea48e290308916a7a331d
diff --git a/metadata/md5-cache/www-client/jumanji-9999 b/metadata/md5-cache/www-client/jumanji-9999
index 20512b48dc5c..e66c70d07b27 100644
--- a/metadata/md5-cache/www-client/jumanji-9999
+++ b/metadata/md5-cache/www-client/jumanji-9999
@@ -7,5 +7,5 @@ IUSE=+deprecated savedconfig
 LICENSE=ZLIB
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 !deprecated? ( dev-libs/girara:3 net-libs/webkit-gtk:3 x11-libs/gtk+:3 ) deprecated? ( dev-libs/girara:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) !www-client/jumanji:0
 SLOT=develop
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=49d6d83c5367a6642af94f12a333955d
diff --git a/metadata/md5-cache/www-client/luakit-9999 b/metadata/md5-cache/www-client/luakit-9999
index 94189a67b905..a863e3853a73 100644
--- a/metadata/md5-cache/www-client/luakit-9999
+++ b/metadata/md5-cache/www-client/luakit-9999
@@ -7,5 +7,5 @@ IUSE=luajit vim-syntax
 LICENSE=GPL-3
 RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libunique:1 net-libs/libsoup:2.4 net-libs/webkit-gtk:2 x11-libs/gtk+:2 dev-lua/luafilesystem vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=9c0c88d1a90aa1b6873ebc99fd38d0b3
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index d70d92ee7bf6..d56430edd570 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=zsh-completion? ( app-shells/zsh ) python_targets_python2_7? ( dev-lang/python:2.7[readline] ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=4736e96bc3dc32ecf100605b5816b789
diff --git a/metadata/md5-cache/www-client/uget-9999 b/metadata/md5-cache/www-client/uget-9999
index 2cca05ae7331..09a438e51089 100644
--- a/metadata/md5-cache/www-client/uget-9999
+++ b/metadata/md5-cache/www-client/uget-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libpcre >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 curl? ( >=net-misc/curl-7.10 ) gstreamer? ( media-libs/gstreamer:0.10 ) libnotify? ( x11-libs/libnotify )
 REQUIRED_USE=|| ( aria2 curl )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=d0727602daa774a8b18deeb9155dae5f
diff --git a/metadata/md5-cache/www-client/uzbl-9999 b/metadata/md5-cache/www-client/uzbl-9999
index bdf029811c17..e22c3ec3efcf 100644
--- a/metadata/md5-cache/www-client/uzbl-9999
+++ b/metadata/md5-cache/www-client/uzbl-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 MPL-1.1
 RDEPEND=dev-libs/glib:2 >=dev-libs/icu-4.0.1 >=net-libs/libsoup-2.24:2.4 !gtk3? ( >=net-libs/webkit-gtk-1.1.15:2 >=x11-libs/gtk+-2.14:2 ) gtk3? ( net-libs/webkit-gtk:3 x11-libs/gtk+:3 ) x11-misc/xdg-utils browser? ( x11-misc/xclip ) helpers? ( dev-python/pygtk dev-python/pygobject:2 gnome-extra/zenity net-misc/socat x11-libs/pango x11-misc/dmenu x11-misc/xclip ) tabbed? ( dev-python/pygtk ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=tabbed? ( browser )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=048a8babb293415748c5615b66f64a25
diff --git a/metadata/md5-cache/www-client/vimprobable2-9999 b/metadata/md5-cache/www-client/vimprobable2-9999
index 6000612b200e..c893da8eb5f5 100644
--- a/metadata/md5-cache/www-client/vimprobable2-9999
+++ b/metadata/md5-cache/www-client/vimprobable2-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.vimprobable.org/
 LICENSE=MIT
 RDEPEND=net-libs/libsoup:2.4 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=56d23afe326964118f3cf73fe6170a13
diff --git a/metadata/md5-cache/www-client/weboob-9998 b/metadata/md5-cache/www-client/weboob-9998
index e774937b5040..cbed596ea4de 100644
--- a/metadata/md5-cache/www-client/weboob-9998
+++ b/metadata/md5-cache/www-client/weboob-9998
@@ -8,5 +8,5 @@ LICENSE=AGPL-3
 RDEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/prettytable[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/html2text[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/mechanize[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/feedparser[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] secure-updates? ( app-crypt/gnupg ) fast-libs? ( dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[libyaml,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) virtual/python-json[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/lxml-3.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/cssselect[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=e34a9dd1e7895ea99dbd763c1da9a48c
diff --git a/metadata/md5-cache/www-client/weboob-9999 b/metadata/md5-cache/www-client/weboob-9999
index c01444b2cc98..34f031e91695 100644
--- a/metadata/md5-cache/www-client/weboob-9999
+++ b/metadata/md5-cache/www-client/weboob-9999
@@ -8,5 +8,5 @@ LICENSE=AGPL-3
 RDEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/prettytable[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/html2text[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/mechanize[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/gdata[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/feedparser[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/termcolor[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] secure-updates? ( app-crypt/gnupg ) fast-libs? ( dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pyyaml[libyaml,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) virtual/python-json[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/lxml-3.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/cssselect[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=525ee8f519fca46f810161394ca85267
diff --git a/metadata/md5-cache/www-client/xombrero-9999 b/metadata/md5-cache/www-client/xombrero-9999
index 0169a7944076..4ba357d76010 100644
--- a/metadata/md5-cache/www-client/xombrero-9999
+++ b/metadata/md5-cache/www-client/xombrero-9999
@@ -7,5 +7,5 @@ IUSE=examples
 LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/libbsd dev-libs/libgcrypt net-libs/libsoup net-libs/gnutls net-libs/webkit-gtk:3 x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=fd652b84227fd42e441cd798c0ad0fdb
diff --git a/metadata/md5-cache/www-misc/fcgiwrap-9999 b/metadata/md5-cache/www-misc/fcgiwrap-9999
index 9bebcece276b..db2f83ec3a8f 100644
--- a/metadata/md5-cache/www-misc/fcgiwrap-9999
+++ b/metadata/md5-cache/www-misc/fcgiwrap-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://nginx.localdomain.pl/wiki/FcgiWrap
 LICENSE=BSD
 RDEPEND=dev-libs/fcgi
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=0133637dd0f278fdcf25c5fd0c02833a
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-30.0.1599.22_beta1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-30.0.1599.28_beta1
similarity index 81%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-30.0.1599.22_beta1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-30.0.1599.28_beta1
index 661c8645eb8b..181f2361da19 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-30.0.1599.22_beta1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-30.0.1599.28_beta1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=www-client/chromium !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.22-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.22-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.28-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_30.0.1599.28-1_i386.deb )
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d
-_md5_=cf4b84163f165070db7240ca90792f5f
+_md5_=74c1f5cff5760d818a67dbd37d7645f9
diff --git a/metadata/md5-cache/www-servers/mongrel_cluster-1.0.5-r1 b/metadata/md5-cache/www-servers/mongrel_cluster-1.0.5-r1
deleted file mode 100644
index eb3fd339f364..000000000000
--- a/metadata/md5-cache/www-servers/mongrel_cluster-1.0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=www-servers/mongrel-1.0.2[ruby_targets_ruby18] >=dev-ruby/gem_plugin-0.2.3[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
-DESCRIPTION=Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes
-EAPI=2
-HOMEPAGE=http://mongrel.rubyforge.org/docs/mongrel_cluster.html
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( >=www-servers/mongrel-1.0.2[ruby_targets_ruby18] >=dev-ruby/gem_plugin-0.2.3[ruby_targets_ruby18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
-SLOT=0
-SRC_URI=mirror://rubygems/mongrel_cluster-1.0.5.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=519eec71ec72fbff0fc014a21adb0622
diff --git a/metadata/md5-cache/www-servers/nginx-1.4.1-r5 b/metadata/md5-cache/www-servers/nginx-1.4.1-r5
index 6177cd0fcdae..d6094f8231e3 100644
--- a/metadata/md5-cache/www-servers/nginx-1.4.1-r5
+++ b/metadata/md5-cache/www-servers/nginx-1.4.1-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=5
 HOMEPAGE=http://nginx.org
 IUSE=aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit rtmp selinux ssl syslog userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_ip_hash +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_spdy nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_push nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext ssl
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=pcre? ( >=dev-libs/libpcre-4.2 ) pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) selinux? ( sec-policy/selinux-nginx ) ssl? ( dev-libs/openssl ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8 ) nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 ) nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c ) nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl ) nginx_modules_http_dav_ext? ( dev-libs/expat )
@@ -12,4 +12,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rew
 SLOT=0
 SRC_URI=http://nginx.org/download/nginx-1.4.1.tar.gz syslog? ( https://github.com/yaoweibin/nginx_syslog_patch/archive/v0.25.tar.gz -> ngx_syslog-0.25.tar.gz ) https://github.com/simpl/ngx_devel_kit/archive/v0.2.18.tar.gz -> ngx_devel_kit-0.2.18-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.0.tar.gz -> ngx_http_upload_progress-0.9.0-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.20.tar.gz -> ngx_http_headers_more-0.20-r1.tar.gz ) nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/nginx_http_push_module-0.692.tar.gz -> ngx_http_push-0.692.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.1.tar.gz -> ngx_http_cache_purge-2.1.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/fd3950172a9e6595ad9ec68c11600e2afe6a2674.tar.gz -> ngx_http_fancyindex-fd3950172a9e6595ad9ec68c11600e2afe6a2674.tar.gz ) nginx_modules_http_lua? ( https://github.com/chaoslawful/lua-nginx-module/archive/v0.8.1.tar.gz -> ngx_http_lua-0.8.1.tar.gz ) nginx_modules_http_auth_pam? ( http://web.iti.upv.es/~sto/nginx/ngx_http_auth_pam_module-1.2.tar.gz -> ngx_http_auth_pam-1.2.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/99f39394f387211641a1668d61faf2d5186ea1f5.tar.gz -> ngx_http_upstream_check-99f39394f387211641a1668d61faf2d5186ea1f5.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://naxsi.googlecode.com/files/naxsi-core-0.50.tgz -> ngx_http_naxsi-0.50.tar.gz ) rtmp? ( http://github.com/arut/nginx-rtmp-module/archive/v0.9.20.tar.gz -> ngx_rtmp-0.9.20.tar.gz ) nginx_modules_http_dav_ext? ( http://github.com/arut/nginx-dav-ext-module/archive/v0.0.2.tar.gz -> ngx_dav_ext-0.0.2.tar.gz )
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bbf05ac674cb03cedfbafa48e5608ff5
+_md5_=368d87b05f7928e8b22a35aff25e2cf1
diff --git a/metadata/md5-cache/www-servers/pshs-9999 b/metadata/md5-cache/www-servers/pshs-9999
index ce3266cc1ac5..4904544ffab5 100644
--- a/metadata/md5-cache/www-servers/pshs-9999
+++ b/metadata/md5-cache/www-servers/pshs-9999
@@ -7,5 +7,5 @@ IUSE=+magic +netlink upnp
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2 magic? ( sys-apps/file ) upnp? ( net-libs/miniupnpc )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=9d53107378714788b625eab15518f081
diff --git a/metadata/md5-cache/www-servers/thttpd-9999 b/metadata/md5-cache/www-servers/thttpd-9999
index e8044f58f360..6d2acd0cc3b9 100644
--- a/metadata/md5-cache/www-servers/thttpd-9999
+++ b/metadata/md5-cache/www-servers/thttpd-9999
@@ -5,5 +5,5 @@ EAPI=5
 HOMEPAGE=http://opensource.dyc.edu/sthttpd
 LICENSE=BSD GPL-2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=f9c307fc99ed3169f3f27250309a0938
diff --git a/metadata/md5-cache/www-servers/tornado-2.4-r1 b/metadata/md5-cache/www-servers/tornado-2.4-r1
index ebd5b2e48355..8a846506abba 100644
--- a/metadata/md5-cache/www-servers/tornado-2.4-r1
+++ b/metadata/md5-cache/www-servers/tornado-2.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=curl? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) || ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=http://github.com/downloads/facebook/tornado/tornado-2.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=070669b57633466f63d427e1a5cf6a85
+_md5_=9ab9d6a63e90d9c2ab626516f981fce4
diff --git a/metadata/md5-cache/www-servers/tornado-2.4.1 b/metadata/md5-cache/www-servers/tornado-2.4.1
index c69868557b14..e4398a180197 100644
--- a/metadata/md5-cache/www-servers/tornado-2.4.1
+++ b/metadata/md5-cache/www-servers/tornado-2.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_5? ( dev-python/simplejson[python_targets_python2_5] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=curl? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) || ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=http://github.com/downloads/facebook/tornado/tornado-2.4.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=40367ec33a34bf77b691538db11532bc
+_md5_=3131efaccb3740ba89e26a9c4cda1129
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.38 b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.38
new file mode 100644
index 000000000000..71dbb6b5ed6e
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-173.14.38
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm setup unpack
+DEPEND=>=app-admin/eselect-opengl-1.0.9 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils
+DESCRIPTION=NVIDIA X11 driver and GLX libraries
+EAPI=5
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi multilib kernel_linux tools kernel_linux
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r1
+RDEPEND=>=app-admin/eselect-opengl-1.0.9 kernel_linux? ( >=sys-libs/glibc-2.6.1 ) <x11-base/xorg-server-1.14.99 acpi? ( sys-power/acpid ) multilib? ( || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] ) app-emulation/emul-linux-x86-opengl ) ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) kernel_linux? ( virtual/modutils )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/173.14.38/NVIDIA-Linux-x86-173.14.38-pkg0.run ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.38/NVIDIA-Linux-x86_64-173.14.38-pkg2.run ) x86-fbsd? ( ftp://download.nvidia.com/freebsd/173.14.38/NVIDIA-FreeBSD-x86-173.14.38.tar.gz )
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	nvidia-driver	abfc71eaf192f340dfc5292211ea2b54	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d7d4bd0f435c7f9412c050a87a44a342
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.108 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.108
index 680d160fc63b..7016eee687e2 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.108
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.108
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA X11 driver and GLX libraries
 EAPI=4
 HOMEPAGE=http://www.nvidia.com/
 IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 NVIDIA-r1
 PDEPEND=X? ( >=x11-libs/libvdpau-0.3-r1 )
 RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) X? ( <x11-base/xorg-server-1.14.99 x11-libs/libXvMC multilib? ( || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86_64/304.108/NVIDIA-FreeBSD-x86_64-304.108.tar.gz ) amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/304.108/NVIDIA-Linux-x86_64-304.108.run ) x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/304.108/NVIDIA-FreeBSD-x86-304.108.tar.gz ) x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/304.108/NVIDIA-Linux-x86-304.108.run )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	708d6a92c561743e612fca9d8fde5309	multilib	892e597faee02a5b94eb02ab512e7622	nvidia-driver	abfc71eaf192f340dfc5292211ea2b54	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=af9277dc07634c98d2915e827c19b0f7
+_md5_=1cc8546023eddd7b4cb6ac6319494e7f
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 7b567c4aa636..6eab35964b1a 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -9,5 +9,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sys-lib
 REQUIRED_USE=drm? ( X ) gallium? ( drm ) gles2? ( !opengl ) openvg? ( || ( gles2 opengl ) ) xlib-xcb? ( xcb )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=dd1dc3bb9c5b9e15de68b4085659cb88
diff --git a/metadata/md5-cache/x11-libs/ige-mac-integration-9999 b/metadata/md5-cache/x11-libs/ige-mac-integration-9999
index dc73926435b9..1a47c710c2d5 100644
--- a/metadata/md5-cache/x11-libs/ige-mac-integration-9999
+++ b/metadata/md5-cache/x11-libs/ige-mac-integration-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://live.gnome.org/GTK+/OSX/Integration
 LICENSE=LGPL-2
 RDEPEND=x11-libs/gtk+:2 dev-python/pygtk:2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=67cea87e0c77cfd8036041cf701ee66b
diff --git a/metadata/md5-cache/x11-libs/libfm-9999 b/metadata/md5-cache/x11-libs/libfm-9999
index c75d507542e0..fc4a2dafa4d8 100644
--- a/metadata/md5-cache/x11-libs/libfm-9999
+++ b/metadata/md5-cache/x11-libs/libfm-9999
@@ -7,5 +7,5 @@ IUSE=debug doc examples vala
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= x11-misc/shared-mime-info || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )
 SLOT=0/4.0.0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca
 _md5_=ee74d951d57e1bf947ce8c4102cde291
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-9999 b/metadata/md5-cache/x11-libs/libtinynotify-9999
index 3080323f02e4..d1f7534e7245 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-9999
+++ b/metadata/md5-cache/x11-libs/libtinynotify-9999
@@ -7,5 +7,5 @@ IUSE=debug doc static-libs
 LICENSE=BSD
 RDEPEND=sys-apps/dbus
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=270809a7b0857087fe3a1db4b9db7ed0
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-cli-9999 b/metadata/md5-cache/x11-libs/libtinynotify-cli-9999
index 2e73a49e3aa8..2c3668ef8eca 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-cli-9999
+++ b/metadata/md5-cache/x11-libs/libtinynotify-cli-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=76bde7e074a58ddb04c8c8cee8c6a5c9
diff --git a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999 b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999
index 8fb2461ad729..7c1e0be0e40d 100644
--- a/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999
+++ b/metadata/md5-cache/x11-libs/libtinynotify-systemwide-9999
@@ -7,5 +7,5 @@ IUSE=doc static-libs
 LICENSE=BSD
 RDEPEND=sys-process/procps x11-libs/libtinynotify
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=de451f0f8ea9004fef102c47183d63bb
diff --git a/metadata/md5-cache/x11-libs/libva-9999 b/metadata/md5-cache/x11-libs/libva-9999
index 64afdf09c9fb..f3d11570cbb6 100644
--- a/metadata/md5-cache/x11-libs/libva-9999
+++ b/metadata/md5-cache/x11-libs/libva-9999
@@ -9,5 +9,5 @@ PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/li
 RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 )
 REQUIRED_USE=opengl? ( X )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=d0cc07e44674eb3b5af4c855e20c8d65
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
index dfe1d5d4e6dc..d26db34107d0 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
@@ -7,5 +7,5 @@ IUSE=+drm wayland X
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.2.0[X?,wayland?,drm?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.45[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=a6a53fd4ef3a371ee6becb93db8b9db2
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
index 4c10b674e8f9..043b3c6a8862 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
@@ -7,5 +7,5 @@ IUSE=debug opengl
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.1.0[X,opengl?] opengl? ( virtual/opengl ) x11-libs/libvdpau !x11-libs/vdpau-video
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=e4de43912032d02bac4b6225b43284da
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9-r1 b/metadata/md5-cache/x11-libs/libxcb-1.9-r1
index 9ce368678d1d..0db1a72067a9 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	17812f511eef87a499b62ab14e6aeaad
-_md5_=7307b1c569736a4ad948826183c2ecd9
+_md5_=e2d850f08c2862d9d5e18381e56b22df
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9.1 b/metadata/md5-cache/x11-libs/libxcb-1.9.1
index 2786c6d5a662..64d78f992c37 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9.1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	17812f511eef87a499b62ab14e6aeaad
-_md5_=abd7face09008aabe90b2506f33bb434
+_md5_=f4dc5885a17517c2cd4903a826d3cce4
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.7.2 b/metadata/md5-cache/x11-libs/qscintilla-2.7.2
index b2462fc578dc..64831fdafd37 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.7.2
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
 EAPI=5
 HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
 IUSE=doc python
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 )
 PDEPEND=python? ( ~dev-python/qscintilla-python-2.7.2 )
 RDEPEND=dev-qt/qtcore:4 || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.7.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=837d8f0f79ff8070b86f1befdd24c556
+_md5_=961108a5aa68ebaeb94a00963f5b2ec4
diff --git a/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1 b/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1
index c4113d94ef57..46d76d2a9e1f 100644
--- a/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1
+++ b/metadata/md5-cache/x11-libs/xpyb-1.3.1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=x11-libs/libxcb-1.7 >=x11-proto/xcb-proto-1.7.1[python_targets_python2
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xpyb-1.3.1.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	17812f511eef87a499b62ab14e6aeaad
-_md5_=e9a604196b436393ba33a6d9ce794111
+_md5_=4339717610df717d7bc34949a25eb30e
diff --git a/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1 b/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1
index 5813ed7f867c..ffbe93f90009 100644
--- a/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1
+++ b/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libva[X(+),opengl?] x11-libs/libvdpau x11-drivers/ati-drivers
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/xvba-driver-0.8.0.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0fc8beae18c18657d6bd4f3094c4a59f
+_md5_=395af44b750bd34b477556592a3b47dc
diff --git a/metadata/md5-cache/x11-libs/xvba-video-9999 b/metadata/md5-cache/x11-libs/xvba-video-9999
index f97b917fd5d2..f061bcab6619 100644
--- a/metadata/md5-cache/x11-libs/xvba-video-9999
+++ b/metadata/md5-cache/x11-libs/xvba-video-9999
@@ -7,5 +7,5 @@ IUSE=debug opengl
 LICENSE=GPL-2+ MIT
 RDEPEND=x11-libs/libva[X(+),opengl?] x11-libs/libvdpau x11-drivers/ati-drivers
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7a5f4a8df3ed891208374c6f87741542
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	815e8fef66b552e35e4a8cc95febd22e	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b13a0e5e966cfa84dfe5e0c732b543a2
diff --git a/metadata/md5-cache/x11-misc/compton-9999 b/metadata/md5-cache/x11-misc/compton-9999
index aecf56aa90e7..53a9855f92fd 100644
--- a/metadata/md5-cache/x11-misc/compton-9999
+++ b/metadata/md5-cache/x11-misc/compton-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-libs/libconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre:3 ) x11-apps/xprop x11-apps/xwininfo virtual/python-argparse[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=87b27d211cb32bd6b347c39e95c9dcad
diff --git a/metadata/md5-cache/x11-misc/devilspie2-0.30 b/metadata/md5-cache/x11-misc/devilspie2-0.30
index 25bca2dec363..0bf5b33c89ab 100644
--- a/metadata/md5-cache/x11-misc/devilspie2-0.30
+++ b/metadata/md5-cache/x11-misc/devilspie2-0.30
@@ -4,10 +4,10 @@ DESCRIPTION=Devilspie like window matching utility, using LUA for scripting
 EAPI=5
 HOMEPAGE=http://devilspie2.gusnan.se
 IUSE=debug linguas_sv linguas_fr linguas_pt_BR linguas_nl linguas_ru linguas_fi
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32.4:2 >=dev-lang/lua-5.1.5 >=x11-libs/gtk+-3.4.4:3 >=x11-libs/libwnck-3.4.4:3 x11-libs/libX11
 SLOT=0
 SRC_URI=http://devilspie2.gusnan.se/download/devilspie2_0.30-src.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cd245974c48cff69837806e8afe80d17
+_md5_=06f89cdb795a73e310b7d5f2e6fccb1e
diff --git a/metadata/md5-cache/x11-misc/dex-0.6 b/metadata/md5-cache/x11-misc/dex-0.6
index d1e80191adc3..522306dcb6c6 100644
--- a/metadata/md5-cache/x11-misc/dex-0.6
+++ b/metadata/md5-cache/x11-misc/dex-0.6
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/jceb/dex/archive/v0.6.tar.gz -> dex-0.6.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0edbea69021a1fc113a8edc32b3e73d4
+_md5_=4719c1564e50b098b7e9d4ef66e907ea
diff --git a/metadata/md5-cache/x11-misc/evolvotron-0.6.2 b/metadata/md5-cache/x11-misc/evolvotron-0.6.2
index c975ca3d1abc..da769addaf39 100644
--- a/metadata/md5-cache/x11-misc/evolvotron-0.6.2
+++ b/metadata/md5-cache/x11-misc/evolvotron-0.6.2
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtgui:4 dev-libs/boost || ( =dev-lang/python-2.7* =dev-lang/python
 DESCRIPTION=Generative art image evolver
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/evolvotron/
-KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 dev-libs/boost || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://sourceforge/evolvotron/evolvotron-0.6.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=631f5dea6ab720e74e9a582653851f06
+_md5_=04731c36156049e06c11f2233346c966
diff --git a/metadata/md5-cache/x11-misc/growl-for-linux-9999 b/metadata/md5-cache/x11-misc/growl-for-linux-9999
index ea5677c9ec0f..ebd6098cc29f 100644
--- a/metadata/md5-cache/x11-misc/growl-for-linux-9999
+++ b/metadata/md5-cache/x11-misc/growl-for-linux-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://mattn.github.com/growl-for-linux/
 LICENSE=BSD-2
 RDEPEND=dev-db/sqlite:3 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 dev-libs/openssl net-misc/curl x11-libs/gtk+:2
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c7d1ebf847b2070ee66708639ac969d4
diff --git a/metadata/md5-cache/x11-misc/obconf-9999 b/metadata/md5-cache/x11-misc/obconf-9999
index 16e1d848b4e5..b05e11fda469 100644
--- a/metadata/md5-cache/x11-misc/obconf-9999
+++ b/metadata/md5-cache/x11-misc/obconf-9999
@@ -7,5 +7,5 @@ IUSE=nls
 LICENSE=GPL-2
 RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification =x11-wm/openbox-9999
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=de10d78f63b9c74e368e0c1d520cd6a4
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-9999 b/metadata/md5-cache/x11-misc/pcmanfm-9999
index 178ffe00546b..161fc68654f9 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-9999
+++ b/metadata/md5-cache/x11-misc/pcmanfm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-9999:= virtual/eject virtual/freedesktop-icon-theme
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=7bb6f4c045ab2c35919887bb63c826f9
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-9999 b/metadata/md5-cache/x11-misc/pcmanfm-qt-9999
index b1df9200effe..ff2eda05123f 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-9999
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://pcmanfm.sourceforge.net/
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 dev-qt/qtgui:4 dev-qt/qtdbus:4 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-9999:= virtual/eject virtual/freedesktop-icon-theme
 SLOT=0
-_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=cmake-utils	92319f03251f1235bc887cc84e5aef21	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=8d69182e18082bdaa9d386ad77c8b5ad
diff --git a/metadata/md5-cache/x11-misc/py3status-1.0 b/metadata/md5-cache/x11-misc/py3status-1.0
index 51ecbe0e793b..7cb9e6a82a6e 100644
--- a/metadata/md5-cache/x11-misc/py3status-1.0
+++ b/metadata/md5-cache/x11-misc/py3status-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/ultrabug/py3status/archive/1.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=083e6c5e3120964bce8c94d803e7a80a
+_md5_=efb1f4933dc02fc962f0ce48e2f42721
diff --git a/metadata/md5-cache/x11-misc/set_opacity-9999 b/metadata/md5-cache/x11-misc/set_opacity-9999
index 0c095211392d..67c02e1d3b1e 100644
--- a/metadata/md5-cache/x11-misc/set_opacity-9999
+++ b/metadata/md5-cache/x11-misc/set_opacity-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://gitorious.org/x11-tools/set_opacity
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXdamage x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXrender
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=53b330f885fe62429c8a2627071901ba
diff --git a/metadata/md5-cache/x11-misc/simpleswitcher-9999 b/metadata/md5-cache/x11-misc/simpleswitcher-9999
index d5ce09fd2fba..eb6cb88909cf 100644
--- a/metadata/md5-cache/x11-misc/simpleswitcher-9999
+++ b/metadata/md5-cache/x11-misc/simpleswitcher-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/seanpringle/simpleswitcher
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=f5f98932bb811ce969fac54e49d7226c
diff --git a/metadata/md5-cache/x11-misc/spacefm-9999 b/metadata/md5-cache/x11-misc/spacefm-9999
index 5bb045c63101..fe6d4485e9fd 100644
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@@ -7,5 +7,5 @@ IUSE=+startup-notification
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	fabc717260816d50ef1964caf14a3d5c	gnome2-utils	cf14abfc65f26151fd2e33d722422ee3	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
 _md5_=953f92ac741b490e8d57f2c736b8bd09
diff --git a/metadata/md5-cache/x11-misc/sselp-9999 b/metadata/md5-cache/x11-misc/sselp-9999
index 89b0e80df562..254ab8286ded 100644
--- a/metadata/md5-cache/x11-misc/sselp-9999
+++ b/metadata/md5-cache/x11-misc/sselp-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://tools.suckless.org/sselp
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=627b620d64cf305bab53dcfc18724453
diff --git a/metadata/md5-cache/x11-misc/sw-notify-send-9999 b/metadata/md5-cache/x11-misc/sw-notify-send-9999
index c156f58f815b..e4892ded8b4f 100644
--- a/metadata/md5-cache/x11-misc/sw-notify-send-9999
+++ b/metadata/md5-cache/x11-misc/sw-notify-send-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/tinynotify-send/
 LICENSE=BSD
 RDEPEND=x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999 x11-libs/libtinynotify-systemwide
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=498e7d0c94ef0edc7d4e3454a51f408c
diff --git a/metadata/md5-cache/x11-misc/tinynotify-send-9999 b/metadata/md5-cache/x11-misc/tinynotify-send-9999
index bd8a4c260f87..8988ea5dcd08 100644
--- a/metadata/md5-cache/x11-misc/tinynotify-send-9999
+++ b/metadata/md5-cache/x11-misc/tinynotify-send-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://bitbucket.org/mgorny/tinynotify-send/
 LICENSE=BSD
 RDEPEND=app-admin/eselect-notify-send x11-libs/libtinynotify ~x11-libs/libtinynotify-cli-9999
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=c82b9539fc9fe9643e9b3ad6d32ea4be
diff --git a/metadata/md5-cache/x11-misc/treeline-1.4.1-r1 b/metadata/md5-cache/x11-misc/treeline-1.4.1-r1
index bda5b520045a..1845efb8cb40 100644
--- a/metadata/md5-cache/x11-misc/treeline-1.4.1-r1
+++ b/metadata/md5-cache/x11-misc/treeline-1.4.1-r1
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6[xml] ) python_sing
 SLOT=0
 SRC_URI=mirror://sourceforge/treeline/treeline-1.4.1.tar.gz linguas_de? ( mirror://sourceforge/treeline/treeline-i18n-1.4.1a.tar.gz ) linguas_fr? ( mirror://sourceforge/treeline/treeline-i18n-1.4.1a.tar.gz )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=82c43f9c36e666c896ceccb6e06f73cb
+_md5_=8aeb2756107d0be6b479626e90e13c22
diff --git a/metadata/md5-cache/x11-misc/urxvt-perls-2.0 b/metadata/md5-cache/x11-misc/urxvt-perls-2.0
index a992991fa313..6c43a20d649c 100644
--- a/metadata/md5-cache/x11-misc/urxvt-perls-2.0
+++ b/metadata/md5-cache/x11-misc/urxvt-perls-2.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Perl extensions for rxvt-unicode
 EAPI=4
 HOMEPAGE=https://github.com/muennich/urxvt-perls
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-misc/xsel x11-terms/rxvt-unicode[perl]
 SLOT=0
 SRC_URI=mirror://github/muennich/urxvt-perls/urxvt-perls-2.0.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=c106c49a69c3107b8b8d518e365edbf6
+_md5_=ebc6e82302b7cdaf378d6770641f60fd
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.22 b/metadata/md5-cache/x11-misc/xscreensaver-5.22
index 073407df0fdf..7e84c103c934 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.22
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.22
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=5
 HOMEPAGE=http://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login opengl pam +perl selinux suid xinerama
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.22.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c2171467855dae0529b76d4bce430b46
+_md5_=499e7992efe89a7000e367bdff09c26f
diff --git a/metadata/md5-cache/x11-plugins/bitlbee-steam-9999 b/metadata/md5-cache/x11-plugins/bitlbee-steam-9999
index b930162c4140..6a002ad62022 100644
--- a/metadata/md5-cache/x11-plugins/bitlbee-steam-9999
+++ b/metadata/md5-cache/x11-plugins/bitlbee-steam-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/jgeboski/bitlbee-steam
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=dev-libs/gmp:0 >=net-im/bitlbee-3.2[plugins]
 SLOT=0
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=f9d8aef3d9ae38ccfff327c5f68befc5
diff --git a/metadata/md5-cache/x11-plugins/screenlets-0.1.6 b/metadata/md5-cache/x11-plugins/screenlets-0.1.6
index 3099268239ae..1adace53580a 100644
--- a/metadata/md5-cache/x11-plugins/screenlets-0.1.6
+++ b/metadata/md5-cache/x11-plugins/screenlets-0.1.6
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_6? ( python_targets_python2_6 ) python
 SLOT=0
 SRC_URI=http://code.launchpad.net/screenlets/trunk/0.1.6/+download/screenlets-0.1.6.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6f9c3e4fda39b9fb99a2fa123f4129e5
+_md5_=61ad0657788304215362c8aa07cc117a
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1 b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1
index 9e16dcfc40c6..87efde3bae49 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r1
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_ta
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	17812f511eef87a499b62ab14e6aeaad
-_md5_=eecdcc21260dab051bf8e511745c79ae
+_md5_=65f2e72769760d4b8e5f333081bccebc
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2 b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2
index f1f3506cf84b..15bcb3c2408e 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r2
@@ -10,4 +10,4 @@ RDEPEND=python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_ta
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	b13f5baea5da0da5a5dcc6b8b79706a2	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	17812f511eef87a499b62ab14e6aeaad
-_md5_=cb66e5a4418e7b8d0fdec82223e68ee4
+_md5_=ae7a156291b93dee3b04d6be5c91a4d2
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3 b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3
index f6f59ec21f54..ea98ac6be3cf 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	17812f511eef87a499b62ab14e6aeaad
-_md5_=b6b07fa7ad8a6c6b9076768ca31f6f3e
+_md5_=af006f6fffe96e5847eb729c953bf9fa
diff --git a/metadata/md5-cache/x11-terms/st-9999 b/metadata/md5-cache/x11-terms/st-9999
index 149cc62be37b..bb66e9ab3770 100644
--- a/metadata/md5-cache/x11-terms/st-9999
+++ b/metadata/md5-cache/x11-terms/st-9999
@@ -7,5 +7,5 @@ IUSE=savedconfig savedconfig
 LICENSE=MIT-with-advertising
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXft
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	portability	536c5e70c5fb252ed3b769e04aa3f05b	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=189d63275746b199b874677b600bf60d
diff --git a/metadata/md5-cache/x11-themes/clearlooks-phenix-9999 b/metadata/md5-cache/x11-themes/clearlooks-phenix-9999
index 5843c696eb5d..34a7c8ed310a 100644
--- a/metadata/md5-cache/x11-themes/clearlooks-phenix-9999
+++ b/metadata/md5-cache/x11-themes/clearlooks-phenix-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.jpfleury.net/en/software/clearlooks-phenix.php
 LICENSE=GPL-3
 RDEPEND=!x11-themes/clearlooks-phenix:3.4 !x11-themes/clearlooks-phenix:3.6 >=x11-libs/gtk+-3.6:3 x11-themes/gtk-engines
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c
 _md5_=8f117e59052fb8026d9018b7d99aec6d
diff --git a/metadata/md5-cache/x11-wm/cwm-9999 b/metadata/md5-cache/x11-wm/cwm-9999
index cff109119f9b..cf825d114318 100644
--- a/metadata/md5-cache/x11-wm/cwm-9999
+++ b/metadata/md5-cache/x11-wm/cwm-9999
@@ -7,5 +7,5 @@ IUSE=vanilla
 LICENSE=ISC
 RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
-_eclasses_=git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=df26a056d3cee823d11dc1bb91636de4
diff --git a/metadata/md5-cache/x11-wm/fluxbox-9999 b/metadata/md5-cache/x11-wm/fluxbox-9999
index 54c7194be239..27e9a0a1fe84 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-9999
+++ b/metadata/md5-cache/x11-wm/fluxbox-9999
@@ -7,5 +7,5 @@ IUSE=nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax
 LICENSE=MIT
 RDEPEND=x11-libs/libXpm x11-libs/libXrandr x11-libs/libXext x11-libs/libXft x11-libs/libXrender || ( x11-misc/gxmessage x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) truetype? ( media-libs/freetype ) bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) vim-syntax? ( app-vim/fluxbox-syntax ) !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 !!<=x11-misc/fluxconf-0.9.9 !!<=x11-misc/fbdesk-1.2.1
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	2ff578fb151da221e1797f12e2990e72	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=7960ab49b37720afb9e673661cf2ae73
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index f4d13da2eedf..796f4b5ad73a 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -7,5 +7,5 @@ IUSE=examples xinerama zsh-completion
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/glib-2.24:2 x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-shells/bash zsh-completion? ( app-shells/zsh )
 SLOT=0
-_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_eclasses_=bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
 _md5_=4065d5ecca2cdb0ac51d475b4eb45eff
diff --git a/metadata/md5-cache/x11-wm/notion-9999 b/metadata/md5-cache/x11-wm/notion-9999
index 0dacc9beea9d..83ba6590cbea 100644
--- a/metadata/md5-cache/x11-wm/notion-9999
+++ b/metadata/md5-cache/x11-wm/notion-9999
@@ -7,5 +7,5 @@ IUSE=nls xinerama +xrandr
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/lua x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=cbffbaf63fa513992e04e1dea73dccd3
diff --git a/metadata/md5-cache/x11-wm/openbox-9999 b/metadata/md5-cache/x11-wm/openbox-9999
index c9faa3555485..c24dd582a7e0 100644
--- a/metadata/md5-cache/x11-wm/openbox-9999
+++ b/metadata/md5-cache/x11-wm/openbox-9999
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-lib
 REQUIRED_USE=xdg? ( || ( python_targets_python2_6 python_targets_python2_7 ) )
 SLOT=3
 SRC_URI=branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
 _md5_=0d49e8c654db897326ce5e00ffd7e9e2
diff --git a/metadata/md5-cache/x11-wm/qtile-9999 b/metadata/md5-cache/x11-wm/qtile-9999
index 02a4353b9569..97fd89001520 100644
--- a/metadata/md5-cache/x11-wm/qtile-9999
+++ b/metadata/md5-cache/x11-wm/qtile-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-python/pycairo-1.10.0-r4[xcb,python_targets_python2_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	fabc717260816d50ef1964caf14a3d5c	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d1e7eefb0dc489f1a716b7d7ca5f3b81
diff --git a/metadata/md5-cache/x11-wm/xpra-0.8.8 b/metadata/md5-cache/x11-wm/xpra-0.8.8
index 2381f5d6ed00..c78264d6052b 100644
--- a/metadata/md5-cache/x11-wm/xpra-0.8.8
+++ b/metadata/md5-cache/x11-wm/xpra-0.8.8
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-0.8.8.tar.bz2
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	5d822763b5668548984ff7132eec9ad0	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1a22e4114029582dd848ea8e2300aed0
+_md5_=6b157db21933e6bc11b37f66d51ab580
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 55d57e3c9870..2eeb00d1451e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Sep 2013 12:06:59 +0000
+Fri, 06 Sep 2013 06:36:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2da55b159de9..df3a9b947eaf 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Sep  5 12:06:56 UTC 2013
+Fri Sep  6 06:36:56 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 42c69de6ae1e..661771f3c8ea 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Sep 2013 12:30:01 +0000
+Fri, 06 Sep 2013 07:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e35b3f2ecae2..ffe3efd08b52 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1378382701 Thu Sep  5 12:05:01 2013 UTC
+1378449301 Fri Sep  6 06:35:01 2013 UTC
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.10-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.10-r2.ebuild
index c4c4f191e6dd..718e7a030c86 100644
--- a/net-analyzer/fail2ban/fail2ban-0.8.10-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.8.10-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.10-r2.ebuild,v 1.1 2013/07/26 07:06:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.10-r2.ebuild,v 1.2 2013/09/05 18:58:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 DISTUTILS_SINGLE_IMPL=yes
 
 inherit distutils-r1 systemd vcs-snapshot
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.10.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.10.ebuild
index e744d121523c..74628f71ca7f 100644
--- a/net-analyzer/fail2ban/fail2ban-0.8.10.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.8.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.10.ebuild,v 1.6 2013/06/14 18:28:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.10.ebuild,v 1.7 2013/09/05 18:58:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 DISTUTILS_SINGLE_IMPL=yes
 
 inherit distutils-r1 eutils vcs-snapshot
diff --git a/net-analyzer/mtr/mtr-0.85.ebuild b/net-analyzer/mtr/mtr-0.85.ebuild
index 1dfaf45b233b..f3b7a2dcb1eb 100644
--- a/net-analyzer/mtr/mtr-0.85.ebuild
+++ b/net-analyzer/mtr/mtr-0.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.85.ebuild,v 1.13 2013/09/04 09:03:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.85.ebuild,v 1.14 2013/09/05 13:26:48 ago Exp $
 
 EAPI=5
 inherit eutils autotools flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gtk ipv6 suid"
 
 RDEPEND="
diff --git a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild b/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
index 4072e6cdd33c..8ae08483a30a 100644
--- a/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
+++ b/net-analyzer/namebench/namebench-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/namebench-1.3.1-r1.ebuild,v 1.1 2013/08/03 08:25:33 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/namebench/namebench-1.3.1-r1.ebuild,v 1.2 2013/09/05 13:54:04 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit distutils-r1
 
@@ -19,7 +19,6 @@ IUSE="X"
 
 # PYTHON_REQ_USE does not support X? ( tk ) syntax yet
 DEPEND="X? (
-		python_targets_python2_5? ( dev-lang/python:2.5[tk] )
 		python_targets_python2_6? ( dev-lang/python:2.6[tk] )
 		python_targets_python2_7? ( dev-lang/python:2.7[tk] )
 	)"
diff --git a/net-analyzer/nmap/nmap-6.40-r1.ebuild b/net-analyzer/nmap/nmap-6.40-r1.ebuild
index 992c2a84c9a8..e405fa28d55f 100644
--- a/net-analyzer/nmap/nmap-6.40-r1.ebuild
+++ b/net-analyzer/nmap/nmap-6.40-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.40-r1.ebuild,v 1.1 2013/08/02 13:52:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.40-r1.ebuild,v 1.2 2013/09/05 18:58:48 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 PYTHON_REQ_USE="sqlite"
 inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
diff --git a/net-analyzer/pypacker/pypacker-2.0.ebuild b/net-analyzer/pypacker/pypacker-2.0.ebuild
index decab284083c..b9c7c1e1c7ff 100644
--- a/net-analyzer/pypacker/pypacker-2.0.ebuild
+++ b/net-analyzer/pypacker/pypacker-2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pypacker/pypacker-2.0.ebuild,v 1.1 2013/04/20 06:45:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pypacker/pypacker-2.0.ebuild,v 1.2 2013/09/05 18:58:47 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/net-analyzer/wireshark/wireshark-1.8.9.ebuild b/net-analyzer/wireshark/wireshark-1.8.9.ebuild
index d8b03f0905c2..fe93ecd5e028 100644
--- a/net-analyzer/wireshark/wireshark-1.8.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.8.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.9.ebuild,v 1.9 2013/08/01 13:02:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.9.ebuild,v 1.10 2013/09/05 18:58:48 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit autotools eutils fcaps flag-o-matic python-single-r1 user
 
 [[ -n ${PV#*_rc} && ${PV#*_rc} != ${PV} ]] && MY_P=${PN}-${PV/_} || MY_P=${P}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 3c4a2af79d9c..f180a30e6065 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,3 +1,4 @@
 DIST zabbix-2.0.4.tar.gz 13045480 SHA256 7554223a927229b6317d211d413826fb0b2a974f460a9db9075b376a241a0051 SHA512 94824bfe933374fee8d7b292e24de9e9be09e041738c2ecb07f27bdc00ffdd6a6d091802b5daff59c75945de89423dd2e6d224ab2aa973a1a2013f036229dd80 WHIRLPOOL b685e40f355b1e465208c32420aab4c30f51865a6b6c2cbb68e1f196b5fdc32dcc965fa20bbd4d7f6a108d5d21d1a4fa470642fbd481dc46e54385435b51b760
 DIST zabbix-2.0.5.tar.gz 13352744 SHA256 9539abb848049195b6e8d24d23de40c26e07d3e5219ca890f4272a0d88cc640f SHA512 81d085ef3f2d7825adc4260761f4201acfbfc7f1ba0046b8b6d38f633eb71a0dd0412fac27d72c9b490b8939a63341b80b25ff9261ceda9b915ae088ccfd8e34 WHIRLPOOL 618287c6faf75b11c4a626534f0adce60d67b486557aa343702dbeac163902ac8ecac4084681e324654f310e411553af5fe674ca14144bafe79d8c2f1f46f39c
 DIST zabbix-2.0.6.tar.gz 13402400 SHA256 46dfa7e63d3d38991cddaa7455e70179dc3fbef658ccbdce8cc8ce8e73baedf8 SHA512 757eff7ee19a3713aa3d686a2faaedf7e609bb2a81799dca1d3b4c5049dd26a2bf19ac726adcd8d5df9522da2c3fd20986b16e762c65aa46fee84a27ff862aa4 WHIRLPOOL c30c569a521b72421aa4a042243d9d74dc4a2295df92828b6c0d468fea0302125802e9bf023544d6b4055a210c3f758dc734de0b5c41f333a367edcb3d05e295
+DIST zabbix-2.0.8.tar.gz 13457936 SHA256 c4b94960de0a1d0b20604a08503e9715c15845409368162c1e321040b8e4519a SHA512 5a65c7fcce33d98a0f441798ca83f16bb6ed31b8a1b025f39c4003a0906c148ed5ff9db41aec591f053083b6bacd3ea1a1c8b96c007c44da092bfa179693e403 WHIRLPOOL 8ae2815014a28895689e8083f21e26f8c0afd7bb5f12a177f8487d563a889941e15db5991668c56a2dad62bf1060a77195057fea6283059a8c4dcd39ff709c05
diff --git a/net-analyzer/zabbix/zabbix-2.0.8.ebuild b/net-analyzer/zabbix/zabbix-2.0.8.ebuild
new file mode 100644
index 000000000000..6c0261db9b58
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.0.8.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.8.ebuild,v 1.1 2013/09/05 22:33:15 mattm Exp $
+
+EAPI="5"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~x86 ~amd64"
+IUSE="agent java curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp sqlite iodbc odbc static"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( >=dev-db/postgresql-base-8.3.0 )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	jabber? ( dev-libs/iksemel )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( >=virtual/jdk-1.4 )
+	odbc? (
+		iodbc? ( dev-db/libiodbc )
+		!iodbc? ( dev-db/unixODBC )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( <=net-analyzer/fping-2.9 )
+	server? ( <=net-analyzer/fping-2.9
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+		dev-java/json-simple
+	)
+	frontend? (
+		dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+	java-pkg_jar-from json-simple
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/2.0/patches/zbx282.patch"
+	eautoreconf
+}
+
+pkg_setup() {
+	if use server || use proxy ; then
+		local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
+		declare -i dbnum=0
+		for dbtype in ${dbtypes}; do
+			use ${dbtype} && let dbnum++
+		done
+		if [ ${dbnum} -gt 1 ]; then
+			eerror
+			eerror "You can't use more than one database type in Zabbix."
+			eerror "Select exactly one database type out of these: ${dbtypes}"
+			eerror
+			die "Multiple database types selected."
+		elif [ ${dbnum} -lt 1 ]; then
+			eerror
+			eerror "Select exactly one database type out of these: ${dbtypes}"
+			eerror
+			die "No database type selected."
+		fi
+		if use oracle; then
+			if [ -z "${ORACLE_HOME}" ]; then
+				eerror
+				eerror "The environment variable ORACLE_HOME must be set"
+				eerror "and point to the correct location."
+				eerror "It looks like you don't have Oracle installed."
+				eerror
+				die "Environment variable ORACLE_HOME is not set"
+			fi
+			if has_version 'dev-db/oracle-instantclient-basic'; then
+				ewarn
+				ewarn "Please ensure you have a full install of the Oracle client."
+				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+				ewarn
+			fi
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so.  Most minor version"
+		elog "zabbix updates do not require db changes. However, "
+		elog "you should read the release notes to be sure."
+		elog
+		elog "Have a look at /usr/share/zabbix for"
+		elog "database creation and upgrades."
+		elog
+		elog "Execute schema, images, and data sql files in that order."
+		elog
+		elog "For more info read the Zabbix manual at"
+		elog "http://www.zabbix.com/documentation.php"
+		elog
+		elog "New use flags: java, odbc, iodbc"
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	elog "Zabbix is incompatible with fping 3.0 - (Zabbix bug #ZBX-4894)."
+	elog
+	elog "Feel free to download or contribute gentoo specific zabbix templates"
+	elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP).  We may"
+	elog "eventually create a seperate package in portage for them."
+
+	# repeat fowners/fperms functionality from src_install()
+	# here to catch wrong permissions on existing files in
+	# the live filesystem (yeah, that sucks).
+	chown -R zabbix:zabbix \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix
+	chmod 0750 \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix
+
+	chmod 0640 \
+		"${ROOT}"/etc/zabbix/zabbix_*
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				ebeep 3
+				epause 5
+				;;
+		esac
+	fi
+}
+
+src_configure() {
+
+	local myconf
+
+	if use odbc && use iodbc ; then
+	   myconf="${myconf} --with-iodbc --without-unixodbc"
+	elif use odbc && ! use iodbc; then
+	   myconf="${myconf} --with-unixodbc --without-iodbc"
+	else
+	   myconf="${myconf} --without-unixodbc --without-iodbc"
+	fi
+
+	econf \
+		$myconf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		|| die "econf failed"
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/1.6.6"/zabbix_server.conf \
+			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
+		doinitd \
+			"${FILESDIR}/2.0"/init.d/zabbix-server
+		dosbin \
+			src/zabbix_server/zabbix_server
+		dodir \
+			/usr/share/zabbix
+		insinto /usr/share/zabbix
+		doins -r \
+			database \
+			upgrades
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_server.conf \
+			/etc/zabbix/zabbix_trapper.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_server.conf \
+			/etc/zabbix/zabbix_trapper.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.0"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.0"/zabbix_proxy.conf
+		dodir \
+			/usr/share/zabbix
+		insinto /usr/share/zabbix
+		doins -r \
+			database \
+			create
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
+			"${FILESDIR}/1.6.6"/zabbix_agentd.conf
+		doinitd \
+			"${FILESDIR}/2.0"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/org-json-2010-12-28.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
diff --git a/net-dns/avahi/avahi-0.6.31-r2.ebuild b/net-dns/avahi/avahi-0.6.31-r2.ebuild
index f4d90c9649ee..fc34391b485a 100644
--- a/net-dns/avahi/avahi-0.6.31-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r2.ebuild,v 1.12 2013/08/06 13:07:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r2.ebuild,v 1.13 2013/09/05 18:59:06 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="gdbm"
 
 WANT_AUTOMAKE=1.11
diff --git a/net-dns/rbldnsd/rbldnsd-0.997.ebuild b/net-dns/rbldnsd/rbldnsd-0.997.ebuild
index 9ae452a1a325..aa97a27de688 100644
--- a/net-dns/rbldnsd/rbldnsd-0.997.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.997.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/rbldnsd-0.997.ebuild,v 1.2 2013/07/09 00:10:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/rbldnsd-0.997.ebuild,v 1.3 2013/09/05 18:59:06 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils toolchain-funcs user python-single-r1
 
diff --git a/net-dns/unbound/unbound-1.4.20.ebuild b/net-dns/unbound/unbound-1.4.20.ebuild
index aa7fe99c0118..89b9c5c9cc85 100644
--- a/net-dns/unbound/unbound-1.4.20.ebuild
+++ b/net-dns/unbound/unbound-1.4.20.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.20.ebuild,v 1.4 2013/08/18 13:24:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.20.ebuild,v 1.5 2013/09/05 18:59:06 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils flag-o-matic python-single-r1 user
 
diff --git a/net-fs/autofs/autofs-5.0.7-r4.ebuild b/net-fs/autofs/autofs-5.0.7-r4.ebuild
index 3d5a55b4abc6..022e6d5acfd4 100644
--- a/net-fs/autofs/autofs-5.0.7-r4.ebuild
+++ b/net-fs/autofs/autofs-5.0.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r4.ebuild,v 1.2 2013/08/22 09:36:22 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r4.ebuild,v 1.4 2013/09/05 16:01:13 jer Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 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="-dmalloc hesiod ldap libtirpc mount-locking sasl"
 
 # USE="sasl" adds SASL support to the LDAP module which will not be build. If
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-1.patch b/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-1.patch
new file mode 100644
index 000000000000..5047b1f4ecee
--- /dev/null
+++ b/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-1.patch
@@ -0,0 +1,102 @@
+From 8563077e818d62a3c764caf8818d8bf24a3cb0b6 Mon Sep 17 00:00:00 2001
+From: Marc Dionne <marc.dionne@your-file-system.com>
+Date: Mon, 8 Jul 2013 10:53:00 -0400
+Subject: [PATCH] Linux 3.11: Convert from readdir to iterate file operation
+
+Convert the readdir function so that it can be used as the new
+"iterate" file operation.  This new operation is passed a context
+that contains a pointer to the filldir function and the offset.
+The context is passed into the new dir_emit function that will
+call the function specified by the context.
+
+The new dir_emit function returns true on success, so we must be
+careful about how we check for failure since this is different
+behaviour from what filldir currently does.
+
+Change-Id: I6b01b4c78a501bdf4f8d583b0d3b94d677c5d541
+---
+ acinclude.m4                 |    1 +
+ src/afs/LINUX/osi_vnodeops.c |   22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 0 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 6ffb686..15b5ad8 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -842,6 +842,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
+ 		 AC_CHECK_LINUX_STRUCT([inode], [i_mutex], [fs.h])
+ 		 AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
+ 		 AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
++		 AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h])
+ 		 AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
+ 		 AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
+ 		 AC_CHECK_LINUX_STRUCT([filename], [name], [fs.h])
+diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
+index 46fbb88..25cbac2 100644
+--- a/src/afs/LINUX/osi_vnodeops.c
++++ b/src/afs/LINUX/osi_vnodeops.c
+@@ -271,7 +271,11 @@ extern int BlobScan(struct dcache * afile, afs_int32 ablob);
+  * handling and use of bulkstats will need to be reflected here as well.
+  */
+ static int
++#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
++afs_linux_readdir(struct file *fp, struct dir_context *ctx)
++#else
+ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
++#endif
+ {
+     struct vcache *avc = VTOAFS(FILE_INODE(fp));
+     struct vrequest treq;
+@@ -350,7 +354,11 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
+      * takes an offset in units of blobs, rather than bytes.
+      */
+     code = 0;
++#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
++    offset = ctx->pos;
++#else
+     offset = (int) fp->f_pos;
++#endif
+     while (1) {
+ 	dirpos = BlobScan(tdc, offset);
+ 	if (!dirpos)
+@@ -408,7 +416,13 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
+ 	     * holding the GLOCK.
+ 	     */
+ 	    AFS_GUNLOCK();
++#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
++	    /* dir_emit returns a bool - true when it succeeds.
++	     * Inverse the result to fit with how we check "code" */
++	    code = !dir_emit(ctx, de->name, len, ino, type);
++#else
+ 	    code = (*filldir) (dirbuf, de->name, len, offset, ino, type);
++#endif
+ 	    AFS_GLOCK();
+ 	}
+ 	DRelease(&entry, 0);
+@@ -419,7 +433,11 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
+     /* If filldir didn't fill in the last one this is still pointing to that
+      * last attempt.
+      */
++#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
++    ctx->pos = (loff_t) offset;
++#else
+     fp->f_pos = (loff_t) offset;
++#endif
+ 
+     ReleaseReadLock(&tdc->lock);
+     afs_PutDCache(tdc);
+@@ -748,7 +766,11 @@ out:
+ 
+ struct file_operations afs_dir_fops = {
+   .read =	generic_read_dir,
++#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
++  .iterate =	afs_linux_readdir,
++#else
+   .readdir =	afs_linux_readdir,
++#endif
+ #ifdef HAVE_UNLOCKED_IOCTL
+   .unlocked_ioctl = afs_unlocked_xioctl,
+ #else
+-- 
+1.7.2.5
+
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-2.patch b/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-2.patch
new file mode 100644
index 000000000000..3ffddf083e24
--- /dev/null
+++ b/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-2.patch
@@ -0,0 +1,99 @@
+From 6482f944119254da9cdea533d7ca89d3d46f0559 Mon Sep 17 00:00:00 2001
+From: Marc Dionne <marc.dionne@your-file-system.com>
+Date: Tue, 3 Sep 2013 07:55:14 -0400
+Subject: [PATCH] Linux 3.11: Adapt to d_count changes
+
+In preparation for upcoming changes in the 3.12 cycle, d_lockref
+was introduced late in the 3.11 cycle.  The dentry's d_lock and
+d_count are moved to this new structure.  A new d_lock macro makes
+the change transparent for locking, but direct users of d_count
+must adapt.  A new d_count() helper function is provided and
+should now be used.
+
+Use the new d_count() helper function if available, and move
+some of the ifdef logic into a helper compatibility function.
+
+Change-Id: I32a21a174d763fb7df8f1e04da3bb7260684571d
+---
+ acinclude.m4                 |    3 +++
+ src/afs/LINUX/osi_compat.h   |   28 ++++++++++++++++++++++++++++
+ src/afs/LINUX/osi_vnodeops.c |   12 +-----------
+ 3 files changed, 32 insertions(+), 11 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 15b5ad8..800333b 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -897,6 +897,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
+ 		 AC_CHECK_LINUX_FUNC([d_alloc_anon],
+ 				     [#include <linux/fs.h>],
+ 				     [d_alloc_anon(NULL);])
++		 AC_CHECK_LINUX_FUNC([d_count],
++				     [#include <linux/dcache.h>],
++				     [d_count(NULL);])
+ 		 AC_CHECK_LINUX_FUNC([d_make_root],
+ 				     [#include <linux/fs.h>],
+ 				     [d_make_root(NULL);])
+diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
+index ce9178e..fdddf59 100644
+--- a/src/afs/LINUX/osi_compat.h
++++ b/src/afs/LINUX/osi_compat.h
+@@ -608,4 +608,32 @@ afs_proc_create(char *name, umode_t mode, struct proc_dir_entry *parent, struct
+ #endif
+ }
+ 
++static inline int
++afs_dentry_count(struct dentry *dp)
++{
++#if defined(HAVE_LINUX_D_COUNT)
++    return d_count(dp);
++#elif defined(D_COUNT_INT)
++    return dp->d_count;
++#else
++    return atomic_read(&dp->d_count);
++#endif
++}
++
++static inline void
++afs_maybe_shrink_dcache(struct dentry *dp)
++{
++#if defined(HAVE_LINUX_D_COUNT) || defined(D_COUNT_INT)
++    spin_lock(&dp->d_lock);
++    if (afs_dentry_count(dp) > 1) {
++	spin_unlock(&dp->d_lock);
++	shrink_dcache_parent(dp);
++    } else
++	spin_unlock(&dp->d_lock);
++#else
++    if (afs_dentry_count(dp) > 1)
++	shrink_dcache_parent(dp);
++#endif
++}
++
+ #endif /* AFS_LINUX_OSI_COMPAT_H */
+diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
+index e9191ae..a60027e 100644
+--- a/src/afs/LINUX/osi_vnodeops.c
++++ b/src/afs/LINUX/osi_vnodeops.c
+@@ -1684,17 +1684,7 @@ afs_linux_rename(struct inode *oldip, struct dentry *olddp,
+ 	rehash = newdp;
+     }
+ 
+-#if defined(D_COUNT_INT)
+-    spin_lock(&olddp->d_lock);
+-    if (olddp->d_count > 1) {
+-	spin_unlock(&olddp->d_lock);
+-	shrink_dcache_parent(olddp);
+-    } else
+-	spin_unlock(&olddp->d_lock);
+-#else
+-    if (atomic_read(&olddp->d_count) > 1)
+-	shrink_dcache_parent(olddp);
+-#endif
++    afs_maybe_shrink_dcache(olddp);
+ 
+     AFS_GLOCK();
+     code = afs_rename(VTOAFS(oldip), (char *)oldname, VTOAFS(newip), (char *)newname, credp);
+-- 
+1.7.2.5
+
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild
new file mode 100644
index 000000000000..a99ab2698173
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild,v 1.1 2013/09/05 20:10:46 axs Exp $
+
+EAPI="5"
+
+inherit autotools eutils multilib linux-mod versionator toolchain-funcs
+
+MY_PV=$(delete_version_separator '_')
+MY_PN=${PN/-kernel}
+MY_P2="${MY_PN}-${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="1"
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
+	mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
+ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+	fi
+}
+
+src_prepare() {
+	EPATCH_EXCLUDE="012_all_kbuild.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+	epatch "${FILESDIR}"/${P/-kernel/}-kernel-3.11-{1..2}.patch
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	ARCH="$(tc-arch-kernel)" \
+	econf \
+		--with-linux-kernel-headers=${KV_DIR} \
+		--with-linux-kernel-build=${KV_OUT_DIR}
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs || die
+}
+
+src_install() {
+	if use kernel_linux; then
+		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+		linux-mod_src_install
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${S}"/src/libafs/MODLOAD/libafs.ko
+	fi
+}
+
+pkg_postinst() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postrm
+}
diff --git a/net-fs/samba/samba-3.6.16.ebuild b/net-fs/samba/samba-3.6.16.ebuild
index c42347868a57..02b14231aa59 100644
--- a/net-fs/samba/samba-3.6.16.ebuild
+++ b/net-fs/samba/samba-3.6.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.16.ebuild,v 1.10 2013/09/04 07:58:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.16.ebuild,v 1.11 2013/09/05 12:21:59 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.samba.org/"
 SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
 	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
 	swat syslog winbind"
diff --git a/net-fs/samba/samba-4.0.8-r2.ebuild b/net-fs/samba/samba-4.0.8-r2.ebuild
index 4a349cdc5622..9640a576e701 100644
--- a/net-fs/samba/samba-4.0.8-r2.ebuild
+++ b/net-fs/samba/samba-4.0.8-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.8-r2.ebuild,v 1.1 2013/08/16 07:13:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.8-r2.ebuild,v 1.2 2013/09/05 19:44:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit python-r1 waf-utils multilib linux-info systemd
 
diff --git a/net-fs/samba/samba-4.1.0_rc2.ebuild b/net-fs/samba/samba-4.1.0_rc2.ebuild
index 0fcfc481e72a..45edb4cb1f7c 100644
--- a/net-fs/samba/samba-4.1.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.1.0_rc2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0_rc2.ebuild,v 1.3 2013/08/16 07:13:48 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0_rc2.ebuild,v 1.4 2013/09/05 19:44:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit python-r1 waf-utils multilib linux-info systemd
 
diff --git a/net-im/bitlbee/bitlbee-3.2.ebuild b/net-im/bitlbee/bitlbee-3.2.ebuild
index 97e7cca97ec5..0a57a21af483 100644
--- a/net-im/bitlbee/bitlbee-3.2.ebuild
+++ b/net-im/bitlbee/bitlbee-3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.ebuild,v 1.2 2013/01/08 14:25:21 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.ebuild,v 1.3 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils multilib user python-single-r1
 
diff --git a/net-im/ekg2/ekg2-0.3.1-r1.ebuild b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
index e8d28e4088f4..6649995ebf77 100644
--- a/net-im/ekg2/ekg2-0.3.1-r1.ebuild
+++ b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r1.ebuild,v 1.5 2013/03/21 16:30:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r1.ebuild,v 1.6 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit autotools-utils eutils python-single-r1 versionator
 
 DESCRIPTION="Text-based, multi-protocol instant messenger"
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 200cfd38f15e..028cb4527c3e 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.6 2013/03/21 16:30:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.7 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://github.com/leafnode/${PN}.git
 inherit git-2
 #endif
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit autotools-utils python-single-r1
 
 DESCRIPTION="Text-based, multi-protocol instant messenger"
diff --git a/net-im/empathy/empathy-3.6.4.ebuild b/net-im/empathy/empathy-3.6.4.ebuild
index c09201bec0fd..dcf7d19b6d14 100644
--- a/net-im/empathy/empathy-3.6.4.ebuild
+++ b/net-im/empathy/empathy-3.6.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.4.ebuild,v 1.2 2013/08/04 09:02:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.6.4.ebuild,v 1.3 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/empathy/empathy-3.8.2.ebuild b/net-im/empathy/empathy-3.8.2.ebuild
index 7ae6ec33e7c9..413974f44a71 100644
--- a/net-im/empathy/empathy-3.8.2.ebuild
+++ b/net-im/empathy/empathy-3.8.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.2.ebuild,v 1.1 2013/05/20 18:39:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.2.ebuild,v 1.2 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/empathy/empathy-3.8.3.ebuild b/net-im/empathy/empathy-3.8.3.ebuild
index 6f2afeb209f7..4b866ecfc9c4 100644
--- a/net-im/empathy/empathy-3.8.3.ebuild
+++ b/net-im/empathy/empathy-3.8.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.3.ebuild,v 1.2 2013/07/24 19:34:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.8.3.ebuild,v 1.3 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} python3_{2,3} )
+PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/sendxmpp/sendxmpp-1.23.ebuild b/net-im/sendxmpp/sendxmpp-1.23.ebuild
index 59edfd028f42..e72396b2bab6 100644
--- a/net-im/sendxmpp/sendxmpp-1.23.ebuild
+++ b/net-im/sendxmpp/sendxmpp-1.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sendxmpp/sendxmpp-1.23.ebuild,v 1.2 2013/09/04 16:03:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sendxmpp/sendxmpp-1.23.ebuild,v 1.3 2013/09/05 13:55:17 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/s/sendxmpp/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Net-XMPP
diff --git a/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild b/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
index 74f9bba11e56..56a625a19005 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild,v 1.9 2013/04/01 18:25:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild,v 1.10 2013/09/05 18:59:50 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.0.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.0.ebuild
index c1fa4e8ec054..50a106ec3f20 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.0.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.8.0.ebuild,v 1.2 2013/06/30 21:08:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.8.0.ebuild,v 1.3 2013/09/05 18:59:50 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild
index c476ed9520de..541df2bd99ad 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild,v 1.9 2013/04/01 18:25:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild,v 1.10 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-any-r1
 
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild
index c620d323faa1..4f7cdd7eb307 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild,v 1.1 2013/05/04 11:43:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild,v 1.2 2013/09/05 18:59:51 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-any-r1
 
diff --git a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
index cd03d8239598..f84e9af5369c 100644
--- a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.11 2013/07/11 20:19:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.12 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit autotools eutils gnome2-utils mono multilib python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/hexchat/hexchat-2.9.5.ebuild b/net-irc/hexchat/hexchat-2.9.5.ebuild
index ea56c4e1b423..680744d72230 100644
--- a/net-irc/hexchat/hexchat-2.9.5.ebuild
+++ b/net-irc/hexchat/hexchat-2.9.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5.ebuild,v 1.15 2013/07/11 20:19:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5.ebuild,v 1.16 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit autotools eutils gnome2-utils mono multilib python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.1.16.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.1.16.ebuild
index af296983255b..86a56f965468 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.1.16.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.1.16.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.1.16.ebuild,v 1.8 2013/05/07 13:55:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/telepathy-idle/telepathy-idle-0.1.16.ebuild,v 1.9 2013/09/05 19:44:51 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit python-single-r1
 
diff --git a/net-libs/dslib/dslib-3.0-r1.ebuild b/net-libs/dslib/dslib-3.0-r1.ebuild
index 5a7c2e9374ee..6097770e866d 100644
--- a/net-libs/dslib/dslib-3.0-r1.ebuild
+++ b/net-libs/dslib/dslib-3.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/dslib/dslib-3.0-r1.ebuild,v 1.2 2013/05/20 12:55:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/dslib/dslib-3.0-r1.ebuild,v 1.3 2013/09/05 19:01:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 877d03f546a0..0ca9d82b607e 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,3 +1,2 @@
-DIST gloox-0.9.8.tar.bz2 438638 SHA256 d253ef7f3eb1eb9f7a1fe5263cb09b439b35567d1628c8b050e71ce5220cbf2a
-DIST gloox-0.9.9.5.tar.bz2 439468 SHA256 feffed16209fc109dc2e2d06a42e8d00942e9a00bcae0ee23abcf6a9b07923c4
+DIST gloox-1.0.6.tar.bz2 665458 SHA256 77a496aab54422c24655ba4f86174ca21d568bcb3a77d63ae932709af5e0222c SHA512 b1334a674916f377d33b0e0766d5e75a2bb9f856972a9ff3c45e63e0ac2f5184acb8fcb2338ebdd2596a05baa9c861a1efcccd9d0fbff37e8537b48570ec9e96 WHIRLPOOL ca5848ca78d78d2c5f10582b1a13cd14eef3c1e11a208527e50bf0ec396b4a6c465f14450a4670c46b6409728490d42ee0a2b0ccdbe92501eca68d563102d2b6
 DIST gloox-1.0.tar.bz2 603434 SHA256 b53f3e83e97f2f8d46e482620389b7778b7b0d95b2518ce5e1ae6d81bb2bcde8
diff --git a/net-libs/gloox/files/gloox-0.9.9.5-gcc43.patch b/net-libs/gloox/files/gloox-0.9.9.5-gcc43.patch
deleted file mode 100644
index 0fa4fd465121..000000000000
--- a/net-libs/gloox/files/gloox-0.9.9.5-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gloox-0.9.9.5b/src/tlsopenssl.cpp	2009-01-21 22:43:06.000000000 -0400
-+++ gloox-0.9.9.5/src/tlsopenssl.cpp	2009-01-22 00:42:53.000000000 -0400
-@@ -223,7 +223,8 @@
-       m_certInfo.date_to = openSSLTime2UnixTime( (char*)(peer->cert_info->validity->notAfter->data) );
-       std::string p;
-       p.assign( peer_CN );
--      std::transform( p.begin(), p.end(), p.begin(), std::tolower );
-+      /* http://lists.debian.org/debian-gcc/2002/04/msg00092.html */
-+      std::transform( p.begin(), p.end(), p.begin(), (int(*)(int))std::tolower );
-       if( p != m_server )
-         m_certInfo.status |= CertWrongPeer;
- 
diff --git a/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch b/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch
deleted file mode 100644
index 27541033d85b..000000000000
--- a/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -NrU5 gloox-0.9.9.5.original/src/md5.cpp gloox-0.9.9.5/src/md5.cpp
---- gloox-0.9.9.5.original/src/md5.cpp	2009-06-18 15:19:28.000000000 -0600
-+++ gloox-0.9.9.5/src/md5.cpp	2009-06-18 15:22:11.000000000 -0600
-@@ -70,10 +70,11 @@
-  */
- 
- #include "md5.h"
- 
- #include <string.h>
-+#include <cstdio> 
- 
- namespace gloox
- {
- // #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
- // #ifdef ARCH_IS_BIG_ENDIAN
-diff -NrU5 gloox-0.9.9.5.original/src/sha.cpp gloox-0.9.9.5/src/sha.cpp
---- gloox-0.9.9.5.original/src/sha.cpp	2009-06-18 15:19:28.000000000 -0600
-+++ gloox-0.9.9.5/src/sha.cpp	2009-06-18 15:31:29.000000000 -0600
-@@ -10,10 +10,12 @@
-   This software is distributed without any warranty.
- */
- 
- #include "sha.h"
- 
-+#include <cstdio>
-+
- namespace gloox
- {
- 
-   SHA::SHA()
-   {
diff --git a/net-libs/gloox/files/gloox-res_query-check.patch b/net-libs/gloox/files/gloox-res_query-check.patch
deleted file mode 100644
index 91dcfebd2ecd..000000000000
--- a/net-libs/gloox/files/gloox-res_query-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac~	2008-02-18 21:30:35.000000000 +0100
-+++ configure.ac	2008-02-18 21:31:21.000000000 +0100
-@@ -248,7 +248,7 @@
-       AC_MSG_CHECKING([for res_query in -lresolv (alternate version)])
-       save_libs="$LIBS"
-       LIBS="-lresolv $LIBS"
--      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>]], [[res_query(0,0)]])],
-+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>]], [[res_query(0,0,0,0,0)]])],
-                      [AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_RES_QUERY)
-                       have_res_query=yes],
diff --git a/net-libs/gloox/gloox-0.9.8.ebuild b/net-libs/gloox/gloox-0.9.8.ebuild
deleted file mode 100644
index 70d9a000b8f3..000000000000
--- a/net-libs/gloox/gloox-0.9.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.8.ebuild,v 1.4 2008/03/10 15:02:10 beandog Exp $
-
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gnutls idn ssl zlib"
-
-DEPEND="idn? ( >=net-dns/libidn-0.5.0 )
-	gnutls? ( >=net-libs/gnutls-1.2.0 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_with idn libidn) \
-		$(use_with gnutls gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with zlib zlib) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-libs/gloox/gloox-0.9.9.5.ebuild b/net-libs/gloox/gloox-0.9.9.5.ebuild
deleted file mode 100644
index 97f968d79964..000000000000
--- a/net-libs/gloox/gloox-0.9.9.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.5.ebuild,v 1.4 2009/07/30 21:12:39 maekke Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="http://camaya.net/gloox"
-SRC_URI="http://camaya.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gnutls idn ssl zlib"
-
-RDEPEND="idn? ( >=net-dns/libidn-0.5.0 )
-	gnutls? ( >=net-libs/gnutls-1.2.0 )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_with idn libidn) \
-		$(use_with gnutls gnutls) \
-		$(use_with ssl openssl) \
-		$(use_with zlib zlib) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-libs/gloox/gloox-1.0.6.ebuild b/net-libs/gloox/gloox-1.0.6.ebuild
new file mode 100644
index 000000000000..c93518dafc67
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-1.0.6.ebuild,v 1.1 2013/09/05 13:10:04 mrueg Exp $
+
+EAPI=5
+
+MY_P=${P/_/-}
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="http://camaya.net/gloox"
+SRC_URI="http://camaya.net/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gnutls idn ssl zlib"
+
+DEPEND="idn? ( net-dns/libidn )
+	gnutls? ( net-libs/gnutls )
+	ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf \
+		$(use_enable debug debug) \
+		$(use_with idn libidn) \
+		$(use_with gnutls gnutls) \
+		$(use_with ssl openssl) \
+		$(use_with zlib zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/net-libs/http-parser/http-parser-2.1.ebuild b/net-libs/http-parser/http-parser-2.1.ebuild
index f029053f30d6..31cf5870982e 100644
--- a/net-libs/http-parser/http-parser-2.1.ebuild
+++ b/net-libs/http-parser/http-parser-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/http-parser/http-parser-2.1.ebuild,v 1.2 2013/08/31 09:44:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/http-parser/http-parser-2.1.ebuild,v 1.3 2013/09/05 19:23:27 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/net-libs/liboauth/liboauth-1.0.1.ebuild b/net-libs/liboauth/liboauth-1.0.1.ebuild
index 333ac12922a1..10f83e58f56f 100644
--- a/net-libs/liboauth/liboauth-1.0.1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-1.0.1.ebuild,v 1.9 2013/09/04 09:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-1.0.1.ebuild,v 1.10 2013/09/05 12:19:23 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos"
 IUSE="curl doc bindist +nss"
 
 PATCHES=( "${FILESDIR}"/${P}-doxygen-out-of-tree.patch )
diff --git a/net-libs/libsoup/libsoup-2.40.3.ebuild b/net-libs/libsoup/libsoup-2.40.3.ebuild
index 55f64ee8ad13..51406f1f1d70 100644
--- a/net-libs/libsoup/libsoup-2.40.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.40.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.40.3.ebuild,v 1.2 2013/02/25 08:55:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.40.3.ebuild,v 1.3 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit gnome2 python-any-r1
 
diff --git a/net-libs/libsoup/libsoup-2.42.1.ebuild b/net-libs/libsoup/libsoup-2.42.1.ebuild
index 0e4c3a8ad7bb..997f95cc0b80 100644
--- a/net-libs/libsoup/libsoup-2.42.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.42.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.1.ebuild,v 1.3 2013/05/03 00:27:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.1.ebuild,v 1.4 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils gnome2 python-any-r1
 
diff --git a/net-libs/libsoup/libsoup-2.42.2-r1.ebuild b/net-libs/libsoup/libsoup-2.42.2-r1.ebuild
index dfbe37afd276..4c2f4c81d060 100644
--- a/net-libs/libsoup/libsoup-2.42.2-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.42.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.2-r1.ebuild,v 1.1 2013/08/29 22:07:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.2-r1.ebuild,v 1.2 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit gnome2 python-any-r1
 
diff --git a/net-libs/libsoup/libsoup-2.42.2.ebuild b/net-libs/libsoup/libsoup-2.42.2.ebuild
index 844cd7ef1801..831977d9eca0 100644
--- a/net-libs/libsoup/libsoup-2.42.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.42.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.2.ebuild,v 1.2 2013/05/03 00:27:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.2.ebuild,v 1.3 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils gnome2 python-any-r1
 
diff --git a/net-libs/nodejs/nodejs-0.10.17.ebuild b/net-libs/nodejs/nodejs-0.10.17.ebuild
index aa8526c15147..20a8c3c22355 100644
--- a/net-libs/nodejs/nodejs-0.10.17.ebuild
+++ b/net-libs/nodejs/nodejs-0.10.17.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.17.ebuild,v 1.1 2013/08/23 09:12:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.17.ebuild,v 1.2 2013/09/05 19:01:34 mgorny Exp $
 
 EAPI=5
 
 # has known failures. sigh.
 RESTRICT="test"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit python-any-r1 pax-utils
 
diff --git a/net-libs/nodejs/nodejs-0.10.18.ebuild b/net-libs/nodejs/nodejs-0.10.18.ebuild
index a3cec2d98b84..4f575631bdc5 100644
--- a/net-libs/nodejs/nodejs-0.10.18.ebuild
+++ b/net-libs/nodejs/nodejs-0.10.18.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.18.ebuild,v 1.1 2013/09/05 03:05:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.18.ebuild,v 1.2 2013/09/05 19:01:34 mgorny Exp $
 
 EAPI=5
 
 # has known failures. sigh.
 RESTRICT="test"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit python-any-r1 pax-utils
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild
index 1a7700fdc2f9..da8ddcec8399 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild,v 1.5 2013/08/28 11:16:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.10.ebuild,v 1.6 2013/09/05 12:18:56 ago Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.6"
@@ -19,7 +19,7 @@ SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug doc examples python ssl static-libs"
 RESTRICT="test"
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild
index 333a5105a828..43121933d401 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild,v 1.10 2013/04/01 18:25:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.1-r1.ebuild,v 1.11 2013/09/05 19:01:34 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild
index 52bd475b88aa..5508081c18ec 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild,v 1.1 2013/06/21 08:31:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.3.ebuild,v 1.2 2013/09/05 19:01:34 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.20.4.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.20.4.ebuild
index 4b05578b5426..b47a00738ff8 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.20.4.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.20.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.4.ebuild,v 1.1 2013/07/24 19:02:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.20.4.ebuild,v 1.2 2013/09/05 19:01:34 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.3-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.3-r1.ebuild
index 053d818a4d97..6ba350dbdb6c 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.3-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.3-r1.ebuild,v 1.1 2013/06/05 21:35:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.3-r1.ebuild,v 1.2 2013/09/05 19:01:34 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit base python-any-r1 cmake-utils virtualx
 
 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
index 59fe544bfc82..9d76c8feb39d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.10 2013/08/05 09:48:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.11 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
index ee2b7bb2faf9..3488be8b393f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.12 2013/06/18 06:10:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild,v 1.13 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="4"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
index f1c7b29658de..ffba1c6fd08c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v 1.11 2013/06/26 11:55:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v 1.12 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
index 285342775895..3f175bd56c79 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.12 2013/06/18 06:10:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.13 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="4"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
index b2944f489e97..b0fedf665649 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.3 2013/09/01 18:44:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.4 2013/09/05 19:01:33 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator virtualx
 
diff --git a/net-mail/dovecot/dovecot-2.2.5.ebuild b/net-mail/dovecot/dovecot-2.2.5.ebuild
index 9a78dad9b820..d80d1de69527 100644
--- a/net-mail/dovecot/dovecot-2.2.5.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.5.ebuild,v 1.9 2013/09/02 11:14:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.5.ebuild,v 1.10 2013/09/05 12:19:52 ago Exp $
 
 EAPI=5
 inherit eutils multilib ssl-cert systemd user versionator
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-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_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-mail/getmail/getmail-4.36.0.ebuild b/net-mail/getmail/getmail-4.36.0.ebuild
index 245a5a6207b1..c2dfa138df8c 100644
--- a/net-mail/getmail/getmail-4.36.0.ebuild
+++ b/net-mail/getmail/getmail-4.36.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.36.0.ebuild,v 1.4 2013/02/14 22:10:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.36.0.ebuild,v 1.5 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/net-mail/getmail/getmail-4.39.1.ebuild b/net-mail/getmail/getmail-4.39.1.ebuild
index bbc624bcb9a3..f1c65b3aa24d 100644
--- a/net-mail/getmail/getmail-4.39.1.ebuild
+++ b/net-mail/getmail/getmail-4.39.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.39.1.ebuild,v 1.1 2013/03/12 03:41:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.39.1.ebuild,v 1.2 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/net-mail/getmail/getmail-4.40.1.ebuild b/net-mail/getmail/getmail-4.40.1.ebuild
index 1418fa418576..33ce8426dcf9 100644
--- a/net-mail/getmail/getmail-4.40.1.ebuild
+++ b/net-mail/getmail/getmail-4.40.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.40.1.ebuild,v 1.1 2013/05/02 07:26:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.40.1.ebuild,v 1.2 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/net-mail/getmail/getmail-4.40.3.ebuild b/net-mail/getmail/getmail-4.40.3.ebuild
index 6785a8fea8dc..6ff76a355483 100644
--- a/net-mail/getmail/getmail-4.40.3.ebuild
+++ b/net-mail/getmail/getmail-4.40.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.40.3.ebuild,v 1.1 2013/05/11 11:27:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.40.3.ebuild,v 1.2 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/net-mail/getmail/getmail-4.41.0.ebuild b/net-mail/getmail/getmail-4.41.0.ebuild
index c56ead87dca9..c7404b3592bc 100644
--- a/net-mail/getmail/getmail-4.41.0.ebuild
+++ b/net-mail/getmail/getmail-4.41.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.41.0.ebuild,v 1.4 2013/07/27 22:08:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.41.0.ebuild,v 1.5 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/net-mail/mpop/mpop-1.0.28.ebuild b/net-mail/mpop/mpop-1.0.28.ebuild
index c4588e987eeb..bcb2f4dead69 100644
--- a/net-mail/mpop/mpop-1.0.28.ebuild
+++ b/net-mail/mpop/mpop-1.0.28.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mpop/mpop-1.0.28.ebuild,v 1.1 2013/04/23 00:19:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mpop/mpop-1.0.28.ebuild,v 1.2 2013/09/05 19:44:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit python-single-r1
 
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 2827f1e6ded9..706ab06337fb 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,3 +1,3 @@
-DIST bridge-utils-1.2.tar.gz 32261 SHA256 c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349
-DIST bridge-utils-1.4.tar.gz 32657 SHA256 876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933
+DIST bridge-utils-1.2.tar.gz 32261 SHA256 c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349 SHA512 b5e93f75ecb08c3a4ad997ea536850ea7e48161e889b492506cbb9035557ae6594e066273f0bd5f0cc817108304aae1096016c26952f317d48d7431e2f667ac8 WHIRLPOOL f816d7ca80b2fc169b5bcc97b1165742b54f385b8b7645410ee9565da36028e2ea4a6ac804349092e8f398bc73c068f72347caa394917ab9a731714d5579a3eb
+DIST bridge-utils-1.4.tar.gz 32657 SHA256 876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933 SHA512 d890e66fd93cac086ee4fd5e3097caf3703656a4bb97936ca4c06defa923dcd006b9958bd9aa04fd051a4598d80aaa0b02f8a4e59d3d6f97e67ab1dc271703ca WHIRLPOOL 5a45abc10d8e865e66af867d83147cf0687dd884f08515d280671acde12d653d7bb15412614d3cfa92bcdf1d745ff3d91c7b93ecc18363301e31ea1630ec2bf9
 DIST bridge-utils-1.5.tar.gz 33243 SHA256 42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 WHIRLPOOL f11eb95ae9b562cb301bb1f657d87878f0a0729a2129b90fa5957747f078f3afe2ebdadd1eb7ea4a59e544acc8194cf1744126db9ba3f3704210bc18ee3480fa
diff --git a/net-misc/bridge-utils/bridge-utils-1.4.ebuild b/net-misc/bridge-utils/bridge-utils-1.4.ebuild
index c187a482a77c..8965a3795fda 100644
--- a/net-misc/bridge-utils/bridge-utils-1.4.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.4.ebuild,v 1.10 2010/09/19 19:34:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.4.ebuild,v 1.11 2013/09/06 06:00:31 robbat2 Exp $
 
 inherit toolchain-funcs eutils autotools linux-info
 
@@ -47,6 +47,7 @@ src_install () {
 	emake install DESTDIR="${D}" || die "make install failed"
 	dodoc AUTHORS ChangeLog README THANKS TODO
 	dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
+	[ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary"
 }
 
 pkg_postinst () {
diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild
index 1bfeb5731881..b1986e25ac76 100644
--- a/net-misc/bridge-utils/bridge-utils-1.5.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.5.ebuild,v 1.3 2013/03/06 17:27:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.5.ebuild,v 1.4 2013/09/06 06:00:31 robbat2 Exp $
 
 EAPI="5"
 
@@ -46,4 +46,5 @@ src_install () {
 	emake install DESTDIR="${D}"
 	dodoc AUTHORS ChangeLog README THANKS TODO \
 		doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
+	[ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary"
 }
diff --git a/net-misc/gns3/gns3-0.8.4.ebuild b/net-misc/gns3/gns3-0.8.4.ebuild
index 874413b5f44f..11c6abdc1027 100644
--- a/net-misc/gns3/gns3-0.8.4.ebuild
+++ b/net-misc/gns3/gns3-0.8.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3/gns3-0.8.4.ebuild,v 1.1 2013/07/15 16:21:21 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gns3/gns3-0.8.4.ebuild,v 1.2 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 inherit distutils-r1 eutils
 
 MY_P="GNS3-${PV}-src"
diff --git a/net-misc/guidedog/guidedog-1.1-r1.ebuild b/net-misc/guidedog/guidedog-1.1-r1.ebuild
index 5b266e72505f..b03ce47bd2cc 100644
--- a/net-misc/guidedog/guidedog-1.1-r1.ebuild
+++ b/net-misc/guidedog/guidedog-1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/guidedog/guidedog-1.1-r1.ebuild,v 1.3 2013/03/31 16:59:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/guidedog/guidedog-1.1-r1.ebuild,v 1.4 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit python-single-r1 kde4-base
 
diff --git a/net-misc/httpie/httpie-0.3.0-r1.ebuild b/net-misc/httpie/httpie-0.3.0-r1.ebuild
index 1bdcc5fcfd56..55192a236586 100644
--- a/net-misc/httpie/httpie-0.3.0-r1.ebuild
+++ b/net-misc/httpie/httpie-0.3.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.0-r1.ebuild,v 1.2 2013/07/03 01:14:31 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.0-r1.ebuild,v 1.3 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.3.0.ebuild b/net-misc/httpie/httpie-0.3.0.ebuild
index 91f4bb3a73fa..3cc8bfd63607 100644
--- a/net-misc/httpie/httpie-0.3.0.ebuild
+++ b/net-misc/httpie/httpie-0.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.0.ebuild,v 1.3 2013/07/03 01:14:31 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.0.ebuild,v 1.4 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.3.1.ebuild b/net-misc/httpie/httpie-0.3.1.ebuild
index c0c2c759ac9b..e2259cfbc37e 100644
--- a/net-misc/httpie/httpie-0.3.1.ebuild
+++ b/net-misc/httpie/httpie-0.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.1.ebuild,v 1.2 2013/07/03 01:14:31 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.3.1.ebuild,v 1.3 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.4.1.ebuild b/net-misc/httpie/httpie-0.4.1.ebuild
index ab862cc6adfe..8ac1958f4b94 100644
--- a/net-misc/httpie/httpie-0.4.1.ebuild
+++ b/net-misc/httpie/httpie-0.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.4.1.ebuild,v 1.2 2013/07/03 01:14:31 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.4.1.ebuild,v 1.3 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.5.1.ebuild b/net-misc/httpie/httpie-0.5.1.ebuild
index 2a93ce3820fe..8c7da63a73b0 100644
--- a/net-misc/httpie/httpie-0.5.1.ebuild
+++ b/net-misc/httpie/httpie-0.5.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.5.1.ebuild,v 1.2 2013/07/03 01:14:31 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.5.1.ebuild,v 1.3 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.6.0.ebuild b/net-misc/httpie/httpie-0.6.0.ebuild
index ad6d44d66166..ed432c0f2ef0 100644
--- a/net-misc/httpie/httpie-0.6.0.ebuild
+++ b/net-misc/httpie/httpie-0.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.6.0.ebuild,v 1.1 2013/07/03 01:09:06 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/httpie/httpie-0.6.0.ebuild,v 1.2 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch b/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
new file mode 100644
index 000000000000..571b73c9c664
--- /dev/null
+++ b/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
@@ -0,0 +1,23 @@
+Description: Fix bidirectional TCP server exiting after the test
+ iperf bidirectional test using parameter -r or -d doesn't work as
+ expected, the server exits after the test, but it should continue listening
+ for new connections.
+Author: Roberto Lumbreras <rover@debian.org>
+Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=449796
+Forwarded: http://sourceforge.net/tracker/?func=detail&aid=1983829&group_id=128336&atid=711371
+
+--- iperf-2.0.5.orig/src/Client.cpp
++++ iperf-2.0.5/src/Client.cpp
+@@ -212,10 +212,12 @@ void Client::Run( void ) {
+     char* readAt = mBuf;
+ 
+ #if HAVE_THREAD
++    /*
+     if ( !isUDP( mSettings ) ) {
+ 	RunTCP();
+ 	return;
+     }
++    */
+ #endif
+     
+     // Indicates if the stream is readable 
diff --git a/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch b/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
new file mode 100644
index 000000000000..8919d81c012b
--- /dev/null
+++ b/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
@@ -0,0 +1,20 @@
+Description: iperf does not handle right large time values
+ Reported by Eugene Butan <eugene@mikrotik.com>
+ When I invoke 'iperf' with '-t 100000000' argument from an ordinary shell
+ prompt it immediately exits displaying incorrect bandwidth. If I supply
+ smaller time value, iperf works as expected.
+Author: Roberto Lumbreras <rover@debian.org>
+Bug-Debian: http://bugs.debian.org/346099
+Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=3140391&group_id=128336&atid=711371
+
+--- iperf-2.0.4.orig/src/Settings.cpp.orig	2008-04-08 04:37:54.000000000 +0200
++++ iperf-2.0.4/src/Settings.cpp	2008-05-07 17:41:03.923942801 +0200
+@@ -458,7 +458,7 @@
+         case 't': // seconds to write for
+             // time mode (instead of amount mode)
+             setModeTime( mExtSettings );
+-            mExtSettings->mAmount = (int) (atof( optarg ) * 100.0);
++            mExtSettings->mAmount = (max_size_t) (atof( optarg ) * 100.0);
+             break;
+ 
+         case 'u': // UDP instead of TCP
diff --git a/net-misc/iperf/files/iperf-die-on-bind-fail.patch b/net-misc/iperf/files/iperf-die-on-bind-fail.patch
new file mode 100644
index 000000000000..4dca6db8d985
--- /dev/null
+++ b/net-misc/iperf/files/iperf-die-on-bind-fail.patch
@@ -0,0 +1,19 @@
+Description: iperf die on bind fail
+ When iperf encounters a fatal error when binding to a port, such as
+ the port being already in use or lacking permission, it fails to give
+ fatal error, but instead pretends to continue to listen on the port.
+Author: Deny IP Any Any <denyipanyany@gmail.com>
+Bug-Debian: http://bugs.debian.org/517239
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3140400&group_id=128336&atid=711371
+
+--- iperf-2.0.4/src/Listener.cpp	2009-02-23 16:20:31.000000000 -0500
++++ iperf-2.0.4-fixed/src/Listener.cpp	2009-02-23 16:20:40.000000000 -0500
+@@ -333,7 +333,7 @@
+ #endif
+     {
+         rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local );
+-        WARN_errno( rc == SOCKET_ERROR, "bind" );
++        FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+     }
+     // listen for connections (TCP only).
+     // default backlog traditionally 5
diff --git a/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch b/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
new file mode 100644
index 000000000000..ee2e67b085d0
--- /dev/null
+++ b/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
@@ -0,0 +1,100 @@
+Description: iperf format string FTBFS with -Werror=format-security
+ Reported by Didier Raboud <odyx@debian.org>
+Author: Simon Paillard <spaillard@debian.org>
+Bug-Debian: http://bugs.debian.org/643408
+
+diff -Nur iperf-2.0.5/compat/Thread.c iperf-2.0.5-nmu/compat/Thread.c
+--- iperf-2.0.5/compat/Thread.c	2010-03-31 01:08:24.000000000 +0200
++++ iperf-2.0.5-nmu/compat/Thread.c	2011-11-15 09:13:32.000000000 +0100
+@@ -381,7 +381,7 @@
+     Condition_Lock( thread_sNum_cond );
+     thread_sNum -= nonterminating_num;
+     if ( thread_sNum > 1 && nonterminating_num > 0 && interrupt != 0 ) {
+-        fprintf( stderr, wait_server_threads );
++        fprintf( stderr, "%s", wait_server_threads );
+     }
+     nonterminating_num = 0;
+     Condition_Signal( &thread_sNum_cond );
+diff -Nur iperf-2.0.5/src/ReportDefault.c iperf-2.0.5-nmu/src/ReportDefault.c
+--- iperf-2.0.5/src/ReportDefault.c	2010-03-31 00:57:17.000000000 +0200
++++ iperf-2.0.5-nmu/src/ReportDefault.c	2011-11-15 09:16:52.000000000 +0100
+@@ -78,7 +78,7 @@
+     if ( stats->mUDP != (char)kMode_Server ) {
+         // TCP Reporting
+         if( !header_printed ) {
+-            printf( report_bw_header);
++            printf( "%s", report_bw_header);
+             header_printed = 1;
+         }
+         printf( report_bw_format, stats->transferID, 
+@@ -87,7 +87,7 @@
+     } else {
+         // UDP Reporting
+         if( !header_printed ) {
+-            printf( report_bw_jitter_loss_header);
++            printf( "%s", report_bw_jitter_loss_header);
+             header_printed = 1;
+         }
+         printf( report_bw_jitter_loss_format, stats->transferID, 
+@@ -159,7 +159,7 @@
+                   (data->mThreadMode == kMode_Listener ? 0 : 1) );
+     win_requested = data->mTCPWin;
+ 
+-    printf( separator_line );
++    printf( "%s", separator_line );
+     if ( data->mThreadMode == kMode_Listener ) {
+         printf( server_port,
+                 (isUDP( data ) ? "UDP" : "TCP"), 
+@@ -198,7 +198,7 @@
+         printf( warn_window_requested, buffer );
+     }
+     printf( "\n" );
+-    printf( separator_line );
++    printf( "%s", separator_line );
+ }
+ 
+ /*
+@@ -286,7 +286,7 @@
+         } else if ( checkMSS_MTU( inMSS, 576 ) ) {
+             net = "minimum";
+             mtu = 576;
+-            printf( warn_no_pathmtu );
++            printf( "%s", warn_no_pathmtu );
+         } else {
+             mtu = inMSS + 40;
+             net = "unknown interface";
+diff -Nur iperf-2.0.5/src/Reporter.c iperf-2.0.5-nmu/src/Reporter.c
+--- iperf-2.0.5/src/Reporter.c	2011-11-15 19:44:41.000000000 +0100
++++ iperf-2.0.5-nmu/src/Reporter.c	2011-11-15 09:17:14.000000000 +0100
+@@ -896,7 +896,7 @@
+         } else if ( checkMSS_MTU( inMSS, 576 ) ) {
+             net = "minimum";
+             mtu = 576;
+-            printf( warn_no_pathmtu );
++            printf( "%s", warn_no_pathmtu );
+         } else {
+             mtu = inMSS + 40;
+             net = "unknown interface";
+diff -Nur iperf-2.0.5/src/Settings.cpp iperf-2.0.5-nmu/src/Settings.cpp
+--- iperf-2.0.5/src/Settings.cpp	2011-11-15 19:44:41.000000000 +0100
++++ iperf-2.0.5-nmu/src/Settings.cpp	2011-11-15 09:18:46.000000000 +0100
+@@ -375,8 +375,8 @@
+             break;
+ 
+         case 'h': // print help and exit
+-            fprintf(stderr, usage_long1);
+-            fprintf(stderr, usage_long2);
++            fprintf(stderr, "%s", usage_long1);
++            fprintf(stderr, "%s", usage_long2);
+             exit(1);
+             break;
+ 
+@@ -482,7 +482,7 @@
+             break;
+ 
+         case 'v': // print version and exit
+-            fprintf( stderr, version );
++            fprintf( stderr, "%s", version );
+             exit(1);
+             break;
+ 
diff --git a/net-misc/iperf/files/iperf-ipv6_mcast_check.patch b/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
new file mode 100644
index 000000000000..cd700a6b67c1
--- /dev/null
+++ b/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
@@ -0,0 +1,22 @@
+Description: Fix improper check for IPv6 family when sending multicast
+ This patch fixes the proper behavior of -T (hop-limit setting) when
+ sending IPv6 multicast packets. Due to this bug, it was always fixed to 1.
+ .
+ SetSocketOptions() is called before socket connection, thus sa_family is
+ still set to 0. This is causing the if-branch in the multicast check
+ to always assume a non-IPv6 socket.
+ Checking the remote-peer family works reliably, instead.
+Author: Luca Bruno <lucab@debian.org>
+Last-Update: 2012-05-24
+
+--- iperf-2.0.5.orig/src/PerfSocket.cpp
++++ iperf-2.0.5/src/PerfSocket.cpp
+@@ -109,7 +109,7 @@ void SetSocketOptions( thread_Settings *
+     if ( isMulticast( inSettings ) && ( inSettings->mTTL > 0 ) ) {
+ 	int val = inSettings->mTTL;
+ #ifdef HAVE_MULTICAST
+-	if ( !SockAddr_isIPv6( &inSettings->local ) ) {
++	if ( !SockAddr_isIPv6( &inSettings->peer ) ) {
+ 	    int rc = setsockopt( inSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL,
+ 		    (const void*) &val, (Socklen_t) sizeof(val));
+ 
diff --git a/net-misc/iperf/files/iperf.initd-r1 b/net-misc/iperf/files/iperf.initd-r1
new file mode 100644
index 000000000000..bc08a4adf00b
--- /dev/null
+++ b/net-misc/iperf/files/iperf.initd-r1
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd-r1,v 1.1 2013/09/05 16:04:40 dev-zero Exp $
+
+description="IP bandwidth measurement server"
+command="/usr/bin/iperf"
+
+command_background="yes"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-s ${IPERF_OPTS}"
+
+# note: iperf has a daemon flag but we seem to hit a bug
+#       where it starts to eat all CPU after client disconnect,
+#       see bug #344875
+
+depend() {
+	need net
+}
diff --git a/net-misc/iperf/iperf-2.0.5-r2.ebuild b/net-misc/iperf/iperf-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..2c8ea547bb1b
--- /dev/null
+++ b/net-misc/iperf/iperf-2.0.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5-r2.ebuild,v 1.1 2013/09/05 16:04:40 dev-zero Exp $
+
+EAPI="5"
+
+inherit base
+
+DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
+HOMEPAGE="http://iperf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="ipv6 threads debug"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-fix-bandwidth-limit.patch
+	"${FILESDIR}"/"${PN}"-cast-to-max_size_t-instead-of-int.patch
+	"${FILESDIR}"/"${PN}"-die-on-bind-fail.patch
+	"${FILESDIR}"/"${PN}"-bidirectional-tcp-server.patch
+	"${FILESDIR}"/"${PN}"-fix-format-security-ftbfs.patch
+	"${FILESDIR}"/"${PN}"-ipv6_mcast_check.patch
+	)
+DOCS="INSTALL README"
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable threads) \
+		$(use_enable debug debuginfo)
+}
+
+src_install() {
+	default
+	dohtml doc/*
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	echo
+	einfo "To run iperf in server mode, run:"
+	einfo "  /etc/init.d/iperf start"
+	echo
+}
diff --git a/net-misc/minidlna/files/minidlna-1.1.0-r3.initd b/net-misc/minidlna/files/minidlna-1.1.0-r3.initd
new file mode 100644
index 000000000000..0c971781ecf7
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.0-r3.initd
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna-1.1.0-r3.initd,v 1.1 2013/09/05 20:25:35 xmw Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting MiniDLNA"
+	local params=""
+	local stop=0
+
+	checkpath -q -d -m 0755 -o ${M_USER:-minidlna}:${M_GROUP:-minidlna} /run/minidlna
+
+	params="$params -P /run/minidlna/minidlna.pid"
+
+	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
+		params="$params -R"
+	fi
+
+	#set the config file and check if it exists
+	if [ -z "${CONFIG}" ]; then
+		if [ ! -f "/etc/minidlna.conf" ]; then
+			ewarn "You did not set the config file correctly"
+			stop=1
+		fi
+		params="$params -f /etc/minidlna.conf"
+	else
+		if [ ! -f "${CONFIG}" ]; then
+			ewarn "The specified config file does not exist"
+			stop=1
+		fi
+		params="$params -f ${CONFIG}"
+	fi
+
+
+	if [ $stop -eq 1 ]; then
+		eend 1
+	else
+		start-stop-daemon --start \
+			--user ${M_USER:-minidlna} --group ${M_GROUP:-minidlna} \
+			--exec /usr/sbin/minidlnad -- ${params}
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Stopping MiniDLNA"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/minidlnad
+	eend $?
+}
diff --git a/net-misc/minidlna/files/minidlna-1.1.0-r3.service b/net-misc/minidlna/files/minidlna-1.1.0-r3.service
new file mode 100644
index 000000000000..9102c4905272
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.0-r3.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=MiniDLNA is a DLNA/UPnP-AV server software
+After=syslog.target local-fs.target network.target
+
+[Service]
+User=minidlna
+Group=minidlna
+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /run/minidlna/minidlna.pid -S
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/minidlna/minidlna-1.1.0-r3.ebuild b/net-misc/minidlna/minidlna-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..11d28a759458
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.1.0-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.0-r3.ebuild,v 1.1 2013/09/05 20:25:35 xmw Exp $
+
+EAPI=4
+
+inherit eutils systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="netgear readynas"
+
+RDEPEND="dev-db/sqlite
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	local my_is_new="yes"
+	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+		# created by above enewuser command w/ wrong group and permissions
+		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+}
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i ${PN}.conf || die
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-db-path=/var/lib/${PN} \
+		--with-log-path=/var/log/${PN} \
+		--enable-tivo \
+		$(use_enable netgear) \
+		$(use_enable readynas)
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PF}.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PF}.service ${PN}.service
+	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+	systemd_dotmpfilesd "${T}"/${PN}.conf
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc AUTHORS NEWS README TODO
+	doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild
index 5d4d57fa53c8..b6e4ec183c6a 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild,v 1.1 2013/07/04 17:01:55 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.1.3.ebuild,v 1.2 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 systemd
 
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild
index d14c28a300ea..09ed9a5591ab 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild,v 1.1 2013/08/13 12:14:56 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.1.4.ebuild,v 1.2 2013/09/05 19:02:09 mgorny Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils python-single-r1 systemd
 
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 6cf8cc1a9450..55310bc129a4 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,3 +1,3 @@
 DIST tor-0.2.3.25.tar.gz 3190011 SHA256 bb2d6f1136f33e11d37e6e34184143bf191e59501613daf33ae3d6f78f3176a0 SHA512 c15f9356abc41bd1c663d37e674386debc29b0a5887e1120a0318ffb97ada1a04d57756175f01f13549f179f73916e2af18566575a656154ff71ec050fc99651 WHIRLPOOL 6660f5db69bf89cba17937fc72982f674d70fd64c31647228b15d5f19febcd9e64bf09d94e1681f8a0285f2129dbfe3e77687e4d44f335ca8013e318023f755b
-DIST tor-0.2.4.15-rc.tar.gz 2820553 SHA256 3221ee1aec84d8ea3c5af9fc915152ea22d8ca7d87b422cc339533c374986559 SHA512 52004da06c980d0c14bc829c5c550e2a80b538f7564c5976a6c3d24afcc7eb117f0bf0dc6ac5cf8a48591cd0bdb3f42985d2a0d366e7a5ff5fb586a82f5d9471 WHIRLPOOL b28b18ea94c8001f2852b78c6bf16ae2b94f715dbb21679ef993db223e88ff963f22f80e9d11d102be2fab24030f261621c15dd34ef93ec54ba7c8f5da394874
 DIST tor-0.2.4.16-rc.tar.gz 2826883 SHA256 74389d688321f2671bda229b330806e7dfbc685b38bd2ee1aa90d6bc05ed93d9 SHA512 5e64da9b8ae574b36200310c72fc383e798f50f597da1bd0d96825d9fff0ce40db0873acb3313e902bd42e2559abb49c67072fca3633bdfc8b6d1438ca679dcf WHIRLPOOL 43892cd97cf0b883ea766c9705331c44d8a22052f06f10ff4653762185620223da7b2fe9bb084642d32dbe256967388867ec786bb12581df1c4b4852819f082d
+DIST tor-0.2.4.17-rc.tar.gz 2825527 SHA256 9d143b950a1c920e455bb41f2773e2bee8818e4a81aa9b1877db47d643b95d65 SHA512 6a48954462efdef3e2ea71cb662ca14fc0a711494a95e19807564952dbb7e83b411f51819450aa2611313a2d1277323bbb853af720e83bf6421cfb42f53bf40a WHIRLPOOL 09dbc0d5292b1ddded41fa77c3b4e13225ef5a8df658c4f3c77592ef06c334085f21b9582ab57a2c9ee3e7ce476415749934f6b6a3f3f11b3f26a81c5fa05b43
diff --git a/net-misc/tor/tor-0.2.4.15_rc.ebuild b/net-misc/tor/tor-0.2.4.17_rc.ebuild
similarity index 95%
rename from net-misc/tor/tor-0.2.4.15_rc.ebuild
rename to net-misc/tor/tor-0.2.4.17_rc.ebuild
index 0a5c4535e8c9..18f9a117c0cf 100644
--- a/net-misc/tor/tor-0.2.4.15_rc.ebuild
+++ b/net-misc/tor/tor-0.2.4.17_rc.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.15_rc.ebuild,v 1.2 2013/07/06 16:53:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.17_rc.ebuild,v 1.1 2013/09/05 20:03:50 blueness Exp $
 
 EAPI="4"
 
diff --git a/net-nds/openldap/openldap-2.4.35.ebuild b/net-nds/openldap/openldap-2.4.35.ebuild
index fd232e0a8457..dc6f78048006 100644
--- a/net-nds/openldap/openldap-2.4.35.ebuild
+++ b/net-nds/openldap/openldap-2.4.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.35.ebuild,v 1.9 2013/09/05 10:45:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.35.ebuild,v 1.10 2013/09/05 19:22:59 ago Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/net-nntp/inn/inn-2.5.3-r1.ebuild b/net-nntp/inn/inn-2.5.3-r1.ebuild
index ec43254f6643..20172d3b33bc 100644
--- a/net-nntp/inn/inn-2.5.3-r1.ebuild
+++ b/net-nntp/inn/inn-2.5.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.3-r1.ebuild,v 1.4 2013/03/12 18:29:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.3-r1.ebuild,v 1.5 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit autotools eutils multilib python-single-r1 ssl-cert
 
diff --git a/net-nntp/inn/inn-2.5.3-r2.ebuild b/net-nntp/inn/inn-2.5.3-r2.ebuild
index 00b51ed50ff1..5496ed9aa56a 100644
--- a/net-nntp/inn/inn-2.5.3-r2.ebuild
+++ b/net-nntp/inn/inn-2.5.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.3-r2.ebuild,v 1.1 2013/06/03 11:11:56 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.3-r2.ebuild,v 1.2 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit autotools eutils multilib python-single-r1 ssl-cert toolchain-funcs
 
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index cf4643e70e36..f3fbe6495b47 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,4 +1,5 @@
 DIST nzbget-10.2.tar.gz 671808 SHA256 c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2 SHA512 be37d8a3a1a7899885a4186dba3bf5cee46ef325c60a0e09e9102a38f5b7694bf6e02d0794cb68a226111f4813c4d61354790710340b446edca5216f3c441b01 WHIRLPOOL 14e82696dc410caedba4b56f4c0dbab11533b981b2e5d98440de47467982d14817cb697893c0eedef4095b0dffb821bf5a878db86928b1df2afb6b88065a1990
 DIST nzbget-11.0.tar.gz 694197 SHA256 27abacf6c604969dc987b7e50689caef22a65dbb1690b020b0c6d147ae123b3d SHA512 ea3d16abb1cb0b31691c9ce5493276c6e5432f72c52ad05a7fc8ed72aafd251a725d4c87454430243cea6d79d1bd19fdfad8699727a7bd44917ad1d7bf75e323 WHIRLPOOL 5fec598b9c4441873b8d220454fb911c99e0a52a3ab45220583bced347918175cdc7a348fbddd85b2514798d4aa711941932d2fcb0df3cb9f59355070ecc5be7
 DIST nzbget-12.0-testing-r789.tar.gz 741981 SHA256 230e3fcfc882b05e45a230194781142d6edc7bfa83e6d450326aed1ac932d240 SHA512 30fa4a29a678b75db6a2c211f3d171444e0425cc4ff35cb4414443fb9d0eb1ddd5462d232e0a56739b06b974a600c3268a82c91411b7a2111c46693249443af4 WHIRLPOOL 5d0e97f9b5d31e29b394b7e5923a6efec5142177294b66385dcdc4a5294d303d182ee8eb7ce37afc07aeb527778a96f8e058d5ae2ab9df443a36c722bf1c3fc2
+DIST nzbget-12.0-testing-r808.tar.gz 1074655 SHA256 7ca3eee0d19582e6fd778e0855f3171a91ff2be877ae7f5e4a2ab5717b2a4a33 SHA512 b01433ae9ccfa62c547ed5a1a7656801ebe8ceaa5ad56e4101decbb0d19e1aef61aaf3784a3b4e0269c6210d745a4b20a5daa60167f9c3943a56cab59a86ab23 WHIRLPOOL d81cae3930207fde00a39c3e37dc69417066ab1356dc4ab3a92bfa45af5b064a6a2f7100b03aa08f716291c4d1189e519a9d6b5cc704a7695db73790c5caf493
 DIST nzbget-9.1.tar.gz 658935 SHA256 0cd20e1c78359c720862c19c5fd908dc10d6b54658441b86f9caaa71f66e5633 SHA512 902cb2a261d551dad238d7d4751cd47a559e80bf40a63bfd28e2701324f7d29df976e00001606ba850cc7d9a45e1ccb1f03240b08aa2acac0e0490b8324c75b8 WHIRLPOOL 47e8ade8beef8ea4159a9606c7b805a5708ee93a07e4077111f9c56e47f14e116839b5fab62d721801a492b3749ff170f820581327126cbcc302e94d02c5cd98
diff --git a/net-nntp/nzbget/nzbget-12.0_pre808.ebuild b/net-nntp/nzbget/nzbget-12.0_pre808.ebuild
new file mode 100644
index 000000000000..abeac030a443
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-12.0_pre808.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-12.0_pre808.ebuild,v 1.1 2013/09/05 23:21:58 radhermit Exp $
+
+EAPI=5
+
+inherit autotools user
+
+MY_P=${P/_pre/-testing-r}
+
+DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files"
+HOMEPAGE="http://nzbget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gnutls ncurses parcheck ssl zlib "
+
+RDEPEND="dev-libs/libxml2
+	ncurses? ( sys-libs/ncurses )
+	parcheck? (
+		app-arch/libpar2
+		dev-libs/libsigc++:2
+	)
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README nzbget.conf )
+
+S=${WORKDIR}/${P/_pre*/-testing}
+
+src_prepare() {
+	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
+
+	sed -e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
+		-e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
+		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
+		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
+
+	sed -i "/^dist_doc_DATA/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable ncurses curses) \
+		$(use_enable parcheck) \
+		--disable-libpar2-bugfixes-check \
+		$(use_enable ssl tls) \
+		$(use_enable zlib gzip) \
+		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
+}
+
+src_install() {
+	default
+
+	# remove unneeded service script
+	rm "${D}"/usr/sbin/nzbgetd || die
+
+	insinto /etc
+	doins nzbget.conf
+	doins nzbgetd.conf
+
+	# remove duplicate script/config
+	rm "${D}"/usr/share/nzbget/nzbget.conf || die
+
+	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
+	keepdir /var/log/nzbget
+
+	newinitd "${FILESDIR}"/nzbget.initd nzbget
+	newconfd "${FILESDIR}"/nzbget.confd nzbget
+}
+
+pkg_preinst() {
+	enewgroup nzbget
+	enewuser nzbget -1 -1 /var/lib/nzbget nzbget
+
+	fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
+	fperms 750 /var/lib/nzbget/{queue,tmp}
+	fperms 770 /var/lib/nzbget/{dst,nzb}
+
+	fowners nzbget:nzbget /var/log/nzbget
+	fperms 750 /var/log/nzbget
+
+	fowners root:nzbget /etc/nzbgetd.conf
+	fperms 640 /etc/nzbgetd.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "Please add users that you want to be able to use the system-wide"
+		elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
+		elog "with the --configfile /etc/nzbgetd.conf option."
+		elog
+	fi
+}
diff --git a/net-p2p/deluge/deluge-1.3.6.ebuild b/net-p2p/deluge/deluge-1.3.6.ebuild
index df65cb7d3330..833457e0971a 100644
--- a/net-p2p/deluge/deluge-1.3.6.ebuild
+++ b/net-p2p/deluge/deluge-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.6.ebuild,v 1.4 2013/08/03 09:45:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.3.6.ebuild,v 1.5 2013/09/05 17:47:28 ago Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -13,7 +13,7 @@ SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="geoip gtk libnotify setproctitle sound webinterface"
 
 DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 4c7467612865..62111022b0da 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,4 +1,4 @@
 DIST mldonkey-3.0.5.tar.bz2 2780580 SHA256 de578283350e084e14db8b45871413c491c1cdff1095ae47929f79f093bf0ded
-DIST mldonkey-3.0.7.tar.bz2 2799555 SHA256 5630c399d492a4d48e7a90461956f833f3ba02c334a1d3d748d547994e77acd4
-DIST mldonkey-3.1.0.tar.bz2 2820081 SHA256 fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308
+DIST mldonkey-3.0.7.tar.bz2 2799555 SHA256 5630c399d492a4d48e7a90461956f833f3ba02c334a1d3d748d547994e77acd4 SHA512 b179de4a0bff9c677535c4789e3866d35151280d8981c8f0c26c6c6d2b35d9fc9d7f2ed68c9f6aaefc7a1dc42018bf676e048cb59a570067e930de310b6f5462 WHIRLPOOL a692cd6ea2191f1e51c2e3d4d5bd4df251903f34069e4567b66c68ed675b3abc9d667a5c50cdc960f888470e90d3dd2d079391be04af3b683c3d4c3c7c93b6fa
+DIST mldonkey-3.1.0.tar.bz2 2820081 SHA256 fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308 SHA512 f3ea7ed487532f01d9ecb74a433845e712c23c3194235521c89cc52cd4d44dc030c57fafeffdfaa0a31852886709637017a9255fa9d693d223b44d0e5402fc2c WHIRLPOOL 85df274a9597ad1541a8bc80bd0f7c7f8320c0d1d86c1de722702ed6526d65e342ad21944eecb5b24991df8cd1f4b94e0dca4019a2e087d05c40fe3675fc5d3c
 DIST mldonkey-3.1.3.tar.bz2 2848964 SHA256 7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2 SHA512 921e428743934cd7a94fcdb8fea43a5a57cc3232a68fff443dbeb7f724fbe6805c38f4ae8c6e58c552e7a42c49f1c233f622239d6c7ee1ccf920bc19b2aef8f9 WHIRLPOOL 3e544fa8000e27d16a34af19969a8830f6c22de9ec21e4da2310ca4674a009e64b3bb03b530a03bf2d4cd71346f6de13288bae4b1b04ec0dc9df92f79835afdc
diff --git a/net-p2p/mldonkey/mldonkey-3.1.3.ebuild b/net-p2p/mldonkey/mldonkey-3.1.3.ebuild
index 3ea1f7dbc428..d429eeb9d08f 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.1.3.ebuild,v 1.2 2013/04/11 08:49:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.1.3.ebuild,v 1.4 2013/09/05 17:47:21 ago Exp $
 
 EAPI="2"
 WANT_AUTOCONF=2.5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="dev-lang/perl
 	guionly? ( >=gnome-base/librsvg-2.4.0
diff --git a/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild b/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild
index 936816b45ab2..af7093d41d98 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild,v 1.1 2013/07/31 15:33:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild,v 1.2 2013/09/05 19:44:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit python-r1 qt4-r2
 
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 4cac71e89418..933a38cb13ea 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.9 2013/07/31 15:33:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.10 2013/09/05 19:44:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 EGIT_REPO_URI="git://github.com/${PN}/qBittorrent.git
 https://github.com/${PN}/qBittorrent.git"
diff --git a/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.1.ebuild b/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.1.ebuild
index 7c435b400063..3558a38f44b6 100644
--- a/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.1.ebuild
+++ b/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.1.ebuild,v 1.1 2013/07/28 19:10:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.1.ebuild,v 1.2 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses"
 inherit bash-completion-r1 python-r1
 
diff --git a/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2-r1.ebuild b/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2-r1.ebuild
index c5bd46977ea3..d3e4d2406f17 100644
--- a/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2-r1.ebuild
+++ b/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2-r1.ebuild,v 1.1 2013/08/22 13:55:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2-r1.ebuild,v 1.2 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses"
 inherit bash-completion-r1 python-r1
 
diff --git a/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2.ebuild b/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2.ebuild
index c55d4431fff2..d1deeddf25ac 100644
--- a/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2.ebuild
+++ b/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2.ebuild,v 1.1 2013/08/10 10:31:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission-remote-cli/transmission-remote-cli-1.6.2.ebuild,v 1.2 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ncurses"
 inherit bash-completion-r1 python-r1
 
diff --git a/net-print/cups/cups-1.6.3-r2.ebuild b/net-print/cups/cups-1.6.3-r2.ebuild
index 533b863b8219..6314ea9c5ff4 100644
--- a/net-print/cups/cups-1.6.3-r2.ebuild
+++ b/net-print/cups/cups-1.6.3-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.3-r2.ebuild,v 1.2 2013/08/14 11:46:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.3-r2.ebuild,v 1.3 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
 	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
diff --git a/net-print/cups/cups-1.6.9999.ebuild b/net-print/cups/cups-1.6.9999.ebuild
index b4912660b757..ed553674b515 100644
--- a/net-print/cups/cups-1.6.9999.ebuild
+++ b/net-print/cups/cups-1.6.9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.9999.ebuild,v 1.5 2013/08/14 11:46:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.9999.ebuild,v 1.6 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
 	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
diff --git a/net-print/cups/cups-1.7_rc1.ebuild b/net-print/cups/cups-1.7_rc1.ebuild
index 8f475db98ddf..7ca380929f27 100644
--- a/net-print/cups/cups-1.7_rc1.ebuild
+++ b/net-print/cups/cups-1.7_rc1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7_rc1.ebuild,v 1.3 2013/07/25 22:14:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7_rc1.ebuild,v 1.4 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
 	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index da2e67ffb02c..89174a1df2a5 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.42 2013/08/14 11:46:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.43 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
 	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index 2d7c031336eb..6df655195a9d 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -1,3 +1,2 @@
-DIST foomatic-db-engine-4.0.7.tar.gz 354069 SHA256 fc0712f23d9d70fa02295ac5ac3aad0f8e2b7bd15020d44b83c40f295ab6fe9c SHA512 272ced01d0bef9aaa3d9d354f68cf23e1bb0b7318d4fbb9338b9e44568bccbff1c3203364d6d8c6913efa7c2adbc66d73bcab157a571cdffc31910127bcf1ec3 WHIRLPOOL 6abfaaefbb646475ebba034a60cd008b321a6429b4b9b90c489c6ed1c6d0e0b83da07e5257d4226cd45e1ec825a198ddacd774984d4d924cd7c664a53eb81935
 DIST foomatic-db-engine-4.0.8.tar.gz 354578 SHA256 f0c4892ae5566ea2efaae8bd58352fd32001d112f2f9dfff63f7de03b46733e1 SHA512 8330f6a061c9a083d03668001aa966d6c280ef0479d1b9c01d3d7c9210edf12bc9101408193e598738cdc0431dbf6e286b4cf3cc21c2f7a535335dbcbfceea1a WHIRLPOOL f3ac0635a07c702d70e6c53e562e218b4b0314c239e35fd47a5a17b06fba206c3bddda56a90d4c3be5670c226fb077ac1755211281501154d1cebd4497c7a9f5
 DIST foomatic-db-engine-4.0.9.tar.gz 360242 SHA256 7c9ef1c8e934de1b0e37104570d6b1ff8ea349f3ed6d965397b7c94449122f44 SHA512 37e192ba5eccedf653684781c503ca0a2eed5f111799ff07a3dd419dd3049f2ae9a7ee21e921a79732cc178ae52c69f25ffac2f5761665871fec520d7b64f2e8 WHIRLPOOL ea9869ae07040e23022fb06746953300d15390101b8fd6d7af7768f656d0082180abae3847d841d54309e898fd0282e81d00f0946cfeafe423741fd5648ade11
diff --git a/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch b/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch
deleted file mode 100644
index 4f3c81fad19b..000000000000
--- a/net-print/foomatic-db-engine/files/4.0.3-perl-module.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 3014185..81e090d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -42,7 +42,7 @@ LOCAL_LIBDIR=@LOCAL_LIBDIR@
- FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # foomatic-rip path for a "make inplace" installation
--LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
-+LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # Locations for installing the components of this package
- BINDIR=$(bindir)
-@@ -186,10 +186,10 @@ check-config:
- install-bin: check-config lib/Makefile
- #	This is the only way to get the Perl-generated Makefile using
- #	$(DESTDIR) properly
--	( cd lib && \
--	  $(MAKE) PREFIX=$(PERLPREFIX) && \
--	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
--	)
-+#	( cd lib && \
-+#	  $(MAKE) PREFIX=$(PERLPREFIX) && \
-+#	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
-+#	)
- 	${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
- 	${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)
- 	${SRC}/mkinstalldirs $(DESTDIR)$(ETCDIR)
diff --git a/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch b/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch
deleted file mode 100644
index ca23d33543ba..000000000000
--- a/net-print/foomatic-db-engine/files/4.0.3-respect-ldflag.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- foomatic-db-engine-4.0.2/Makefile.in.orig	2009-07-23 11:45:28.487999828 +0200
-+++ foomatic-db-engine-4.0.2/Makefile.in	2009-07-23 11:45:53.939525006 +0200
-@@ -230,10 +230,10 @@
- 	( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) )
- 
- foomatic-combo-xml: foomatic-combo-xml.c
--	$(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
- 
- foomatic-perl-data: foomatic-perl-data.c
--	$(CC) $(CFLAGS) $(XML_CFLAGS) $(XML_LIBS) -o foomatic-perl-data foomatic-perl-data.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_CFLAGS) $(XML_LIBS)
- 
- man: lib/Foomatic/Defaults.pm
- 	chmod a+rx ./makeMan
diff --git a/net-print/foomatic-db-engine/files/perl-module-3.0.1.diff b/net-print/foomatic-db-engine/files/perl-module-3.0.1.diff
deleted file mode 100644
index 3922addf0c9c..000000000000
--- a/net-print/foomatic-db-engine/files/perl-module-3.0.1.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN Makefile.in.1 Makefile.in
---- Makefile.in.1	2002-07-19 16:18:47.000000000 -0500
-+++ Makefile.in	2002-10-17 13:58:09.000000000 -0500
-@@ -182,10 +182,10 @@
- install-bin: check-config lib/Makefile
- #	This is the only way to get the Perl-generated Makefile using
- #	$(DESTDIR) properly
--	( cd lib && \
--	  $(MAKE) PREFIX=$(PERLPREFIX) && \
--	  $(MAKE) PREFIX=$(PERLPREFIX) pure_install \
--	)
-+#	( cd lib && \
-+#	  $(MAKE) PREFIX=$(PERLPREFIX) && \
-+#	  $(MAKE) PREFIX=$(PERLPREFIX) pure_install \
-+#	)
-	${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
-	${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)
-	${SRC}/mkinstalldirs $(DESTDIR)$(ETCDIR)
-diff -Naur Makefile.in.1 Makefile.in
---- Makefile.in.1	2003-07-11 16:00:57.000000000 +0200
-+++ Makefile.in	2003-07-11 16:01:02.000000000 +0200
-@@ -40,7 +40,7 @@
- FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # foomatic-rip path for a "make inplace" installation
--LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
-+LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # Locations for installing the components of this package
- BINDIR=$(bindir)
diff --git a/net-print/foomatic-db-engine/files/perl-module-3.0.20070508.diff b/net-print/foomatic-db-engine/files/perl-module-3.0.20070508.diff
deleted file mode 100644
index 5b85e0de4998..000000000000
--- a/net-print/foomatic-db-engine/files/perl-module-3.0.20070508.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN foomatic-db-engine-3.0-20070508.orig/Makefile.in foomatic-db-engine-3.0-20070508/Makefile.in
---- foomatic-db-engine-3.0-20070508.orig/Makefile.in	2007-05-08 09:20:05.000000000 +0200
-+++ foomatic-db-engine-3.0-20070508/Makefile.in	2007-05-08 11:21:23.000000000 +0200
-@@ -42,7 +42,7 @@
- FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # foomatic-rip path for a "make inplace" installation
--LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
-+LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
- 
- # Locations for installing the components of this package
- BINDIR=$(bindir)
-@@ -186,10 +186,10 @@
- install-bin: check-config lib/Makefile
- #	This is the only way to get the Perl-generated Makefile using
- #	$(DESTDIR) properly
--	( cd lib && \
--	  $(MAKE) PREFIX=$(PERLPREFIX) && \
--	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
--	)
-+#	( cd lib && \
-+#	  $(MAKE) PREFIX=$(PERLPREFIX) && \
-+#	  $(MAKE) PREFIX=$(DESTDIR)$(PERLPREFIX) pure_install \
-+#	)
- 	${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
- 	${SRC}/mkinstalldirs $(DESTDIR)$(SBINDIR)
- 	${SRC}/mkinstalldirs $(DESTDIR)$(ETCDIR)
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild
deleted file mode 100644
index 5f511cfc015a..000000000000
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-4.0.7.ebuild,v 1.9 2013/08/08 15:09:49 mrueg Exp $
-
-EAPI="2"
-
-inherit eutils perl-app versionator
-
-DESCRIPTION="Generates ppds out of xml foomatic printer description files"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.linuxprinting.org/download/foomatic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="
-	dev-libs/libxml2
-	net-print/foomatic-filters"
-PDEPEND="net-print/foomatic-db"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-perl-module.patch \
-		"${FILESDIR}"/${PV}-respect-ldflag.patch
-	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" "${S}"/Makefile.in
-}
-
-src_configure() {
-	default
-	emake defaults || die "emake defaults failed"
-
-	cd lib
-	perl-app_src_configure
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	cd lib
-	perl-app_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	cd lib
-	perl-module_src_install
-}
-
-src_test() {
-	cd lib
-	perl-module_src_test
-}
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 6b63b759a977..37dcb3e7fac3 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -1,4 +1,2 @@
-DIST foomatic-db-4.0-20110506.tar.gz 30112960 SHA256 7d4c3c8a9ad5c7b440d923651cda9e277605e1fc4924287c0f6baa7a260caaf4 SHA512 f01db31e7a3561133860d15db9a1c4331ce7cea9a2132167a3ce5374547d75344adff6b0618a49ce6593b7ec388c490e52a8e2e722125210955694bc044a3d12 WHIRLPOOL 1ba903e98c4a962336a70cb088e9b1655b7daa0b4498d1a6dba8c999b3f4737629b9c9d9990b6887b512898ae51a3107f5abbb8c39a268927e5b0f9473759c7b
-DIST foomatic-db-4.0-20120117.tar.gz 30534575 SHA256 e89cf2346b7c977f45a94c8a2f096b68a6d06489939f0f42f129b9e74632332c
 DIST foomatic-db-4.0-20120831.tar.gz 33445618 SHA256 b07a29ee8a260f01b4ddcf40504e351cf0571cf4b8e638fca3e1feeae8128dde SHA512 cf7662496b2f5fa77b78b8cdd40536c1a05baca9920d549f04f9deb44ebc510d92ae9b07e99ac3c322094817d8b85f0fcb6dd1737ca0bdf2a5e4d4baff1e328b WHIRLPOOL 02ce93560efb091a292ed6bbe2ac793c78ceb4b8bf3a24966e6a7018867c62fbab67e125a44c3932b4616653d1a56554a5db9c8d01568d721f617eef9d6fa13c
 DIST foomatic-db-4.0-20130805.tar.gz 34813471 SHA256 b28c5450e11f92f52b22a4dc16139f927cf3a8769ad6f002ab91fd7df1959a04 SHA512 19a669db652d180f409574450144797261a794d7d90755f29fb1c178f0c7be977f46f289e622b941c6e74e9c9911523e18a22075868bf2d746e0637b674ecede WHIRLPOOL 14444f8500dc4b24ede0e4b7a614a12864400aabcfb9f2f5657cf6224967c8db9291b120bff94debf97fb71177922a3a48e16664b40ed8309dbdd1f305368939
diff --git a/net-print/foomatic-db-ppds/files/Makefile.in-20070508.patch b/net-print/foomatic-db-ppds/files/Makefile.in-20070508.patch
deleted file mode 100644
index 3f2950f4aa55..000000000000
--- a/net-print/foomatic-db-ppds/files/Makefile.in-20070508.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN foomatic-db-20070508.orig/Makefile.in foomatic-db-20070508/Makefile.in
---- foomatic-db-20070508.orig/Makefile.in	2007-05-08 09:22:03.000000000 +0200
-+++ foomatic-db-20070508/Makefile.in	2007-05-08 13:08:48.000000000 +0200
-@@ -65,13 +65,13 @@
- 	install -d $(DESTDIR)$(LIBDIR)/db/source/driver
- 	install -d $(DESTDIR)$(LIBDIR)/db/source/opt
- 	install -d $(DESTDIR)$(LIBDIR)/db/source/PPD
--	cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db
--	cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer
--	( cd db/source/driver/; \
--	  for d in $(DRIVERXMLS); do \
--	    cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \
--	  done )
--	cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt
-+#	cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db
-+#	cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer
-+#	( cd db/source/driver/; \
-+#	  for d in $(DRIVERXMLS); do \
-+#	    cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \
-+#	  done )
-+#	cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt
- 	( cd db/source && tar cf - --exclude=.svn PPD ) | \
- 	  ( cd $(DESTDIR)$(LIBDIR)/db/source && tar xf -)
- 	if test $(GZIP) != GZIP_NOT_FOUND -a $(GZIP_PPDS) != no ; then \
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20110506.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20110506.ebuild
deleted file mode 100644
index d9a360f14271..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20110506.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20110506.ebuild,v 1.8 2012/03/25 14:59:08 armin76 Exp $
-
-EAPI=4
-
-inherit eutils versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="linuxprinting.org PPD files for postscript printers"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${MY_P}.tar.gz
-	http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-20070508.patch"
-}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117-r1.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117-r1.ebuild
deleted file mode 100644
index 14dfee6f8eb4..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20120117-r1.ebuild,v 1.1 2012/02/07 15:26:25 dilfridge Exp $
-
-EAPI=4
-
-inherit eutils versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="linuxprinting.org PPD files for postscript printers"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${MY_P}.tar.gz
-	http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-${PV}.patch"
-}
-
-src_install() {
-	default
-	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
-}
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index a2ac09f50dc5..37dcb3e7fac3 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,5 +1,2 @@
-DIST foomatic-db-3.0-20060720.tar.gz 12345043 SHA256 28ff1433b9719595caf3f722db166ab8e0e2e6c57184762541dab564bc5bc295 SHA512 b0c04f3d2a708b7d5e135e11cf58828198347390b0fbf5948af5b199164a5dc68faf1127ece4b5a1d1a4b82d9eb3976792056d96921335bfde64a4035a14cc19 WHIRLPOOL 089051fb8fd78c68fe25380d9b18e3e07b38c49b1c76a032f2643a6187eb81922ce8bd7dc436e9dd3b904da21a3ac9f0072f2b75cf10ce1a2a8a84a872306af4
-DIST foomatic-db-4.0-20110506.tar.gz 30112960 SHA256 7d4c3c8a9ad5c7b440d923651cda9e277605e1fc4924287c0f6baa7a260caaf4 SHA512 f01db31e7a3561133860d15db9a1c4331ce7cea9a2132167a3ce5374547d75344adff6b0618a49ce6593b7ec388c490e52a8e2e722125210955694bc044a3d12 WHIRLPOOL 1ba903e98c4a962336a70cb088e9b1655b7daa0b4498d1a6dba8c999b3f4737629b9c9d9990b6887b512898ae51a3107f5abbb8c39a268927e5b0f9473759c7b
-DIST foomatic-db-4.0-20120117.tar.gz 30534575 SHA256 e89cf2346b7c977f45a94c8a2f096b68a6d06489939f0f42f129b9e74632332c SHA512 741322dad2b0cab5c1934c0f29e423a4ecf4e39c9e8634cb4a7021e109aedbedc63f769c28e756ec7cd2c95ce161d94e39356464293542fb71515442f91e80ef WHIRLPOOL 201ad5dfea544b5969d317eb91e6d4b37d35cc3dd622ef5dcfe915e6bd6a911d416082e9b4ae8c5400ca456dd4332277f01e2a7dad068fe9d8aae56aa7881f4a
 DIST foomatic-db-4.0-20120831.tar.gz 33445618 SHA256 b07a29ee8a260f01b4ddcf40504e351cf0571cf4b8e638fca3e1feeae8128dde SHA512 cf7662496b2f5fa77b78b8cdd40536c1a05baca9920d549f04f9deb44ebc510d92ae9b07e99ac3c322094817d8b85f0fcb6dd1737ca0bdf2a5e4d4baff1e328b WHIRLPOOL 02ce93560efb091a292ed6bbe2ac793c78ceb4b8bf3a24966e6a7018867c62fbab67e125a44c3932b4616653d1a56554a5db9c8d01568d721f617eef9d6fa13c
 DIST foomatic-db-4.0-20130805.tar.gz 34813471 SHA256 b28c5450e11f92f52b22a4dc16139f927cf3a8769ad6f002ab91fd7df1959a04 SHA512 19a669db652d180f409574450144797261a794d7d90755f29fb1c178f0c7be977f46f289e622b941c6e74e9c9911523e18a22075868bf2d746e0637b674ecede WHIRLPOOL 14444f8500dc4b24ede0e4b7a614a12864400aabcfb9f2f5657cf6224967c8db9291b120bff94debf97fb71177922a3a48e16664b40ed8309dbdd1f305368939
diff --git a/net-print/foomatic-db/foomatic-db-3.0.20060720.ebuild b/net-print/foomatic-db/foomatic-db-3.0.20060720.ebuild
deleted file mode 100644
index c3540f35f346..000000000000
--- a/net-print/foomatic-db/foomatic-db-3.0.20060720.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-3.0.20060720.ebuild,v 1.2 2011/05/06 16:11:32 jlec Exp $
-
-inherit versionator
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${MY_P}.tar.gz
-	http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="net-print/foomatic-db-engine"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_compile() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-	# ppd files do not belong to this package
-	rm -r db/source/PPD
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README TODO USAGE
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20110506.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20110506.ebuild
deleted file mode 100644
index 08c0d41be8f9..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20110506.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-4.0.20110506.ebuild,v 1.8 2012/03/03 14:46:46 ranger Exp $
-
-EAPI=4
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r "${S}"/db/source/PPD
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild
deleted file mode 100644
index a5763fc09016..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db/foomatic-db-4.0.20120117.ebuild,v 1.1 2012/01/17 13:33:39 jlec Exp $
-
-EAPI=4
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r "${S}"/db/source/PPD
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}
-}
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
index 54dd2d53d195..a6db881ecb20 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild,v 1.11 2013/08/03 09:45:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild,v 1.12 2013/09/05 19:02:50 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit eutils python-any-r1
 
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild
index 0dcfeace0212..08d76d4a4607 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild,v 1.8 2013/08/03 09:45:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild,v 1.9 2013/09/05 19:02:50 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit eutils python-any-r1
 
diff --git a/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild b/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild
index 49a7274d2095..d582bee74cef 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild,v 1.1 2013/04/21 11:39:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild,v 1.2 2013/09/05 19:02:49 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit eutils python-single-r1
 
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
index 7d4c9e8ea891..b4a9097270c4 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild,v 1.12 2013/05/10 22:08:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-salut/telepathy-salut-0.8.1.ebuild,v 1.13 2013/09/05 19:02:50 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit eutils python-any-r1
 
diff --git a/net-zope/zope-fixers/zope-fixers-1.0-r1.ebuild b/net-zope/zope-fixers/zope-fixers-1.0-r1.ebuild
index 481aaf49ea76..1f6329ed270b 100644
--- a/net-zope/zope-fixers/zope-fixers-1.0-r1.ebuild
+++ b/net-zope/zope-fixers/zope-fixers-1.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/zope-fixers-1.0-r1.ebuild,v 1.1 2013/02/11 21:27:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/zope-fixers-1.0-r1.ebuild,v 1.2 2013/09/05 19:44:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild b/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild
index b529c7972843..09f9b130bb9d 100644
--- a/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild
+++ b/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild,v 1.2 2013/08/30 20:24:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild,v 1.3 2013/09/05 19:44:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/net-zope/zope-interface/zope-interface-4.0.5.ebuild b/net-zope/zope-interface/zope-interface-4.0.5.ebuild
index 26405a9cc39b..dd56ddcac093 100644
--- a/net-zope/zope-interface/zope-interface-4.0.5.ebuild
+++ b/net-zope/zope-interface/zope-interface-4.0.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-interface/zope-interface-4.0.5.ebuild,v 1.3 2013/08/19 12:03:26 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-interface/zope-interface-4.0.5.ebuild,v 1.4 2013/09/05 19:44:48 mgorny Exp $
 
 EAPI=5
 
 # Tests fail with py3.1
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/profiles/package.mask b/profiles/package.mask
index e8549e6e8919..33be0abcb587 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
 ####################################################################
 
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15086 2013/09/05 10:09:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15087 2013/09/05 13:36:41 mrueg 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
@@ -569,10 +569,6 @@ dev-ml/ocamlduce
 # Mask development releases
 =media-sound/lilypond-2.17*
 
-# Benedikt Böhm <hollow@gentoo.org> (11 Aug 2012)
-# Regression in iproute code, does not detect IP addresses correctly anymore.
-~dev-ruby/ohai-6.14.0
-
 # Jeroen Roovers <jer@gentoo.org> (2 Aug 2012)
 # Development version
 >app-admin/sysstat-10.1
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index 1ebbc9c40b07..e4329c3548cd 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.mask,v 1.117 2013/05/07 06:48:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.mask,v 1.118 2013/09/05 18:09:57 mgorny 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.  This file is for
@@ -72,14 +72,6 @@ www-apps/trac
 # many people are affected: uClibc, BSD, ...)
 =sys-fs/e2fsprogs-1.41.14
 
-# Jeremy Olexa <darkside@gentoo.org> (21 Aug 2009)
-# python-3 will most certainly cause problems if it ever gets unleashed without
-# a look over from a prefix dev. (not me) ;)
-# Additionally mask packages requiring it
-dev-lang/python:3.0
-dev-lang/python:3.1
-=dev-python/beautifulsoup-3.1.0.1-r1
-
 # Jeremy Olexa <darkside@gentoo.org> (30 Jun 2009)
 # The PAM auth system just will not work in Gentoo Prefix, instead the host auth
 # system should be used.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7cb27bb841c6..a58d23a50925 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5881,9 +5881,7 @@ sys-apps/paludis:python-bindings - Enable Python bindings. Requires a lot of RAM
 sys-apps/paludis:ruby-bindings - Enable Ruby bindings.
 sys-apps/paludis:search-index - Enable cave search --index. Requires sqlite.
 sys-apps/paludis:visibility - Enable visibility support (g++ >=4.1)
-sys-apps/pciutils:compress-db - Compress pci.ids database by default
 sys-apps/pciutils:kmod - Enable sys-apps/kmod support for the -k switch in lspci command
-sys-apps/pciutils:network-cron - Monthly cronjob the update-pciids script
 sys-apps/pciutils:zlib - Support compressed pci.ids database
 sys-apps/pcmciautils:staticsocket - Add support for static sockets
 sys-apps/pcsc-lite:libusb - Use dev-libs/libusb detection to hotplug new smartcard readers. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use sys-fs/udev.
@@ -6006,6 +6004,9 @@ sys-cluster/charm:charmproduction - Optimize performance of Charm++ runtime
 sys-cluster/charm:charmtracing - Enable tracing support in Charm++
 sys-cluster/charm:cmkopt - Enable CMK optimisation
 sys-cluster/charm:tcp - Use TCP (instead of UPD) for socket communication
+sys-cluster/cinder:api - Installs the initscripts for the cinder api service
+sys-cluster/cinder:scheduler - Installs the initscripts for the cinder scheduler service
+sys-cluster/cinder:volume - Installs the initscripts for the cinder volume service
 sys-cluster/cluster-glue:large-cluster - Extend messages length limits for resource heavy clusters
 sys-cluster/cluster-glue:libnet - Force use of net-libs/libnet
 sys-cluster/corosync:infiniband - Enable Infiniband RDMA transport support
@@ -6032,6 +6033,21 @@ sys-cluster/mpich2:romio - Enable romio, a high-performance portable MPI-IO impl
 sys-cluster/mvapich2:large-cluster - Automatically generated description for large-cluster
 sys-cluster/mvapich2:medium-cluster - Automatically generated description for medium-cluster
 sys-cluster/mvapich2:romio - Automatically generated description for romio
+sys-cluster/neutron:dhcp - Installs the initscripts for the neutron dhcp service
+sys-cluster/neutron:l3 - Installs the initscripts for the neutron l3 service
+sys-cluster/neutron:metadata - Installs the initscripts for the neutron metadata service
+sys-cluster/neutron:openvswitch - Installs the initscripts for the neutron openvswitch service
+sys-cluster/neutron:server - Installs the initscripts for the neutron server service
+sys-cluster/nova:api - Installs the initscripts for the nova api service
+sys-cluster/nova:cert - Installs the initscripts for the nova scheduler service
+sys-cluster/nova:compute - Installs the initscripts for the nova volume service
+sys-cluster/nova:conductor - Installs the initscripts for the nova conductor service
+sys-cluster/nova:consoleauth - Installs the initscripts for the nova consoleauth service
+sys-cluster/nova:network - Installs the initscripts for the nova network service
+sys-cluster/nova:novncproxy - Installs the initscripts for the nova novncproxy service
+sys-cluster/nova:scheduler - Installs the initscripts for the nova scheduler service
+sys-cluster/nova:spicehtml5proxy - Installs the initscripts for the nova spicehtml5proxy service
+sys-cluster/nova:xvpvncproxy - Installs the initscripts for the nova xvpvncproxy service
 sys-cluster/ocfs:aio - Add aio support
 sys-cluster/openmpi:heterogeneous - Enable features required for heterogeneous platform support
 sys-cluster/openmpi:mpi-threads - Enable MPI_THREAD_MULTIPLE
@@ -6261,6 +6277,7 @@ sys-kernel/genkernel-next:gpg - Enable support for GPG (include gnupg dependency
 sys-kernel/genkernel-next:iscsi - Enable support for open-iscsi (include open-iscsi dependency)
 sys-kernel/genkernel-next:plymouth - Enable support for Plymouth (include Plymouth dependency)
 sys-kernel/gentoo-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
+sys-kernel/gentoo-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
 sys-kernel/hardened-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
 sys-kernel/linux-docs:html - Install HTML documentation
 sys-kernel/linux-firmware:savedconfig - Allows individual selection of firmware files
diff --git a/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild b/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
index 657b83109f9b..56ce8d83ccc7 100644
--- a/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild,v 1.5 2013/06/12 16:29:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/pyephem/pyephem-3.7.5.1.ebuild,v 1.6 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 
 inherit distutils-r1
 
diff --git a/sci-biology/shrimp/shrimp-2.2.3.ebuild b/sci-biology/shrimp/shrimp-2.2.3.ebuild
index 82ebc0b2e464..85b72f77eb79 100644
--- a/sci-biology/shrimp/shrimp-2.2.3.ebuild
+++ b/sci-biology/shrimp/shrimp-2.2.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.2.3.ebuild,v 1.6 2013/05/29 16:09:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.2.3.ebuild,v 1.7 2013/09/05 19:44:46 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit flag-o-matic python-single-r1 toolchain-funcs
 
diff --git a/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild b/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
index a1cac6a2931c..a61b91a56051 100644
--- a/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
+++ b/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild,v 1.2 2013/05/29 16:09:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-2.1.1.ebuild,v 1.3 2013/09/05 19:44:48 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=true
 AUTOTOOLS_AUTORECONF=true
 
diff --git a/sci-chemistry/ball/ball-1.4.1-r1.ebuild b/sci-chemistry/ball/ball-1.4.1-r1.ebuild
index 93d12f1bbc68..c6eaa4f0bb2f 100644
--- a/sci-chemistry/ball/ball-1.4.1-r1.ebuild
+++ b/sci-chemistry/ball/ball-1.4.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ball/ball-1.4.1-r1.ebuild,v 1.5 2013/07/17 08:37:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ball/ball-1.4.1-r1.ebuild,v 1.6 2013/09/05 19:03:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild
index 23a068d5cb54..ee9c2d362e5b 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild,v 1.3 2013/05/29 16:18:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130318-r1.ebuild,v 1.4 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p130318.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p130318.ebuild
index a57c297efe6c..dc1f50c36504 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p130318.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p130318.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130318.ebuild,v 1.2 2013/05/29 16:18:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130318.ebuild,v 1.3 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p130530.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p130530.ebuild
index 544ca0b2d7a0..c9a33d99809a 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p130530.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p130530.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130530.ebuild,v 1.1 2013/05/30 12:14:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130530.ebuild,v 1.2 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p130618.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p130618.ebuild
index 1e0390b1cfe8..4a1357abbfa5 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p130618.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p130618.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130618.ebuild,v 1.1 2013/06/18 09:51:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130618.ebuild,v 1.2 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p130705.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p130705.ebuild
index 69f99e5c0810..728e8be64ec5 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.2_p130705.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p130705.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130705.ebuild,v 1.1 2013/07/05 15:21:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p130705.ebuild,v 1.2 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1.ebuild
index 76147254c592..fa9ed94dc0db 100644
--- a/sci-chemistry/ccpn/ccpn-2.3.1.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1.ebuild,v 1.1 2013/08/08 06:51:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1.ebuild,v 1.2 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1_p130813.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1_p130813.ebuild
index accdec99608f..14bccdbe8dfb 100644
--- a/sci-chemistry/ccpn/ccpn-2.3.1_p130813.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.3.1_p130813.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p130813.ebuild,v 1.1 2013/08/13 10:27:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p130813.ebuild,v 1.2 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild
index 966df06c1a90..026e648fd537 100644
--- a/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild,v 1.1 2013/08/14 07:46:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild,v 1.2 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1_p130822.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1_p130822.ebuild
index ede875d41b9b..352803dd744f 100644
--- a/sci-chemistry/ccpn/ccpn-2.3.1_p130822.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.3.1_p130822.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p130822.ebuild,v 1.1 2013/08/22 07:39:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p130822.ebuild,v 1.2 2013/09/05 19:03:41 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="ssl,tk"
 
 inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
index 05ad455042c1..157243e531e8 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild,v 1.6 2013/07/02 14:08:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild,v 1.7 2013/09/05 19:03:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=(python2_6 python2_7 python3_1 python3_2)
+PYTHON_COMPAT=(python2_6 python2_7 python3_2)
 
 inherit cmake-utils eutils multilib python-r1
 
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
index a08bcbd7ffc1..58dd08bc3d46 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild,v 1.4 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild,v 1.5 2013/09/05 19:03:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit fortran-2 python-single-r1 toolchain-funcs
 
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
index dedc56285714..0c2c8ed74542 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild,v 1.1 2013/08/11 12:14:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild,v 1.2 2013/09/05 19:03:42 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_8,1_9} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit fortran-2 python-single-r1 toolchain-funcs
 
diff --git a/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild b/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild
index 0b29ef99af5c..93a9b14af1a6 100644
--- a/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild
+++ b/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild,v 1.2 2013/08/31 09:45:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/cirkuit/cirkuit-0.4.3.ebuild,v 1.3 2013/09/05 19:24:17 ago Exp $
 
 EAPI=5
 inherit kde4-base
@@ -11,7 +11,7 @@ SRC_URI="http://wwwu.uni-klu.ac.at/magostin/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
index 23c8ca7e63fd..3f67ea976bc6 100644
--- a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
+++ b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild,v 1.1 2013/02/09 22:24:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild,v 1.2 2013/09/05 19:04:17 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 python3_1 python3_2 python3_3 )
+PYTHON_COMPAT=( python2_6 python2_7 python3_2 python3_3 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
index 9986f23caa82..d18d3e3c0e0e 100644
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.3 2013/05/29 16:31:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qgis/qgis-1.8.0.ebuild,v 1.4 2013/09/05 19:04:17 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 PYTHON_REQ_USE="sqlite"
 
 inherit eutils multilib gnome2-utils cmake-utils python-single-r1
diff --git a/sci-geosciences/seawater/seawater-2.0.1.ebuild b/sci-geosciences/seawater/seawater-2.0.1.ebuild
index a5a7dc6ed8de..a719ba044fb4 100644
--- a/sci-geosciences/seawater/seawater-2.0.1.ebuild
+++ b/sci-geosciences/seawater/seawater-2.0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/seawater/seawater-2.0.1.ebuild,v 1.3 2013/06/25 12:57:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/seawater/seawater-2.0.1.ebuild,v 1.4 2013/09/05 19:04:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
diff --git a/sci-geosciences/seawater/seawater-3.3.1.ebuild b/sci-geosciences/seawater/seawater-3.3.1.ebuild
index 164842b7c092..a62f412b5928 100644
--- a/sci-geosciences/seawater/seawater-3.3.1.ebuild
+++ b/sci-geosciences/seawater/seawater-3.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/seawater/seawater-3.3.1.ebuild,v 1.1 2013/08/07 16:55:31 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/seawater/seawater-3.3.1.ebuild,v 1.2 2013/09/05 19:04:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
diff --git a/sci-geosciences/seawater/seawater-3.3.ebuild b/sci-geosciences/seawater/seawater-3.3.ebuild
index a7d81a11188e..1fd48ead0ff0 100644
--- a/sci-geosciences/seawater/seawater-3.3.ebuild
+++ b/sci-geosciences/seawater/seawater-3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/seawater/seawater-3.3.ebuild,v 1.1 2013/08/06 12:20:49 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/seawater/seawater-3.3.ebuild,v 1.2 2013/09/05 19:04:16 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_6 python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
diff --git a/sci-libs/bmrblib/bmrblib-1.0.0-r1.ebuild b/sci-libs/bmrblib/bmrblib-1.0.0-r1.ebuild
index ea1f3e4938cc..a04623159108 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.0-r1.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/bmrblib/bmrblib-1.0.0-r1.ebuild,v 1.1 2013/02/04 07:07:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/bmrblib/bmrblib-1.0.0-r1.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/bmrblib/bmrblib-1.0.1_pre198.ebuild b/sci-libs/bmrblib/bmrblib-1.0.1_pre198.ebuild
index 9c452ededc13..ab630fe52a31 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.1_pre198.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.1_pre198.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/bmrblib/bmrblib-1.0.1_pre198.ebuild,v 1.1 2013/02/04 07:21:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/bmrblib/bmrblib-1.0.1_pre198.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/bmrblib/bmrblib-1.0.2.ebuild b/sci-libs/bmrblib/bmrblib-1.0.2.ebuild
index 48fb42e32195..482b3cf1f842 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.2.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/bmrblib/bmrblib-1.0.2.ebuild,v 1.1 2013/05/13 07:26:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/bmrblib/bmrblib-1.0.2.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild b/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild
index 78c12aaba45e..0406ade30fb8 100644
--- a/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild
+++ b/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild,v 1.3 2013/05/29 16:34:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.2.2_p121112-r1.ebuild,v 1.4 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils portability python-r1 versionator
 
diff --git a/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild b/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild
index 72762285bccc..5b65349846d1 100644
--- a/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild
+++ b/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild,v 1.1 2013/08/08 06:48:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.3.1.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils portability python-r1 versionator
 
diff --git a/sci-libs/ccpn-data/ccpn-data-2.3.1_p130822.ebuild b/sci-libs/ccpn-data/ccpn-data-2.3.1_p130822.ebuild
index fe9244d38fed..10144f3f6ccc 100644
--- a/sci-libs/ccpn-data/ccpn-data-2.3.1_p130822.ebuild
+++ b/sci-libs/ccpn-data/ccpn-data-2.3.1_p130822.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.3.1_p130822.ebuild,v 1.1 2013/08/22 07:37:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccpn-data/ccpn-data-2.3.1_p130822.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils portability python-r1 versionator
 
diff --git a/sci-libs/deap/deap-0.9.1.ebuild b/sci-libs/deap/deap-0.9.1.ebuild
index 45be64e3630e..1609b9e2b14e 100644
--- a/sci-libs/deap/deap-0.9.1.ebuild
+++ b/sci-libs/deap/deap-0.9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/deap/deap-0.9.1.ebuild,v 1.1 2013/05/29 08:42:32 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/deap/deap-0.9.1.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/deap/deap-1.0.0_rc1.ebuild b/sci-libs/deap/deap-1.0.0_rc1.ebuild
index 357a00d0ad41..ca078b127dd1 100644
--- a/sci-libs/deap/deap-1.0.0_rc1.ebuild
+++ b/sci-libs/deap/deap-1.0.0_rc1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/deap/deap-1.0.0_rc1.ebuild,v 1.1 2013/07/08 06:59:32 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/deap/deap-1.0.0_rc1.ebuild,v 1.2 2013/09/05 19:04:44 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 versionator
 
diff --git a/sci-libs/deap/deap-1.0.0_rc2.ebuild b/sci-libs/deap/deap-1.0.0_rc2.ebuild
index 3391473cad26..627cfd6efc70 100644
--- a/sci-libs/deap/deap-1.0.0_rc2.ebuild
+++ b/sci-libs/deap/deap-1.0.0_rc2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/deap/deap-1.0.0_rc2.ebuild,v 1.1 2013/08/05 05:35:00 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/deap/deap-1.0.0_rc2.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit distutils-r1 versionator
 
diff --git a/sci-libs/minfx/minfx-1.0.3-r1.ebuild b/sci-libs/minfx/minfx-1.0.3-r1.ebuild
index 9a1333051703..e19b4e11b1a9 100644
--- a/sci-libs/minfx/minfx-1.0.3-r1.ebuild
+++ b/sci-libs/minfx/minfx-1.0.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minfx/minfx-1.0.3-r1.ebuild,v 1.1 2013/02/04 07:09:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minfx/minfx-1.0.3-r1.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.4.ebuild b/sci-libs/minfx/minfx-1.0.4.ebuild
index 6881c09a8b8f..c555ce9cb8ec 100644
--- a/sci-libs/minfx/minfx-1.0.4.ebuild
+++ b/sci-libs/minfx/minfx-1.0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minfx/minfx-1.0.4.ebuild,v 1.1 2013/05/13 06:59:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minfx/minfx-1.0.4.ebuild,v 1.2 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild b/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
index fa84d3f25173..26b010d8170c 100644
--- a/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
+++ b/sci-libs/minfx/minfx-1.0.4_pre98.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minfx/minfx-1.0.4_pre98.ebuild,v 1.2 2013/02/04 07:57:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minfx/minfx-1.0.4_pre98.ebuild,v 1.3 2013/09/05 19:04:43 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1
 
diff --git a/sci-libs/scikits/scikits-0.1-r1.ebuild b/sci-libs/scikits/scikits-0.1-r1.ebuild
index 3de53c8c82dc..d0c64f0a55ea 100644
--- a/sci-libs/scikits/scikits-0.1-r1.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits/scikits-0.1-r1.ebuild,v 1.2 2013/06/04 12:35:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits/scikits-0.1-r1.ebuild,v 1.3 2013/09/05 19:04:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 
 inherit python-r1
 
diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild b/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
index 7a5d3ad03b83..cb15d8fc1ee9 100644
--- a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
+++ b/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild,v 1.2 2013/08/12 22:24:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild,v 1.3 2013/09/05 19:04:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/sci-libs/scipy/scipy-0.12.0.ebuild b/sci-libs/scipy/scipy-0.12.0.ebuild
index 3c77391fdc07..cd2b7fdf08e0 100644
--- a/sci-libs/scipy/scipy-0.12.0.ebuild
+++ b/sci-libs/scipy/scipy-0.12.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.12.0.ebuild,v 1.4 2013/08/27 18:33:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.12.0.ebuild,v 1.5 2013/09/05 19:04:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
 
diff --git a/sci-physics/geant-python/geant-python-4.9.6_p02.ebuild b/sci-physics/geant-python/geant-python-4.9.6_p02.ebuild
index 2784d84fd15b..619bf0177e99 100644
--- a/sci-physics/geant-python/geant-python-4.9.6_p02.ebuild
+++ b/sci-physics/geant-python/geant-python-4.9.6_p02.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.6_p02.ebuild,v 1.2 2013/07/09 00:08:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.6_p02.ebuild,v 1.3 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-r1 versionator multilib eutils
 
diff --git a/sci-physics/root/root-5.34.09.ebuild b/sci-physics/root/root-5.34.09.ebuild
index a0fd253aeb97..19804959e3cb 100644
--- a/sci-physics/root/root-5.34.09.ebuild
+++ b/sci-physics/root/root-5.34.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.1 2013/06/29 10:45:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.09.ebuild,v 1.2 2013/09/05 19:44:52 mgorny Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 inherit elisp-common eutils fdo-mime fortran-2 multilib python-single-r1 toolchain-funcs user ${_GIT} versionator
 
 ROOFIT_DOC_PV=2.91-33
diff --git a/sys-apps/bleachbit/bleachbit-0.9.6.ebuild b/sys-apps/bleachbit/bleachbit-0.9.6.ebuild
index dca944197d9c..570f1e3b11d3 100644
--- a/sys-apps/bleachbit/bleachbit-0.9.6.ebuild
+++ b/sys-apps/bleachbit/bleachbit-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/bleachbit-0.9.6.ebuild,v 1.2 2013/09/04 13:25:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/bleachbit-0.9.6.ebuild,v 1.3 2013/09/05 13:10:17 pinkbyte Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="dev-python/pygtk:2[$PYTHON_USEDEP]"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 0fb4ea24b976..d6007d205bc3 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,6 +1,3 @@
-DIST busybox-1.19.3.tar.bz2 2167188 SHA256 a1a9a35732c719ef384f02b6e357c324d8be25bc154af91a48c4264b1e6038f0 SHA512 a7072c45ad395d0cd4e84427e06b35bfae93e695a0f7edc39087ff8f9cb08c53550c74446839617db4dd177530a04b2aaabf188732193a2d73eed737debf3bd3 WHIRLPOOL d436a6bd329c99a9e01e2a0dfdb1577067dd4e4288ed3de72e2d94bc6923d3a0eb4dc53f726520222285137672b0d5337c334acd4afe5e4c665cde9d1422e53c
-DIST busybox-1.20.0.tar.bz2 2190652 SHA256 3c56508d984db1178664241ad548d118fb0aa71cdd2f8a9a93038e50b3b2bf16 SHA512 77423bebddb05b241747a7949cdbc1bc0db8506f5fb8fb152ac26a62ddfe8ad7fc8fcc597a5a3940428975611796f5a5ca666df6842df1bc32c6b70b6b8241c6 WHIRLPOOL 04ee6c5d0b5c020542968fa83c7d58edbeca42f2daaf9497589fbd65be1c0bb1da23dae9b7891acbd40cbd5b5560b62f229627e0636d342982fa600f7edaee17
-DIST busybox-1.20.1.tar.bz2 2190170 SHA256 3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9 SHA512 9ad2af7216ae79c2c8cf246654a2c591983d347d22bfe4cd54ae41eaee0ea17f7bf8d6834add3f1f843494d6980707e0443aaf663075fda6e4e7e29728606c53 WHIRLPOOL 07ce28698c63a38ce2c6d71bfbfe1f920f07a76d471db9b9b1a7260ef1bf493551bae67d9b9dc2be41783f1ce0cf56935c44eb7af2a1bc865807afaa87eaabec
 DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420
 DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31 WHIRLPOOL d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3
 DIST busybox-1.21.1.tar.bz2 2201917 SHA256 cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 SHA512 b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1 WHIRLPOOL 8ec0d9c23d8e2eb28e7f8e88f076908cf6a3f7b64aabd0a7a1af2200064a5337c82fdac9450726236e0632faa202ea08396ca5c35e5334c2128a307adbdd736c
diff --git a/sys-apps/busybox/busybox-1.19.3-r1.ebuild b/sys-apps/busybox/busybox-1.19.3-r1.ebuild
deleted file mode 100644
index 3d78368508c5..000000000000
--- a/sys-apps/busybox/busybox-1.19.3-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.19.3-r1.ebuild,v 1.14 2012/05/26 00:07:11 vapier Exp $
-
-EAPI="3"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-################################################################################
-# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
-#
-# Busybox can be modified in many different ways. Here's a few ways to do it:
-#
-# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
-#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
-#     start of the line if you're installing to somewhere else than the root
-#     directory. This command will save the default configuration to
-#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
-#     defined), and it will tell you that it has done this. Note the location
-#     where the config file was saved.
-#
-#     FEATURES=keepwork USE=savedconfig emerge busybox
-#
-# (2) Go to the work directory and change the configuration of busybox using its
-#     menuconfig feature.
-#
-#     cd /var/tmp/portage/busybox*/work/busybox-*
-#     make menuconfig
-#
-# (3) Save your configuration to the default location and copy it to the
-#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
-#
-# (4) Emerge busybox with USE=savedconfig to use the configuration file you
-#     just generated.
-#
-################################################################################
-#
-# (1) Alternatively skip the above steps and simply emerge busybox without
-#     USE=savedconfig.
-#
-# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
-#
-# (3) Remerge busybox as using USE=savedconfig.
-#
-################################################################################
-
-#SNAPSHOT=20040726
-SNAPSHOT=""
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ -n ${SNAPSHOT} ]] ; then
-	MY_P=${PN}
-	SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 livecd make-symlinks mdev -pam selinux static elibc_glibc"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	case $1 in
-		y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
-		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-		*) use $1 \
-		       && busybox_config_option y $2 \
-		       || busybox_config_option n $2
-		   return 0
-		   ;;
-	esac
-	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/busybox-1.19.0-bb.patch
-	epatch "${FILESDIR}"/busybox-${PV}-*.patch
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 allyesconfig > /dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n MONOTONIC_SYSCALL
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	use static \
-		&& busybox_config_option n PAM \
-		|| busybox_config_option pam PAM
-	busybox_config_option static STATIC
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LASH LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox || die
-	if ! use static ; then
-		cp .config{,.bak}
-		mv busybox_unstripped{,.bak}
-		use pam && busybox_config_option n PAM
-		emake CONFIG_STATIC=y busybox || die
-		mv busybox_unstripped bb
-		mv busybox_unstripped{.bak,}
-		mv .config{.bak,}
-	fi
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	newbin busybox_unstripped busybox || die
-	if use static ; then
-		dosym busybox /bin/bb || die
-		dosym bb /bin/busybox.static || die
-	else
-		dobin bb || die
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/* || die
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev || die
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install || die
-	rm _install/bin/busybox
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	doins busybox-links.tar || die
-	newins .config ${PF}.config || die
-
-	dodoc AUTHORS README TODO
-
-	cd docs || die
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples || die
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-
-	cd bootfloppy || die
-	docinto bootfloppy
-	dodoc $(find . -type f)
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	elog "This ebuild has support for user defined configs"
-	elog "Please read this ebuild for more details and re-emerge as needed"
-	elog "if you want to add or remove functionality for ${PN}"
-}
diff --git a/sys-apps/busybox/busybox-1.20.0.ebuild b/sys-apps/busybox/busybox-1.20.0.ebuild
deleted file mode 100644
index 9d73ac89834f..000000000000
--- a/sys-apps/busybox/busybox-1.20.0.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.0.ebuild,v 1.5 2012/05/26 00:07:11 vapier Exp $
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-################################################################################
-# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
-#
-# Busybox can be modified in many different ways. Here's a few ways to do it:
-#
-# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
-#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
-#     start of the line if you're installing to somewhere else than the root
-#     directory. This command will save the default configuration to
-#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
-#     defined), and it will tell you that it has done this. Note the location
-#     where the config file was saved.
-#
-#     FEATURES=keepwork USE=savedconfig emerge busybox
-#
-# (2) Go to the work directory and change the configuration of busybox using its
-#     menuconfig feature.
-#
-#     cd /var/tmp/portage/busybox*/work/busybox-*
-#     make menuconfig
-#
-# (3) Save your configuration to the default location and copy it to the
-#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
-#
-# (4) Emerge busybox with USE=savedconfig to use the configuration file you
-#     just generated.
-#
-################################################################################
-#
-# (1) Alternatively skip the above steps and simply emerge busybox without
-#     USE=savedconfig.
-#
-# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
-#
-# (3) Remerge busybox as using USE=savedconfig.
-#
-################################################################################
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	case $1 in
-		y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
-		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-		*) use $1 \
-		       && busybox_config_option y $2 \
-		       || busybox_config_option n $2
-		   return 0
-		   ;;
-	esac
-	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 allyesconfig > /dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	use static \
-		&& busybox_config_option n PAM \
-		|| busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-	if ! use static ; then
-		cp .config{,.bak}
-		mv busybox_unstripped{,.bak}
-		use pam && busybox_config_option n PAM
-		emake CONFIG_STATIC=y busybox
-		mv busybox_unstripped bb
-		mv busybox_unstripped{.bak,}
-		mv .config{.bak,}
-	else
-		# keeps src_install simpler
-		ln busybox_unstripped bb
-	fi
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe bb ginit
-		dosym /ginit /bin/bb
-		if use static ; then
-			dosym bb /bin/busybox
-		else
-			newbin busybox_unstripped busybox
-		fi
-	else
-		newbin busybox_unstripped busybox
-		if use static ; then
-			dosym busybox /bin/bb
-		else
-			dobin bb
-		fi
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.20.1.ebuild b/sys-apps/busybox/busybox-1.20.1.ebuild
deleted file mode 100644
index d8f6464faff6..000000000000
--- a/sys-apps/busybox/busybox-1.20.1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.1.ebuild,v 1.9 2012/07/18 11:29:35 vapier Exp $
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-################################################################################
-# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
-#
-# Busybox can be modified in many different ways. Here's a few ways to do it:
-#
-# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
-#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
-#     start of the line if you're installing to somewhere else than the root
-#     directory. This command will save the default configuration to
-#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
-#     defined), and it will tell you that it has done this. Note the location
-#     where the config file was saved.
-#
-#     FEATURES=keepwork USE=savedconfig emerge busybox
-#
-# (2) Go to the work directory and change the configuration of busybox using its
-#     menuconfig feature.
-#
-#     cd /var/tmp/portage/busybox*/work/busybox-*
-#     make menuconfig
-#
-# (3) Save your configuration to the default location and copy it to the
-#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
-#
-# (4) Emerge busybox with USE=savedconfig to use the configuration file you
-#     just generated.
-#
-################################################################################
-#
-# (1) Alternatively skip the above steps and simply emerge busybox without
-#     USE=savedconfig.
-#
-# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
-#
-# (3) Remerge busybox as using USE=savedconfig.
-#
-################################################################################
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${PN}
-	EGIT_REPO_URI="git://busybox.net/busybox.git"
-	inherit git-2
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static"
-RESTRICT="test"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	case $1 in
-		y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
-		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
-		*) use $1 \
-		       && busybox_config_option y $2 \
-		       || busybox_config_option n $2
-		   return 0
-		   ;;
-	esac
-	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-	epatch "${FILESDIR}"/${PN}-1.20.0-udhcpc6-ipv6.patch
-	#epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 allyesconfig > /dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n WERROR
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option n HUSH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-	fi
-
-	if use static && use pam ; then
-		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
-	fi
-	use static \
-		&& busybox_config_option n PAM \
-		|| busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-	if ! use static ; then
-		cp .config{,.bak}
-		mv busybox_unstripped{,.bak}
-		use pam && busybox_config_option n PAM
-		emake CONFIG_STATIC=y busybox
-		mv busybox_unstripped bb
-		mv busybox_unstripped{.bak,}
-		mv .config{.bak,}
-	else
-		# keeps src_install simpler
-		ln busybox_unstripped bb
-	fi
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe bb ginit
-		dosym /ginit /bin/bb
-		if use static ; then
-			dosym bb /bin/busybox
-		else
-			newbin busybox_unstripped busybox
-		fi
-	else
-		newbin busybox_unstripped busybox
-		if use static ; then
-			dosym busybox /bin/bb
-		else
-			dobin bb
-		fi
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.rc.1 mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 2f789c54912b..91794d5c2054 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,3 +1 @@
-DIST pciutils-3.1.10.tar.gz 345149 SHA256 7ca8201f806cbad31cb86bcbb2c2c99853cc05618b360eb58bde31a0f8d1f2a3 SHA512 2227ba3bbd1d5a02986b167010305286a9ad4d2781175291dd95a8f68a06f5508228e519bb34fdf92225cbd1334843d393ff1137bfc992403fd61896607353d5 WHIRLPOOL 7a4390b0da0c1b1df396076e05d7829fc3726199d2482abe61e59fa0e2e75c2de8f6019de57ea55aadf7001674a38d6666444e913e38af7ce76e8b1233645a27
-DIST pciutils-3.1.9.tar.gz 340215 SHA256 8ae7d320c50f02b015f5e2bb17a9f815cf201dae81b6bbd46b8a45552d00a178 SHA512 9e15ae5743bfbdaeb73d02c237d2632ee31f36be3efa5c26688473d2720157ca728384d98a06738eacab0d9a160641a22d53422d0a5d507d9779e0517e18bffb WHIRLPOOL b04f19d82065d166f0fcf47a69682fbeea94ee77f3fc771ede125f7d8c2e51cbf9a2d05ad0682814ee4bc6655567bff52a6e5a9b9ff9a6a5afdf2ee862213244
 DIST pciutils-3.2.0.tar.gz 357003 SHA256 84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1 WHIRLPOOL fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418
diff --git a/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch b/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
deleted file mode 100644
index 5f424635ab5e..000000000000
--- a/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pciutils-3.1.7/lib/configure
-+++ pciutils-3.1.7/lib/configure
-@@ -85,7 +85,7 @@
- 		esac
- 		echo >>$c '#define PCI_HAVE_STDINT_H'
- 		;;
--	freebsd)
-+	freebsd*)
- 		echo_n " fbsd-device"
- 		echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
- 		echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
diff --git a/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch b/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch
deleted file mode 100644
index ad49aa62b1a9..000000000000
--- a/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-don't have the install and install-lib targets install the same files
-otherwise we can hit parallel install failures
-
-http://bugs.gentoo.org/273489
-
-patch by Kevin Pyle
-
---- Makefile
-+++ Makefile
-@@ -90,6 +90,13 @@
- 
- distclean: clean
- 
-+install-pcilib: lib/$(PCILIB)
-+	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
-+
-+ifeq ($(SHARED),yes)
-+install: install-pcilib
-+endif
- install: all
- # -c is ignored on Linux, but required on FreeBSD
- 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
-@@ -99,15 +103,12 @@
- 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
- 	$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
- ifeq ($(SHARED),yes)
--	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
--	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
- 	ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
- endif
- 
--install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC)
--	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR)
-+install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib
-+	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR)
- 	$(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
--	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
- 	$(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
- ifeq ($(SHARED),yes)
- 	ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
diff --git a/sys-apps/pciutils/files/pciutils.cron b/sys-apps/pciutils/files/pciutils.cron
deleted file mode 100755
index 4c6942365253..000000000000
--- a/sys-apps/pciutils/files/pciutils.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/sbin/update-pciids -q
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index a1df75ba582a..aa9db8693539 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/metadata.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='compress-db'>Compress pci.ids database by default</flag>
- <flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
- <flag name='network-cron'>Monthly cronjob the update-pciids script</flag>
- <flag name='zlib'>Support compressed pci.ids database</flag>
-</use>
+	<herd>base-system</herd>
+	<use>
+		<flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
+		<flag name='zlib'>Support compressed pci.ids database</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/pciutils/pciutils-3.1.10.ebuild b/sys-apps/pciutils/pciutils-3.1.10.ebuild
deleted file mode 100644
index b9f33e968df0..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.10.ebuild,v 1.8 2013/02/22 17:31:31 zmedico Exp $
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="static-libs zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libssl.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
-DEPEND="static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
-	epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
-	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-	fi
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		DNS="yes" \
-		IDSDIR='$(SHAREDIR)/misc' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		"$@"
-}
-
-src_compile() {
-	pemake OPT="${CFLAGS}" all
-	if use static-libs ; then
-		pemake \
-			-C "${S}.static" \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-src_install() {
-	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${S}.static/lib/libpci.a"
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
-		"${ED}"/usr/share/man/man8/update-pciids.8*
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.1.10 ]]; then
-		elog "The 'pcimodules' program has been replaced by 'lspci -k'"
-		elog ""
-		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
-		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
-	fi
-}
diff --git a/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild b/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild
deleted file mode 100644
index 7e91a9b25644..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild,v 1.10 2012/05/24 00:02:37 ssuominen Exp $
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="compress-db network-cron static-libs zlib"
-REQUIRED_USE="compress-db? ( zlib )"
-
-DEPEND="zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
-	epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
-	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-	fi
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		DNS="yes" \
-		IDSDIR='$(SHAREDIR)/misc' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=$(usex compress-db 1 0) \
-		PCI_IDS=$(usex compress-db pci.ids{.gz,}) \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		"$@"
-}
-
-src_compile() {
-	pemake OPT="${CFLAGS}" all
-	if use static-libs ; then
-		pemake \
-			-C "${S}.static" \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-src_install() {
-	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${S}.static/lib/libpci.a"
-	dodoc ChangeLog README TODO
-
-	if use network-cron ; then
-		exeinto /etc/cron.monthly
-		newexe "${FILESDIR}"/pciutils.cron update-pciids
-	fi
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
-	elog "The 'pcimodules' program has been replaced by 'lspci -k'"
-}
diff --git a/sys-apps/util-linux/util-linux-2.23.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.23.2-r1.ebuild
new file mode 100644
index 000000000000..92891ff4448c
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.23.2-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.23.2-r1.ebuild,v 1.1 2013/09/05 19:45:36 robbat2 Exp $
+
+EAPI="4"
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-2 autotools
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls old-linux selinux slang static-libs +suid test +tty-helpers udev unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r5
+	!sys-block/eject
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-1.3-r2
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )
+	udev? ( virtual/udev )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.c
+}
+
+src_configure() {
+	lfs_fallocate_test
+	econf \
+		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
+		$(use_enable nls) \
+		--enable-agetty \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		$(use_enable bash-completion) \
+		$(use_enable caps setpriv) \
+		$(use_enable cramfs) \
+		$(use_enable cytune) \
+		$(use_enable fdformat) \
+		$(use_enable old-linux elvtune) \
+		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
+		--disable-kill \
+		--disable-last \
+		--disable-login \
+		$(use_enable tty-helpers mesg) \
+		--enable-partx \
+		--enable-raw \
+		--enable-rename \
+		--disable-reset \
+		--enable-schedutils \
+		--disable-su \
+		$(use_enable tty-helpers wall) \
+		$(use_enable tty-helpers write) \
+		$(use_enable suid makeinstall-chown) \
+		$(use_enable suid makeinstall-setuid) \
+		$(use_with selinux) \
+		$(use_with slang) \
+		$(use_enable static-libs static) \
+		$(use_with udev) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# need the libs in /
+	gen_usr_ldscript -a blkid mount uuid
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
index 8f9850c3c41d..b842c666c1d0 100644
--- a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
+++ b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild,v 1.1 2013/07/19 14:28:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild,v 1.2 2013/09/05 19:44:42 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit eutils distutils-r1
 
diff --git a/sys-cluster/cinder/cinder-2012.2.4-r1.ebuild b/sys-cluster/cinder/cinder-2012.2.4-r2.ebuild
similarity index 63%
rename from sys-cluster/cinder/cinder-2012.2.4-r1.ebuild
rename to sys-cluster/cinder/cinder-2012.2.4-r2.ebuild
index 2f3c08d04910..913d6c631183 100644
--- a/sys-cluster/cinder/cinder-2012.2.4-r1.ebuild
+++ b/sys-cluster/cinder/cinder-2012.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2012.2.4-r1.ebuild,v 1.2 2013/08/19 02:41:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2012.2.4-r2.ebuild,v 1.1 2013/09/05 19:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,14 +15,15 @@ SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+api +scheduler +volume"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
 RDEPEND="~dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
-		~dev-python/kombu-1.0.4
+		~dev-python/kombu-1.0.4[${PYTHON_USEDEP}]
 		~dev-python/lockfile-0.8
 		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 		~dev-python/routes-1.12.3[${PYTHON_USEDEP}]
@@ -39,19 +40,30 @@ RDEPEND="~dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.5.0
-		<dev-python/python-glanceclient-2
-		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]"
+		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
+		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
+		>=sys-block/iscsitarget-1.4.20.2_p20130821
+		sys-block/open-iscsi"
 
-PATCHES=(
-)
+PATCHES=( )
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
 
 python_install() {
 	distutils-r1_python_install
 	keepdir /etc/cinder
-	keepdir /etc/cinder/rootwrap.d
-	insinto /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+	newinitd "${FILESDIR}/cinder-init" "cinder"
+	newconfd "${FILESDIR}/cinder-confd" "cinder"
+	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
+	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
+	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
 
+	insinto /etc/cinder
 	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
 	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
 	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
@@ -59,4 +71,10 @@ python_install() {
 	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
 	insinto /etc/cinder/rootwrap.d
 	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/cinder-sudoers"
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
 }
diff --git a/sys-cluster/cinder/cinder-2013.1.3.ebuild b/sys-cluster/cinder/cinder-2013.1.3-r1.ebuild
similarity index 61%
rename from sys-cluster/cinder/cinder-2013.1.3.ebuild
rename to sys-cluster/cinder/cinder-2013.1.3-r1.ebuild
index 2f9f8abe2436..a44fb5053d1c 100644
--- a/sys-cluster/cinder/cinder-2013.1.3.ebuild
+++ b/sys-cluster/cinder/cinder-2013.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.1.3.ebuild,v 1.1 2013/08/11 01:17:26 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.1.3-r1.ebuild,v 1.1 2013/09/05 19:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,18 +15,20 @@ SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+api +scheduler +volume"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
-RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
+RDEPEND="~dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4[${PYTHON_USEDEP}]
 		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
 		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+		~dev-python/webob-1.2.3[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
@@ -39,21 +41,33 @@ RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.5.0
-		<dev-python/python-glanceclient-2
-		>=dev-python/python-keystoneclient-0.2.0
+		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
+		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-swiftclient[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=sys-block/iscsitarget-1.4.20.2_p20130821
+		sys-block/open-iscsi"
 
 PATCHES=( )
 
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
 python_install() {
 	distutils-r1_python_install
 	keepdir /etc/cinder
-	keepdir /etc/cinder/rootwrap.d
-	insinto /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+	newinitd "${FILESDIR}/cinder-init" "cinder"
+	newconfd "${FILESDIR}/cinder-confd" "cinder"
+	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
+	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
+	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
 
+	insinto /etc/cinder
 	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
 	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
 	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
@@ -61,4 +75,10 @@ python_install() {
 	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
 	insinto /etc/cinder/rootwrap.d
 	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/cinder-sudoers"
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
 }
diff --git a/sys-cluster/cinder/cinder-2013.1.9999.ebuild b/sys-cluster/cinder/cinder-2013.1.9999.ebuild
index 5ad7ed12904b..1ed379449546 100644
--- a/sys-cluster/cinder/cinder-2013.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.1.9999.ebuild,v 1.2 2013/08/19 03:19:56 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.1.9999.ebuild,v 1.3 2013/09/05 19:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,9 +16,11 @@ EGIT_BRANCH="stable/grizzly"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+api +scheduler +volume"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
 RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
@@ -45,16 +47,28 @@ RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-swiftclient[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=sys-block/iscsitarget-1.4.20.2_p20130821
+		sys-block/open-iscsi"
 
 PATCHES=( )
 
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
 python_install() {
 	distutils-r1_python_install
 	keepdir /etc/cinder
-	keepdir /etc/cinder/rootwrap.d
-	insinto /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+	newinitd "${FILESDIR}/cinder-init" "cinder"
+	newconfd "${FILESDIR}/cinder-confd" "cinder"
+	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
+	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
+	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
 
+	insinto /etc/cinder
 	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
 	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
 	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
@@ -62,4 +76,10 @@ python_install() {
 	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
 	insinto /etc/cinder/rootwrap.d
 	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/cinder-sudoers"
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
 }
diff --git a/sys-cluster/cinder/cinder-9999.ebuild b/sys-cluster/cinder/cinder-9999.ebuild
index cd5c3ab6a8b9..0c9f6a80e864 100644
--- a/sys-cluster/cinder/cinder-9999.ebuild
+++ b/sys-cluster/cinder/cinder-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-9999.ebuild,v 1.1 2013/04/11 07:29:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-9999.ebuild,v 1.2 2013/09/05 19:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,43 +15,61 @@ EGIT_REPO_URI="https://github.com/openstack/cinder.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+api +scheduler +volume"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
-RDEPEND="=dev-python/amqplib-0.6.1
-		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
-		>=dev-python/kombu-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8
+RDEPEND=">=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
 		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		=dev-python/webob-1.2.3
-		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.7.3
-		<=dev-python/sqlalchemy-0.7.9
+		>=dev-python/sqlalchemy-0.7.8
+		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/sqlalchemy-migrate-0.7.2
-		>=dev-python/stevedore-0.8
+		>=dev-python/stevedore-0.10
 		>=dev-python/suds-0.4
-		dev-python/paramiko[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
 		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.5.0
-		<dev-python/python-glanceclient-2
-		>=dev-python/python-keystoneclient-0.2.0
-		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]"
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=sys-block/iscsitarget-1.4.20.2_p20130821
+		sys-block/open-iscsi"
 
 PATCHES=( )
 
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
 python_install() {
 	distutils-r1_python_install
+	newinitd "${FILESDIR}/cinder-init" "cinder"
+	newconfd "${FILESDIR}/cinder-confd" "cinder"
+	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
+	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
+	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
+
 	keepdir /etc/cinder
-	keepdir /etc/cinder/rootwrap.d
+	dodir /etc/cinder/rootwrap.d
 	insinto /etc/cinder
 
 	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
@@ -61,4 +79,9 @@ python_install() {
 	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
 	insinto /etc/cinder/rootwrap.d
 	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/cinder-sudoers"
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
 }
diff --git a/sys-cluster/cinder/files/cinder-confd b/sys-cluster/cinder/files/cinder-confd
new file mode 100644
index 000000000000..d09928c17c9c
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder-confd
@@ -0,0 +1,3 @@
+#Don't touch this unless you know what you are doing
+PID_PATH=/run/cinder
+
diff --git a/sys-cluster/cinder/files/cinder-init b/sys-cluster/cinder/files/cinder-init
new file mode 100644
index 000000000000..4c6969ec4c46
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder-init
@@ -0,0 +1,58 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+
+depend() {
+    need net 
+}
+
+checkconfig() {
+    if [ ! -r /etc/conf.d/$BASENAME ]; then
+        eerror "No cinder conf.d file found: /etc/conf.d/$BASENAME)"
+        return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
+        if [ ! -d ${PID_PATH} ]; then
+                mkdir ${PID_PATH}
+        chown cinder:root ${PID_PATH}
+        fi
+
+    start-stop-daemon --start \
+              --quiet \
+              --user cinder \
+              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+              --make-pidfile \
+              --background \
+              --exec /usr/bin/cinder-${SERVERNAME} --  --config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/cinder-${SERVERNAME}
+    
+    eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Stopping ${SVCNAME}"
+    
+    start-stop-daemon --stop \
+              --quiet \
+              --user cinder \
+              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+              --exec /usr/bin/cinder-${SERVERNAME} --  --config-file /etc/cinder/cinder.conf
+
+    eend $? "Failed to stop ${SVCNAME}"
+}
+
+#restart() {
+#
+#}
diff --git a/sys-cluster/cinder/files/cinder-sudoers b/sys-cluster/cinder/files/cinder-sudoers
new file mode 100644
index 000000000000..f44bab4a5778
--- /dev/null
+++ b/sys-cluster/cinder/files/cinder-sudoers
@@ -0,0 +1,4 @@
+Defaults:cinder !requiretty
+
+cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap 
+
diff --git a/sys-cluster/cinder/metadata.xml b/sys-cluster/cinder/metadata.xml
index f3ed38a15db9..4388df02aa5d 100644
--- a/sys-cluster/cinder/metadata.xml
+++ b/sys-cluster/cinder/metadata.xml
@@ -9,5 +9,10 @@
     Cinder is the OpenStack Block storage service.
 	This is a spin out of nova-volumes.
   </longdescription>
+  <use>
+    <flag name="api">Installs the initscripts for the cinder api service</flag>
+    <flag name="scheduler">Installs the initscripts for the cinder scheduler service</flag>
+    <flag name="volume">Installs the initscripts for the cinder volume service</flag>
+  </use>
 </pkgmetadata>
 
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
index be870ba492bb..57b09f6329e9 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.1 2013/08/07 13:32:56 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild,v 1.2 2013/09/05 19:06:56 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild
index 4726a67c0866..a51d0baa7a15 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild,v 1.1 2013/07/26 11:43:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.0.ebuild,v 1.2 2013/09/05 19:06:56 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
diff --git a/sys-cluster/neutron/files/neutron-confd b/sys-cluster/neutron/files/neutron-confd
new file mode 100644
index 000000000000..dae379e557c7
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-confd
@@ -0,0 +1,2 @@
+#Don't touch this unless you know what you are doing
+PID_PATH=/run/quantum
diff --git a/sys-cluster/neutron/files/neutron-initd b/sys-cluster/neutron/files/neutron-initd
new file mode 100644
index 000000000000..6ecae4046b01
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-initd
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net
+}
+
+BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+
+checkconfig() {
+    if [ ! -r /etc/conf.d/$BASENAME ]; then
+        eerror "No quantum conf.d file found: /etc/conf.d/$BASENAME)"
+        return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
+
+    if [ ! -d ${PID_PATH} ]; then
+        mkdir ${PID_PATH}
+    fi
+
+    start-stop-daemon --start \
+        --user quantum:quantum \
+        --quiet \
+        --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+        --make-pidfile \
+        --background \
+        --exec /usr/bin/${SVCNAME} -- \
+            --config-file /etc/quantum/quantum.conf \
+            --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini \
+                        --log-file /var/log/quantum/server.log
+
+    eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Stopping ${SVCNAME}"
+    
+    start-stop-daemon --stop --user quantum --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+                      --exec /usr/bin/${SVCNAME} -- \
+                      --config-file /etc/quantum/quantum.conf \
+                      --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini \
+                                          --log-file /var/log/quantum/server.log
+    eend $? "Failed to stop ${SVCNAME}"
+}
+
+#restart() {
+#
+#}
diff --git a/sys-cluster/neutron/files/neutron-sudoers b/sys-cluster/neutron/files/neutron-sudoers
new file mode 100644
index 000000000000..7d1d5a2be487
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-sudoers
@@ -0,0 +1,4 @@
+Defaults:neutron !requiretty
+
+neutron ALL = (root) NOPASSWD: /usr/bin/quantum-rootwrap
+
diff --git a/sys-cluster/neutron/metadata.xml b/sys-cluster/neutron/metadata.xml
index bf50b796793b..0637de22a8f9 100644
--- a/sys-cluster/neutron/metadata.xml
+++ b/sys-cluster/neutron/metadata.xml
@@ -14,5 +14,12 @@
 	supports extensions to provide advanced network capabilities
 	(e.g., QoS, ACLs, network monitoring, etc)
   </longdescription>
+  <use>
+    <flag name="dhcp">Installs the initscripts for the neutron dhcp service</flag>
+    <flag name="l3">Installs the initscripts for the neutron l3 service</flag>
+    <flag name="metadata">Installs the initscripts for the neutron metadata service</flag>
+    <flag name="openvswitch">Installs the initscripts for the neutron openvswitch service</flag>
+    <flag name="server">Installs the initscripts for the neutron server service</flag>
+  </use>
 </pkgmetadata>
 
diff --git a/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild b/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild
similarity index 58%
rename from sys-cluster/neutron/neutron-2012.2.4-r1.ebuild
rename to sys-cluster/neutron/neutron-2012.2.4-r2.ebuild
index 6ea383ab7891..b9645ca250a5 100644
--- a/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild
+++ b/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild,v 1.5 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild,v 1.1 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 #restricted due to packages missing and bad depends in the test ==webob-1.0.8   
 RESTRICT="test"
@@ -17,43 +17,61 @@ S="${WORKDIR}/quantum-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND="=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		=dev-python/amqplib-0.6.1
-		=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
+		~dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
+		~dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
+		~dev-python/kombu-1.0.4[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/netaddr
+		dev-python/netaddr[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.6.4
 		<=dev-python/sqlalchemy-0.7.9
-		=dev-python/webob-1.0.8-r1[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		~dev-python/webob-1.0.8[${PYTHON_USEDEP}]
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
 
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/neutron-confd" "quantum"
+	newinitd "${FILESDIR}/neutron-initd" "quantum"
+
+	use server && dosym /etc/init.d/quantum /etc/init.d/quantum-server
+	use dhcp && dosym /etc/init.d/quantum /etc/init.d/quantum-dhcp-agent
+	use l3 && dosym /etc/init.d/quantum /etc/init.d/quantum-l3-agent
+	use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
+	use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/quantum
 	insinto /etc/quantum
 
@@ -68,4 +86,13 @@ python_install() {
 
 	#remove the etc stuff from usr...
 	rm -R "${D}/usr/etc/"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
 }
diff --git a/sys-cluster/neutron/neutron-2013.1.3.ebuild b/sys-cluster/neutron/neutron-2013.1.3-r1.ebuild
similarity index 68%
rename from sys-cluster/neutron/neutron-2013.1.3.ebuild
rename to sys-cluster/neutron/neutron-2013.1.3-r1.ebuild
index 54009438c57d..61b06fcf043c 100644
--- a/sys-cluster/neutron/neutron-2013.1.3.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3.ebuild,v 1.5 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3-r1.ebuild,v 1.1 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,22 +17,23 @@ S="${WORKDIR}/quantum-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
@@ -45,22 +46,39 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
-		dev-python/netaddr
-		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		~dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
 		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
 
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/neutron-confd" "quantum"
+	newinitd "${FILESDIR}/neutron-initd" "quantum"
+
+	use server && dosym /etc/init.d/quantum /etc/init.d/quantum-server
+	use dhcp && dosym /etc/init.d/quantum /etc/init.d/quantum-dhcp-agent
+	use l3 && dosym /etc/init.d/quantum /etc/init.d/quantum-l3-agent
+	use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
+	use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/quantum
 	insinto /etc/quantum
 
@@ -78,4 +96,13 @@ python_install() {
 
 	insinto "/usr/lib64/python2.7/site-packages/quantum/db/migration/alembic_migrations/"
 	doins -r "quantum/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
 }
diff --git a/sys-cluster/neutron/neutron-2013.1.9999.ebuild b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
index deb2a4420de3..1ece438a080b 100644
--- a/sys-cluster/neutron/neutron-2013.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.4 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.5 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,22 +17,23 @@ EGIT_BRANCH="stable/grizzly"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
@@ -45,22 +46,39 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
-		dev-python/netaddr
-		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		~dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
 		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
 
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/neutron-confd" "quantum"
+	newinitd "${FILESDIR}/neutron-initd" "quantum"
+
+	use server && dosym /etc/init.d/quantum /etc/init.d/quantum-server
+	use dhcp && dosym /etc/init.d/quantum /etc/init.d/quantum-dhcp-agent
+	use l3 && dosym /etc/init.d/quantum /etc/init.d/quantum-l3-agent
+	use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
+	use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/quantum
 	insinto /etc/quantum
 
@@ -78,4 +96,13 @@ python_install() {
 
 	insinto "/usr/lib64/python2.7/site-packages/quantum/db/migration/alembic_migrations/"
 	doins -r "quantum/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
 }
diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild
index c165fedb2338..07015ead0967 100644
--- a/sys-cluster/neutron/neutron-9999.ebuild
+++ b/sys-cluster/neutron/neutron-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.2 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.3 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,27 +12,27 @@ RESTRICT="test"
 DESCRIPTION="Quantum is a virtual network service for Openstack."
 HOMEPAGE="https://launchpad.net/neutron"
 EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-EGIT_BRANCH="master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
@@ -45,22 +45,39 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
-		dev-python/netaddr
-		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		~dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
 		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
 
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/neutron-confd" "neutron"
+	newinitd "${FILESDIR}/neutron-initd" "neutron"
+
+	use server && dosym /etc/init.d/neutron /etc/init.d/neutron-server
+	use dhcp && dosym /etc/init.d/neutron /etc/init.d/neutron-dhcp-agent
+	use l3 && dosym /etc/init.d/neutron /etc/init.d/neutron-l3-agent
+	use metadata && dosym /etc/init.d/neutron /etc/init.d/neutron-metadata-agent
+	use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/neutron
 	insinto /etc/neutron
 
@@ -78,4 +95,13 @@ python_install() {
 
 	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
 	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
 }
diff --git a/sys-cluster/nova/files/nova-confd b/sys-cluster/nova/files/nova-confd
new file mode 100644
index 000000000000..e18217ea030f
--- /dev/null
+++ b/sys-cluster/nova/files/nova-confd
@@ -0,0 +1,4 @@
+#Don't touch this unless you know what you are doing
+PID_PATH=/run/nova
+LOCKDIR_PATH=/var/lock/nova
+
diff --git a/sys-cluster/nova/files/nova-initd b/sys-cluster/nova/files/nova-initd
new file mode 100644
index 000000000000..952e865493b2
--- /dev/null
+++ b/sys-cluster/nova/files/nova-initd
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+
+depend() {
+    need net 
+}
+
+checkconfig() {
+    if [ ! -r /etc/conf.d/$BASENAME ]; then
+        eerror "No nova conf.d file found: /etc/conf.d/$BASENAME)"
+        return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
+        if [ ! -d ${PID_PATH} ]; then
+                mkdir ${PID_PATH}
+        chown nova:root ${PID_PATH}
+        fi
+
+    if [ ! -d ${LOCKDIR_PATH} ]; then
+                mkdir ${LOCKDIR_PATH}
+        chown nova:root ${LOCKDIR_PATH}
+        fi
+
+    start-stop-daemon --start \
+              --quiet \
+              --user nova \
+              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+              --make-pidfile \
+              --background \
+              --exec /usr/bin/nova-${SERVERNAME} --  --config-file /etc/nova/nova.conf
+    
+    eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Stopping ${SVCNAME}"
+    
+    start-stop-daemon --stop \
+              --quiet \
+              --user nova \
+              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+              --exec /usr/bin/nova-${SERVERNAME} --  --config-file /etc/nova/nova.conf
+
+    eend $? "Failed to stop ${SVCNAME}"
+}
+
+#restart() {
+#
+#}
diff --git a/sys-cluster/nova/files/nova-sudoers b/sys-cluster/nova/files/nova-sudoers
new file mode 100644
index 000000000000..f15b3285b7d4
--- /dev/null
+++ b/sys-cluster/nova/files/nova-sudoers
@@ -0,0 +1,3 @@
+Defaults:nova !requiretty
+
+nova ALL = (root) NOPASSWD: /usr/bin/nova-rootwrap
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index d2bf26f9c6f4..e6379ce54911 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -9,5 +9,17 @@
     Nova is a cloud computing fabric controller
 	(the main part of an IaaS system). It is written in Python.
   </longdescription>
+  <use>
+    <flag name="api">Installs the initscripts for the nova api service</flag>
+    <flag name="cert">Installs the initscripts for the nova scheduler service</flag>
+    <flag name="compute">Installs the initscripts for the nova volume service</flag>
+    <flag name="conductor">Installs the initscripts for the nova conductor service</flag>
+    <flag name="consoleauth">Installs the initscripts for the nova consoleauth service</flag>
+    <flag name="network">Installs the initscripts for the nova network service</flag>
+    <flag name="novncproxy">Installs the initscripts for the nova novncproxy service</flag>
+    <flag name="scheduler">Installs the initscripts for the nova scheduler service</flag>
+    <flag name="spicehtml5proxy">Installs the initscripts for the nova spicehtml5proxy service</flag>
+    <flag name="xvpvncproxy">Installs the initscripts for the nova xvpvncproxy service</flag>
+  </use>
 </pkgmetadata>
 
diff --git a/sys-cluster/nova/nova-2012.2.4-r4.ebuild b/sys-cluster/nova/nova-2012.2.4-r5.ebuild
similarity index 58%
rename from sys-cluster/nova/nova-2012.2.4-r4.ebuild
rename to sys-cluster/nova/nova-2012.2.4-r5.ebuild
index c6b90d561441..e721292c604b 100644
--- a/sys-cluster/nova/nova-2012.2.4-r4.ebuild
+++ b/sys-cluster/nova/nova-2012.2.4-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.4-r4.ebuild,v 1.3 2013/08/22 04:55:51 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2012.2.4-r5.ebuild,v 1.1 2013/09/05 20:57:34 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils multilib
 
 DESCRIPTION="Nova is a cloud computing fabric controller (main part of an
 IaaS system). It is written in Python."
@@ -15,24 +15,25 @@ SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
-RDEPEND="=dev-python/amqplib-0.6.1
+RDEPEND="~dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.9
 		=dev-python/boto-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.17
-		=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
-		=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		=dev-python/webob-1.0.8-r1[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
+		~dev-python/kombu-1.0.4[${PYTHON_USEDEP}]
+		~dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+		~dev-python/webob-1.0.8[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-		=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+		~dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2
-		dev-python/netaddr
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
 		=dev-python/suds-0.4
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
@@ -50,11 +51,31 @@ PATCHES=(
 	"${FILESDIR}/2012.2.4-CVE-2013-4185.patch"
 )
 
+pkg_setup() {
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/nova-confd" "nova"
+	newinitd "${FILESDIR}/nova-initd" "nova"
+	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
+	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
+	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
+	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
+	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
+	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
+	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
+	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
+
+	dodir /var/log/nova
+	fowners nova:nova /var/log/nova
+
 	keepdir /etc/nova
 	insinto /etc/nova
-
 	newins "etc/nova/nova.conf.sample" "nova.conf"
 	newins "etc/nova/api-paste.ini" "api-paste.ini"
 	newins "etc/nova/logging_sample.conf" "logging_sample.conf"
@@ -72,4 +93,8 @@ python_install() {
 
 	#copy the CA cert dir (not coppied on install via setup.py script)
 	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/nova-sudoers"
 }
diff --git a/sys-cluster/nova/nova-2013.1.3.ebuild b/sys-cluster/nova/nova-2013.1.3-r2.ebuild
similarity index 62%
rename from sys-cluster/nova/nova-2013.1.3.ebuild
rename to sys-cluster/nova/nova-2013.1.3-r2.ebuild
index 4705be447ab8..1edf078fe4be 100644
--- a/sys-cluster/nova/nova-2013.1.3.ebuild
+++ b/sys-cluster/nova/nova-2013.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.3.ebuild,v 1.3 2013/08/22 04:55:51 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.3-r2.ebuild,v 1.1 2013/09/05 20:57:34 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,25 +15,26 @@ SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
 RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/cheetah-2.4.4
+		>=dev-python/cheetah-2.4.4[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		dev-python/boto[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+		~dev-python/webob-1.2.3[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2
-		dev-python/netaddr
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
@@ -44,10 +45,10 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
 		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
-		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.7
+		>=dev-python/stevedore-0.7[${PYTHON_USEDEP}]
 		<dev-python/websockify-0.4[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]"
@@ -56,11 +57,31 @@ PATCHES=(
 )
 #	"${FILESDIR}/nova-grizzly-1-CVE-2013-2096.patch"
 
+pkg_setup() {
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/nova-confd" "nova"
+	newinitd "${FILESDIR}/nova-initd" "nova"
+	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
+	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
+	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
+	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
+	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
+	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
+	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
+	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
+
+	dodir /var/log/nova
+	fowners nova:nova /var/log/nova
+
 	keepdir /etc/nova
 	insinto /etc/nova
-
 	newins "etc/nova/nova.conf.sample" "nova.conf"
 	doins "etc/nova/api-paste.ini"
 	doins "etc/nova/logging_sample.conf"
@@ -77,4 +98,8 @@ python_install() {
 
 	#copy the CA cert dir (not coppied on install via setup.py script)
 	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/nova-sudoers"
 }
diff --git a/sys-cluster/nova/nova-2013.1.9999.ebuild b/sys-cluster/nova/nova-2013.1.9999.ebuild
index c2ce3e27c966..9b82fc5b437d 100644
--- a/sys-cluster/nova/nova-2013.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2013.1.9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.9999.ebuild,v 1.4 2013/08/22 04:55:51 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.9999.ebuild,v 1.5 2013/09/05 20:57:34 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-2
+inherit distutils-r1 eutils git-2 multilib
 
 DESCRIPTION="Nova is a cloud computing fabric controller (main part of an
 IaaS system). It is written in Python."
@@ -16,25 +16,26 @@ EGIT_BRANCH="stable/grizzly"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
 RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/cheetah-2.4.4
+		>=dev-python/cheetah-2.4.4[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		dev-python/boto[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+		~dev-python/webob-1.2.3[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2
-		dev-python/netaddr
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
@@ -45,10 +46,10 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
 		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
-		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.7
+		>=dev-python/stevedore-0.7[${PYTHON_USEDEP}]
 		<dev-python/websockify-0.4[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]"
@@ -56,11 +57,31 @@ RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 PATCHES=(
 )
 
+pkg_setup() {
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/nova-confd" "nova"
+	newinitd "${FILESDIR}/nova-initd" "nova"
+	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
+	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
+	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
+	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
+	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
+	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
+	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
+	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
+
+	dodir /var/log/nova
+	fowners nova:nova /var/log/nova
+
 	keepdir /etc/nova
 	insinto /etc/nova
-
 	newins "etc/nova/nova.conf.sample" "nova.conf"
 	doins "etc/nova/api-paste.ini"
 	doins "etc/nova/logging_sample.conf"
@@ -70,11 +91,15 @@ python_install() {
 	doins "etc/nova/rootwrap.d/api-metadata.filters"
 	doins "etc/nova/rootwrap.d/compute.filters"
 	doins "etc/nova/rootwrap.d/network.filters"
-	doins "etc/nova/rootwrap.d/baremetal-compute-ipmi.filters"
-	doins "etc/nova/rootwrap.d/baremetal-deploy-helper.filters"
+
 	#copy migration conf file (not coppied on install via setup.py script)
 	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
 	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+
 	#copy the CA cert dir (not coppied on install via setup.py script)
 	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/nova-sudoers"
 }
diff --git a/sys-cluster/nova/nova-9999.ebuild b/sys-cluster/nova/nova-9999.ebuild
index ea0963e4cd6c..c201776d8152 100644
--- a/sys-cluster/nova/nova-9999.ebuild
+++ b/sys-cluster/nova/nova-9999.ebuild
@@ -1,66 +1,94 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.5 2013/08/20 16:33:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.6 2013/09/05 20:57:34 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-2
+inherit distutils-r1 eutils git-2 multilib
 
 DESCRIPTION="Nova is a cloud computing fabric controller (main part of an
 IaaS system). It is written in Python."
 HOMEPAGE="https://launchpad.net/nova"
 EGIT_REPO_URI="https://github.com/openstack/nova.git"
-EGIT_BRANCH="master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+api +cert +compute +conductor +consoleauth +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		app-admin/sudo"
 
 RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/cheetah-2.4.4
 		>=dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		dev-python/boto[${PYTHON_USEDEP}]
+		>=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
+		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.0[${PYTHON_USEDEP}]
+		<dev-python/jinja-3[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-1.3.0[${PYTHON_USEDEP}]
+		!~dev-python/jsonschema-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.16[${PYTHON_USEDEP}]
+		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		~dev-python/webob-1.2.3[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2
-		dev-python/netaddr
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
 		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
 		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
-		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
 		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.7
-		<dev-python/websockify-0.4[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+		>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}]
+		<dev-python/websockify-0.6[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]"
+#oslo.config-1.2 is required but not released yet
 
 PATCHES=(
 )
 
+pkg_setup() {
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
 python_install() {
 	distutils-r1_python_install
+	newconfd "${FILESDIR}/nova-confd" "nova"
+	newinitd "${FILESDIR}/nova-initd" "nova"
+	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
+	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
+	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
+	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
+	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
+	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-nonvncproxy
+	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
+	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
+	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
+
+	dodir /var/log/nova
+	fowners nova:nova /var/log/nova
+
 	keepdir /etc/nova
 	insinto /etc/nova
-
 	newins "etc/nova/nova.conf.sample" "nova.conf"
 	doins "etc/nova/api-paste.ini"
 	doins "etc/nova/logging_sample.conf"
@@ -70,11 +98,15 @@ python_install() {
 	doins "etc/nova/rootwrap.d/api-metadata.filters"
 	doins "etc/nova/rootwrap.d/compute.filters"
 	doins "etc/nova/rootwrap.d/network.filters"
-	doins "etc/nova/rootwrap.d/baremetal-compute-ipmi.filters"
-	doins "etc/nova/rootwrap.d/baremetal-deploy-helper.filters"
+
 	#copy migration conf file (not coppied on install via setup.py script)
 	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
 	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+
 	#copy the CA cert dir (not coppied on install via setup.py script)
 	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/nova-sudoers"
 }
diff --git a/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild b/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
index cde8f538f7bd..95bcf6b81466 100644
--- a/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
+++ b/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild,v 1.1 2013/02/02 14:12:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild,v 1.2 2013/09/05 19:06:56 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/sys-cluster/ploop/ploop-1.8.ebuild b/sys-cluster/ploop/ploop-1.8.ebuild
index 5e8844704c93..fe1ecd8186b8 100644
--- a/sys-cluster/ploop/ploop-1.8.ebuild
+++ b/sys-cluster/ploop/ploop-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.8.ebuild,v 1.2 2013/08/31 09:45:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.8.ebuild,v 1.3 2013/09/05 19:24:35 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug static-libs"
 
 DEPEND="dev-libs/libxml2"
diff --git a/sys-cluster/polysh/polysh-0.4-r1.ebuild b/sys-cluster/polysh/polysh-0.4-r1.ebuild
index 402f2b8c8b55..f8e583a88a8a 100644
--- a/sys-cluster/polysh/polysh-0.4-r1.ebuild
+++ b/sys-cluster/polysh/polysh-0.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/polysh/polysh-0.4-r1.ebuild,v 1.3 2013/03/26 11:42:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/polysh/polysh-0.4-r1.ebuild,v 1.4 2013/09/05 19:06:56 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/sys-devel/automake/automake-1.13.4.ebuild b/sys-devel/automake/automake-1.13.4.ebuild
index 8737281d32a3..7249543e901b 100644
--- a/sys-devel/automake/automake-1.13.4.ebuild
+++ b/sys-devel/automake/automake-1.13.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild,v 1.8 2013/09/04 09:01:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild,v 1.9 2013/09/05 13:26:06 ago Exp $
 
 inherit eutils versionator unpacker
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 # Testing.
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/sys-devel/clang/clang-3.2.ebuild b/sys-devel/clang/clang-3.2.ebuild
index 58f969e2f886..bb5f4a283da9 100644
--- a/sys-devel/clang/clang-3.2.ebuild
+++ b/sys-devel/clang/clang-3.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.2.ebuild,v 1.7 2013/08/14 13:03:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.2.ebuild,v 1.8 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit eutils multilib python-r1
 
diff --git a/sys-devel/clang/clang-3.3.ebuild b/sys-devel/clang/clang-3.3.ebuild
index bdf7a6e3d968..18f37b72a490 100644
--- a/sys-devel/clang/clang-3.3.ebuild
+++ b/sys-devel/clang/clang-3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.3.ebuild,v 1.2 2013/08/14 13:03:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.3.ebuild,v 1.3 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit eutils multilib python-r1
 
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 2e2a6bda7338..b95edd290ac7 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.38 2013/08/14 13:03:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.39 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit subversion eutils multilib python-r1
 
diff --git a/sys-devel/distcc/distcc-3.1-r7.ebuild b/sys-devel/distcc/distcc-3.1-r7.ebuild
index 531d529a8ae8..a83a2e35433e 100644
--- a/sys-devel/distcc/distcc-3.1-r7.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r7.ebuild,v 1.5 2013/02/12 09:09:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r7.ebuild,v 1.6 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user
 
diff --git a/sys-devel/distcc/distcc-3.1-r8.ebuild b/sys-devel/distcc/distcc-3.1-r8.ebuild
index cd1e01fe496d..447ee5b90a5d 100644
--- a/sys-devel/distcc/distcc-3.1-r8.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r8.ebuild,v 1.1 2013/07/20 13:30:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r8.ebuild,v 1.2 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user systemd
 
diff --git a/sys-devel/llvm/llvm-3.2.ebuild b/sys-devel/llvm/llvm-3.2.ebuild
index ffdce3864014..d3d1632f8dcb 100644
--- a/sys-devel/llvm/llvm-3.2.ebuild
+++ b/sys-devel/llvm/llvm-3.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.2.ebuild,v 1.8 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.2.ebuild,v 1.9 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils flag-o-matic multilib python-any-r1 toolchain-funcs pax-utils
 
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 0051cd5076aa..bc4e10606880 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.11 2013/08/14 19:50:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.12 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit eutils flag-o-matic multilib multilib-minimal \
 	python-r1 toolchain-funcs pax-utils check-reqs
diff --git a/sys-devel/llvm/llvm-3.3.ebuild b/sys-devel/llvm/llvm-3.3.ebuild
index a84d8da1655a..e92769f0248b 100644
--- a/sys-devel/llvm/llvm-3.3.ebuild
+++ b/sys-devel/llvm/llvm-3.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3.ebuild,v 1.5 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3.ebuild,v 1.6 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit eutils flag-o-matic multilib python-any-r1 toolchain-funcs pax-utils
 
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 983ab8c7fa8f..b46198716d77 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.50 2013/08/14 19:50:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.51 2013/09/05 19:08:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit subversion eutils flag-o-matic multilib multilib-minimal \
 	python-r1 toolchain-funcs pax-utils check-reqs
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild
index a504a0640e3c..292fb1e7ecb5 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild,v 1.4 2013/08/06 20:14:54 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild,v 1.5 2013/09/05 19:44:47 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools python-single-r1 linux-info libtool eutils
 
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild
index c620448fcb96..74a64ca69716 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild,v 1.7 2013/08/31 14:49:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/f2fs-tools/f2fs-tools-1.1.0-r1.ebuild,v 1.8 2013/09/05 13:27:13 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
 src_configure () {
diff --git a/sys-fs/zfs/zfs-0.6.2.ebuild b/sys-fs/zfs/zfs-0.6.2.ebuild
index da623d17e0e7..4180061d0f15 100644
--- a/sys-fs/zfs/zfs-0.6.2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2.ebuild,v 1.2 2013/08/24 00:01:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2.ebuild,v 1.3 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit python-single-r1
 
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 55a2dd57488e..ece56f9993ec 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.47 2013/08/24 00:01:50 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.48 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit python-single-r1
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 3fb0fa034a65..39653fdc32cc 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -32,8 +32,9 @@ DIST genpatches-3.10-16.base.tar.xz 233328 SHA256 9ef122dc752894076bd986140a036b
 DIST genpatches-3.10-16.extras.tar.xz 17732 SHA256 aaec50b87931d58b16a0ca1a920e59baee9256fc2465a5ee9a3b9e7dde6d1a81 SHA512 9e30d1ff47600c85d655ffb6f4caefec5140550b517b6c97a5c668e93bc8c0dbd13dc12952f64c8070d3636860bcd41b7d9b428815a5cfed37a1228c646f3785 WHIRLPOOL dd80d37ca76da035dfdc457cd40f5bfb2b8398d604bec8ed0be27619a33ef68af5a02c93d604b6c7b322aab5aec9d9b11b0b2c628c959c562220082b18c65b72
 DIST genpatches-3.10-17.base.tar.xz 252308 SHA256 b90f34783957c3fc7a3fe7cbc96af27c5b99554731888d54101dd83d99568309 SHA512 24343748797c38a9687bbec85a35577a534ab271b81dd76a8622dd49c7fb218b14e28b85026eabefb0e1cae5b79236902a446077d27c150b466d248cf18d521f WHIRLPOOL c29b52e9caa8c4551d4826f6edf3b612da2633a7a54d7eae0be3ba4fdb81ca3a0082c3f322ed9408cf067aa5459063d07ff971a00cd8689fab482e1e225e7ea6
 DIST genpatches-3.10-17.extras.tar.xz 17752 SHA256 0cee08fb7ebb857d78741b833190d3829e974231de177918f89cbf32e194252b SHA512 0fab063d4d69f3ad824cf573f4da839d635f1f473af928c85544df60bb62e9cd29ca67f95110689299e79bc9f5b35455436c53fbc732569170b5decf17f74e97 WHIRLPOOL 9a73aa0e84690820832791b63749e01f4d622cf1f0327ae33a6188b866ba1459f6f6b3a01d31412fa3cc226da8af6ab63ee59db29cdfb787cd24901c85b84233
-DIST genpatches-3.11-1.base.tar.xz 7276 SHA256 1d14b286e97a39a13c0e825561b4537d9a45f5a4457f044bbe98f029a3bc7d51 SHA512 f1185c96b24d99fbf942dc7a753a195494cdc2f1c9db8123e6ffa24f8f23493ab87ad528b411a0113a91e5381882655cdb01e075feccdb8ea40ede944b51bab7 WHIRLPOOL 5ae92ca621b7359d38e262cd5e60cc48cf8f57d4637697001e02ba23e00b74b640fa38ccef52856a4311e581823bad48250006bba4e77b0b593742219975f6b4
-DIST genpatches-3.11-1.extras.tar.xz 16640 SHA256 568cb13bca26078e372000f3b3a31170aee4b7cadeb3beda93bdbdea3ebf470b SHA512 f1408958ef99c338629eb4100e606455b39fa46f60222ec0eac8f694e405e0137e799b1a60143d6c6dfb4dfad313980c8d0dcead6014555e412137baab22d6bb WHIRLPOOL 8257d5d7113b1843fe956db3f853b806e0a76e4be0d3e99b7b1c5be5c12f201977db0d650d0915171810275b99d91dcd39c93eae315d979d53ae8498f58e59fa
+DIST genpatches-3.11-3.base.tar.xz 7472 SHA256 262db0950ce868111fcbb0e9575b01967ead9a8a842109fec7949ac6d2037126 SHA512 161873e8c2c62ed974fb3bc97cd8377184692f853dff13d0bca4f2c0662ace3c05c6bf168a76c7a106303d612a8a90dd4ce4e944da6a0ed83adefb2b110b664c WHIRLPOOL df231f1e8f9360f009de89ab9b466a929c597bb6138575205f892dc4d49adf0f6df2586d633e89d95bdba42fa94d2d2bfeb1e51adfedc5eb31b73e096f45549c
+DIST genpatches-3.11-3.experimental.tar.xz 45276 SHA256 0f2297d5ae40c532ec823ca95de977e55bfd9adef076a91564def0e876a31d0f SHA512 3098f9e6ad8a41389307dafe5674f1680c7169f031c951dcd8acbf02432a632e5de149059893daeb024847bb1bf63f5cd07ae7302c63bdc3934e47e9518c97ef WHIRLPOOL 139068f19f16143be570d7341f892b271e4005aef8dabd7b488ca6322cab252c9d3d21c77f932bc638b3a95a8ce9b8d1baaa898d268400881d9add464f324a46
+DIST genpatches-3.11-3.extras.tar.xz 16644 SHA256 7039fea3cac3eb3a9e7468d0db479d1f4e8ab0a08779cdcc9bae5db06cb6f0e1 SHA512 f9b80a5e07a5dc7201aa2d5d92140a885564fed880d6167400830fc9c0d1bf667a1c549c3f06d446254c504d62ccea36332da49cc2ca47d343c61e35e85523fa WHIRLPOOL fd42b19839128515f63771977702a522b46751b6ead85ace649a816106f24c547596c8c269732c83fc3385bc5d24a93d8d79cb4b3664f108be4b4327af216013
 DIST genpatches-3.2-28.base.tar.xz 1012444 SHA256 3a448cf05371fbb3b5ba326726736ce7552dfe078d861f0e7daa32bb0278d99f SHA512 6e6720397a93933854ffc76dbe2787310a3f44d1e43923353bc6db8b5a78d1f32cfc051b0e64941dd0e34b066a925ad6f33a0c1a4f990022b30a602aff3b7f16 WHIRLPOOL fb441529639095a3e3cbc2baa49536cc9b276c9cfd78dca34458cdbda379f18c22d1da24910fcb8829c5a759f7fd252cb28cf3afb3833aaf553929d7091f51d6
 DIST genpatches-3.2-28.extras.tar.xz 16756 SHA256 6752561737f91846822fb43507743f30693622cec84b2974c3b2a537ca20db72 SHA512 e5965a1b33995ddf431768551c4118a2340101210c34ff24c571e635e1ddf61cc2b5dbcb9049e0d0492727c90b8797aa2de0b29544597c8db574ff56cf35ea8a WHIRLPOOL 14d09ca9cddbf4285cb7be83f3f06ce733a2d4664b2a1ef5f0a7c461941237e99959ea18918b5df7cae5793ff36cfc2368945f7f15cf183e1bcbfc76e17a9b4d
 DIST genpatches-3.4-37.base.tar.xz 771852 SHA256 d9078d5c5b3bb3265811e142f7b79ba8f7838559142b2c7bbcf65fb49144d530 SHA512 fbeb0ba44e5d0094ec14e8707a576160a45207374ee2a1dcad892b026bc23fd348c4ba95a841aba7c90435d6d73a32565bfb6be6605de867d8ca9bc8dd0c47c3 WHIRLPOOL 0121a76c182c9046a326245974d532046f3b54a02d466c4022f899560d4f561cd5618317a7d03974af7c9ad4dbbf6c89887eb4cf0fe327471b374c1dc3d0443c
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.11.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.11.0.ebuild
index 5c9240775a12..51899a35ad48 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.11.0.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.11.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.11.0.ebuild,v 1.1 2013/09/03 14:15:07 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.11.0.ebuild,v 1.2 2013/09/05 22:28:58 tomwij Exp $
 
 EAPI="5"
 ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="1"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="3"
 K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
@@ -13,7 +13,7 @@ detect_arch
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
-IUSE="deblob"
+IUSE="deblob experimental"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
diff --git a/sys-kernel/gentoo-sources/metadata.xml b/sys-kernel/gentoo-sources/metadata.xml
index 33af09da6fe9..a6bd00fc620f 100644
--- a/sys-kernel/gentoo-sources/metadata.xml
+++ b/sys-kernel/gentoo-sources/metadata.xml
@@ -4,6 +4,7 @@
 <herd>kernel</herd>
 <use>
   <flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+  <flag name='experimental'>Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
 </use>
 <upstream>
   <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 40cf4c0829ba..6bb8e6d448e8 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -8,26 +8,19 @@ DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03
 DIST deblob-check-3.9 557345 SHA256 60d05db20e7b50919ca44487d05e8faa9cca830318bd8d96625f0f75b252eeed SHA512 6b857380d495261c4d356639157f99f3ca3412388fd3b1c72b566c3bb6453c5a22ab7716e3b24e64a9b63dab912b07baccccfd0fca806ac0e0620efeef777b6a WHIRLPOOL 877c2c9b813466f9aa5cfecdc9ab93247bd2cdead457c9e0bd97da49d042d0a52262f9b4f8e9c83e397b57c5bb5a8fe2b61bb5f44d5a178a579cc9fff990941a
 DIST genpatches-2.6.32-48.base.tar.xz 907780 SHA256 aafa99cbd0ff38c9fccd3ce6780b2f3c261e3e66415dc8b14870959b94498c73 SHA512 eebadf08d5a01165d7e57e0d5adc70de33854b5b57c69edba5c0e6672288479da33f57c89a0fe838067aa5ca3663c47b22c98c34929ef66c5740e945af5c0317 WHIRLPOOL 3906c3e0c9a7a66c4cc710d506ec56d97fc6ac878c2aa22b1a2ad3ce10d3aae8cfbd54d9f78fa78b3ce41fdf291b8ee955692e4759758f2edac5e24e9f342c41
 DIST genpatches-2.6.32-48.extras.tar.xz 24436 SHA256 87b9ba845a35f737088362921720403bc348554031f8956ae20b30ade53b7c64 SHA512 de7c110f5f86f865410cfc408eccd3052a5b7777065f06cbeb3c22c3642db9424235df19ea418e2354ff3aabcc915b0b85cf6e06537f6600d7b30e2f79220508 WHIRLPOOL 755f5e34fec49976f634c43ab459cb13703e6595ca84808d18919a01d7735bf97f16625102b384d67d4360bd3d9a07d21ab50e16b945edb9df8231a26cfa7169
-DIST genpatches-3.10-13.base.tar.xz 220108 SHA256 cc2c91b479e7dd78e5a793e220b4f4d067d8bb2cd89e84c35f82612eba2a62c2 SHA512 01a1b73bcf6ee1add8a307dd23e39cd0f8ef4798c6ccea42e676ac2dc8f8c2cb3e0c3802d80b5800c9c607f318aa63feaef90ae95375d29e664ce8d9c02ea671 WHIRLPOOL c938d8aa11eb2e701c6bff69301253e896c6c65f5f6c5da3cd1737e376fb2ef50aac5b80e1d0e4110298e17ab4c06db3e395e1e882b189a141412e41d83f3f01
-DIST genpatches-3.10-16.base.tar.xz 233328 SHA256 9ef122dc752894076bd986140a036b6ed295a02952e34db4766946de855ed37c SHA512 42fcd78e0a61a152a65fa6dc878f58ec47867a8556302b1efee82506f79c23970e1def91b75b9f1082cd9d1ad3d0d9c5758c981d01076c76f060d47fb08eacab WHIRLPOOL 43628172a1d682af30cf56dd76c5ec3abffd7ed945f6c2c9cf37de67e70ac1d22a9efc31a387bb569b93c24d45246d919edcc16bebbe4e0eaafa948959597dc0
+DIST genpatches-3.10-17.base.tar.xz 252308 SHA256 b90f34783957c3fc7a3fe7cbc96af27c5b99554731888d54101dd83d99568309 SHA512 24343748797c38a9687bbec85a35577a534ab271b81dd76a8622dd49c7fb218b14e28b85026eabefb0e1cae5b79236902a446077d27c150b466d248cf18d521f WHIRLPOOL c29b52e9caa8c4551d4826f6edf3b612da2633a7a54d7eae0be3ba4fdb81ca3a0082c3f322ed9408cf067aa5459063d07ff971a00cd8689fab482e1e225e7ea6
 DIST genpatches-3.10-3.base.tar.xz 52604 SHA256 56b05e27e86960023523c06e9c8f9fbd52285d2ef52cef6028bfbf10802ae094 SHA512 7bff65187302839e1407f72dc5d61652e362fb824126db9653a2a2db98d512e96b9675d99a400caaf500458d8a7b2b8050345ddfdf574653d3c1315fbf066c80 WHIRLPOOL 6c9ff586694fc60206e2f84ac97017c954dce45688528482bf329b2f3d6eeb953c6cc27bfad619ea94270201a2d80b1eea9ad729220b651ddc6b4468819bfa97
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
 DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
 DIST genpatches-3.9-14.base.tar.xz 278412 SHA256 c5cc0e1e455e4ce751f11c33b59ce7a63540613ebe35371cda07bd8c4d7b2a4e SHA512 d09ecb9ec1418aa1c94ab70da477de19aa5f67c8d991856c8d29dd842182a86b93a274bca71bdeb95b9197674b22e6a6840b43ec103309124f855307dee255d5 WHIRLPOOL 25b86aaa6b58279d7e1e1b08d607fe3b4d993c1c7498815dda2fa2021f5e65a0264b4b612004a6c2d1bd534db6c843b7ca08871ee24fbe278e41d6c70fdb9273
-DIST genpatches-3.9-9.base.tar.xz 155404 SHA256 db446d34c2d6c64da36e4196a3dd98424006b6abad3bcb3382b36d6380e41508 SHA512 7199a17e251ba6b71ed7d63a1ea57cec8c601b49e7f4f5559d1ab12ae57147fea2bd971af653dd7120f66804accec6d7281b9ea3891d80af5387b0a487d79f72 WHIRLPOOL 5971198fb42661599879e9c0cb9b034897c7e154efd0a8c95e9d1296f62bdc61747ac979cad6f9201c1c342c5a155a5041dac4591f2329c11a51a3685789f860
-DIST hardened-patches-2.6.32-175.extras.tar.bz2 973143 SHA256 c86587161d79003b9a8865e483c892d1e2d8d3c7355d604f4b466b9eb193f67d SHA512 8173228ebcb0bd61e896c35f810c6e446b6ac7fbed6820f2a5ae44c3d1ec6c6e10982ae9ba6fe8bc56508130872b9b55e5e6d11d7c15303263d19270eec016ff WHIRLPOOL f305b63601c0a0341eea0e2c1a9d530b0013f565bce396a93ea9f54194774bd2070beeb24984daf0e2d88c2bcd1e8a6dedcdc3549ff244176ecb452dd9a6291e
 DIST hardened-patches-2.6.32-180.extras.tar.bz2 982186 SHA256 5907c4d7beb20993dca68633aae560e5353b21d2bb9e114dae4add0b91d145c8 SHA512 ef3907557a5ad327a7b1a3fafeebcfd80089d16985e3399dc767af8c529fc548dd9d507897b6bc0afc5e026a2671005225ddb5234e418b18bf8c8a23143474f8 WHIRLPOOL 9829ce00ab7ff120c1dc2748b8b6c1432c812de892d444881443332542de122ca2f27b2df1e9e1440ee553ec377446ea90088d31165a44b26d05ede5d64e42e8
 DIST hardened-patches-2.6.32-183.extras.tar.bz2 978467 SHA256 445dd8e90100663e9c52f64a841519df93a7086206fcafdec9bea482ae520762 SHA512 6e55e25ee2089b9ce4aac45097dc5cf3f8314393f3bdab160bb7e133701458491822517ec6fccbee05ce9a280234b8f2925b6dea5d82875b8c29e6677ac31958 WHIRLPOOL a3b9488c7567b0f516160abc9d5e43e0bf6008d6db66165f2a776273771f8839df4dbe5bfcb45d21be4590bff2abfe41b4c9e2509247c05041b3f0e78f1a4588
 DIST hardened-patches-2.6.32-186.extras.tar.bz2 986803 SHA256 4c9d5e00fec7d2e8ebe513a96c21dc16e8fdf511488ca0e58e647ce8e94634c4 SHA512 535f07edfba24701267b2a0d06522b7902ff4ec0ee4b845b4de313148e38a2ee95abd1abfc495a661beac09d8ddd56afbd0e2eab42f8d1b3234da1db740f99d0 WHIRLPOOL 7d6fcaf48131f5ee3bdf651de4210bf9aad24139fa82e05f4e445d63ed795c6b7c3e16d26d457b63577b123f13eab91ab265dc19e500460b799a740e193c933c
 DIST hardened-patches-3.10.1-2.extras.tar.bz2 722434 SHA256 16c35d0b79f667833d6439760c4e494409ed171d8893dffcdc1515f504663682 SHA512 e33fe8d1ce0a1eb90a632054c4f5530f57c69a6c4b7cc2557e45293d7732fd49c9bcae69af9a67e26686255384cc1eeb463254e015066de4518c2421b59bf47d WHIRLPOOL 1b0e3c70a1755b20f9bedfc9f7e9e3788f1be5a5462ef487bbe54b562f3515b632ca40ccc05f7393445c7f4a83e067204a43853479b4ec7e36830975877d2ad5
-DIST hardened-patches-3.10.7-2.extras.tar.bz2 750733 SHA256 21875eb5af1af4cb3e6294c75ae27c37145d01144402d0f7af4576f700f9dfc6 SHA512 7f5d0b0557a05cbb04d45b8f6a2b1fff14e8c9cf1aaa36860e203bd2c2ddb7bfe5504c2deacf50085ddc63916875a89a8d85494a6bf681b3915c69f60b8da3e0 WHIRLPOOL 98d56931c3304a4e3cba7da820acfe69ef151651336de08d4f86903c2ad63e4fe87287973239dab8e18339a69b48e61d83104a77378a54060549f9944e8f7901
-DIST hardened-patches-3.10.9-2.extras.tar.bz2 759488 SHA256 af3d909d8fcb0618943f5fdf3fd4e2b2fd004b57b0caa485fd3789d9bbb10f87 SHA512 7b63f4b3033d4a5721f68e05f4752ffe5487df5269f680f57bad9acf87c675d996f5928fb8a75e7781c62f187401644e0ca5c4b7f01f3ddb286773554340ff66 WHIRLPOOL 0c3f947f7495a3d85cc89e3bc8f98217c9bd7ad0082819001d30aaee9d0454a9cbd287f63f2726e88959077e9a76ead3f6bcfbec766eb47730d4ac880ac972a4
-DIST hardened-patches-3.2.46-2.extras.tar.bz2 1424205 SHA256 b6f6a01be866da60f17a5a1a40ca833005f4bd9a80abc7be8e0b39a48dbf75b9 SHA512 9e265c1cc21ce61c554d32acf6bf45ac959b170af429df796ffdd08e1f98eea2d4a902d899a62ab750bf5e1c02b11ead045ffa2a9309631acd2a143394c4533e WHIRLPOOL b083157f6fd754a65ac6748c634f61e400f2107eaecd9eab5580ab1a08322c975e4f1610dab01543614e82ed3437ce1a520317d40d588d7fc63df24abbb25fd2
+DIST hardened-patches-3.10.10-1.extras.tar.bz2 771399 SHA256 3e7c7f5d7614c905b4a6a24f27fcbd544d4bc9340f09402f0ead8317c2279219 SHA512 43b86b6c40fce5b0fba84f8f876c74d47be7b49faaae016cfe26fbd4d547df89f904c5c80e555c4c42b4725a2186ff3e9830f7730342d643d8bdfb4c80c71a8e WHIRLPOOL 2620736ebdbff295b6bcf64b9c59a83595236b68b946c82ded3af4fc42614a08d85dee7e7df18cb2b27d4c0c125cf230f965e423fd29c805908db1c592b1ebee
 DIST hardened-patches-3.2.48-2.extras.tar.bz2 1448589 SHA256 3cd98485742f3239dd76b539eaee2c6af51847f269dfd22d2ec2779aadcaa6db SHA512 76bf331630ae28b29f3dd4f703db81338581888093e4568a258bda49aab72117688613382e9ebb7e60e671770ec3c9a804aee9e3c722a3bc6dfa121ededf598d WHIRLPOOL abb1424d60a5c6d220c10c7c672c72c0839cb3964533f57e2e5246a72d01de1a066c91fc34ed1f6575b72170245460c19c833033086de9d0458848b6dbd60c40
 DIST hardened-patches-3.2.48-5.extras.tar.bz2 1462669 SHA256 cc1b3e73f94ad671f7d2b4647296f1d05dabc2216001b68cb0e956bd6cfe9081 SHA512 30f839057aae3cedd1e39f97736307d7721f03fb0ff8b47eb6b79c53b0eb2ca59908b85dd85f1ddcdddd3becf7fa7886341e1d802e21e2635ddc715cc7ea6b13 WHIRLPOOL bf2d8fa4c9492b59ca62da896a4a2e18ba3116c38168eeff5ea0b8c9139477c57712b6ce9dabb500d36e3d8c9878fa8fecfa4ad5e37d0a5446f2537539ae62c7
-DIST hardened-patches-3.2.50-3.extras.tar.bz2 1517959 SHA256 24d0e98c550927dd91bac008aff943a8efd9731698bff0c2cdaf096bd65081a7 SHA512 86d94ba9ff8f450528a084ea8fd2f5492f4fd3870a33217623c28f44d233a1ad7f019043d4eb15a63468f1c9f4259d3341f07dc2912310a71b643c1274719ba7 WHIRLPOOL 7f640839b0952b9dd7af2dd617f3593659d1f8ec647bb54241fa092e3ffe74b617289a60647b290b1f636483d65649ac8f64933cbce45357f0d12663a8c3129f
-DIST hardened-patches-3.2.50-5.extras.tar.bz2 1516339 SHA256 4e1a9dbb26a7476eb57bb9f2c040c134529f002e39552afc101966035e662200 SHA512 8854df1e5066efdc4186012ec11a51cd54dafb1aec9aa7def1e641211e7b959610e89da333150c52cd2fa6f0afab8ed0270252fa28352516d380c32cb5d90bc2 WHIRLPOOL bbef83580eb04bca05bc3011a1f582aaf168fd6fd7f74f3ab29ffa2e2b64319156fa24c5210b23d40b7c30b61ded401b33dd5b8918f144d8df934ec7d55e4cb1
-DIST hardened-patches-3.9.5-1.extras.tar.bz2 707581 SHA256 143f52f7a3db7e5be9050f33f5110ac6b7582a74d4daaf91de9395024e2c229f SHA512 16ed8dfa6958ffbc6df10833c8e0c2bd47b287b177b95d607636fd2dc53ed69c5c38d3928569c582eaad0a555bd0b8148e43830a288a5f99e8e6f7322d5836e9 WHIRLPOOL aaed5d62a8103ee595dad1dc8bce2df5212de55707cd7a1ff3e498578c223340fa9ac98a220082e18c211c80ea7c54b8d4ab4c8e064252dc30e7595879a92712
+DIST hardened-patches-3.2.50-6.extras.tar.bz2 1526712 SHA256 951ca673667ad4712d682a7a0f5c53ca1e9eb6c4fcc2e43c2057fe7e7566ec5a SHA512 dc75a3f6460f176ee4a655b777f20541e3ad3b5a10e24e3a7e89cba26b7095eaad2153a84fe49f2f413ffdf890b8811cc98ab4c0150614a7861b9d27e1004a63 WHIRLPOOL 787c76183add35609953ff103087a1f996fe3775c8fc0da8899377d4686c97354c46b4895a35a92297782ba326ff67702393586e01de985608e3f6f564839268
 DIST hardened-patches-3.9.9-1.extras.tar.bz2 715576 SHA256 4bcecff04fbf8be900cb87b9493683c15a5f8b35ebb95b5483ae942e56a7d3db SHA512 7437b377ce27464c68819157284aa53d34e929de18d693913d59bf0a9081795b1a351be402946063a6ac384fa588c8e8eeab7e7956b98598e486ae7bda64ecb9 WHIRLPOOL b36c8723e08b7b68ce88e700c848a75d7fa3eb4707392a70939f6a19399c6f6757391c872739d923adf2e01a2278c7daa2508439540ccb4007639aefcbb04494
 DIST linux-2.6.32.tar.xz 52620720 SHA256 723106c298c5ba8733bb51ecc106b05e332a18490edc5f61cc6e57dbb36dcc46 SHA512 f8570daf2806eb191fce54cc7358577b0571bb295a75bd86db630d6136b328ae48e4732554b2d1886c64b0a0018bf0b9105dcface978a5005d1b77789aa40312 WHIRLPOOL bfcb4b186f7c4b60e69674a85d20a8e92b5efd05941b550401ef446cc6b20c9ed197f920d1cd9250c0e518c05308b9225f7ababe41cdfc83570412117b2ee555
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r170.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r170.ebuild
deleted file mode 100644
index fe3f2c131d68..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r170.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r170.ebuild,v 1.2 2013/06/24 20:56:39 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-175"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild
index 4cec37236385..f9c7e5e80ea7 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild,v 1.1 2013/07/21 16:06:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r178.ebuild,v 1.2 2013/09/05 22:04:09 blueness Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=sys-devel/gcc-4.5"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild
index d7c7b370ab65..a94f5e918b77 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild,v 1.1 2013/07/21 16:09:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.10.1-r1.ebuild,v 1.2 2013/09/05 22:04:09 blueness Exp $
 
 EAPI="5"
 
@@ -27,7 +27,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=sys-devel/gcc-4.5"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.10.7-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.10.10.ebuild
similarity index 89%
rename from sys-kernel/hardened-sources/hardened-sources-3.10.7-r1.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.10.10.ebuild
index af4956db0666..ecf3dedaabfa 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.10.7-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.10.10.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.10.7-r1.ebuild,v 1.1 2013/08/20 19:47:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.10.10.ebuild,v 1.1 2013/09/05 21:59:36 blueness Exp $
 
 EAPI="5"
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="13"
+K_GENPATCHES_VER="17"
 K_DEBLOB_AVAILABLE="1"
 
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.10.9-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.10.9-r1.ebuild
deleted file mode 100644
index 1b0923816f0d..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.10.9-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.10.9-r1.ebuild,v 1.1 2013/08/30 11:23:03 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
-	1500_XATTR_USER_PREFIX.patch
-	2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.46-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.46-r1.ebuild
deleted file mode 100644
index 9b4b8694b736..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.46-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.46-r1.ebuild,v 1.2 2013/06/24 20:56:39 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild
index b7f4cad50738..0ae586dd0ac1 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild,v 1.1 2013/07/21 16:08:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.48-r4.ebuild,v 1.2 2013/09/05 22:04:09 blueness Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE="deblob"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=sys-devel/gcc-4.5"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.50-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.50-r4.ebuild
deleted file mode 100644
index 4d17016fbfe2..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.50-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.50-r4.ebuild,v 1.1 2013/08/30 11:19:40 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="16"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.50-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.50-r5.ebuild
similarity index 92%
rename from sys-kernel/hardened-sources/hardened-sources-3.2.50-r2.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.2.50-r5.ebuild
index 93a2c29065d9..17a6eaaee297 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.50-r2.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.50-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.50-r2.ebuild,v 1.1 2013/08/19 20:23:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.50-r5.ebuild,v 1.1 2013/09/05 21:57:57 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.9.5.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.9.5.ebuild
deleted file mode 100644
index 6dbd9527fae9..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.9.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.9.5.ebuild,v 1.2 2013/06/24 20:56:39 blueness Exp $
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="9"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="1500_XATTR_USER_PREFIX.patch 1505_dmesg-restrict-fix.patch 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.9.1*"
-
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/linux-headers/linux-headers-3.9.ebuild b/sys-kernel/linux-headers/linux-headers-3.9.ebuild
index 374c83bd4a90..d8282c257911 100644
--- a/sys-kernel/linux-headers/linux-headers-3.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.9.ebuild,v 1.11 2013/09/05 10:46:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.9.ebuild,v 1.12 2013/09/05 19:25:11 ago Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 20892a5b09b0..ae9b23ae72fa 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -4,6 +4,7 @@ DIST raspberrypi-firmware-9e9acf8978.tar.gz 94626824 SHA256 4e7e9e725fa805bba481
 DIST raspberrypi-firmware-9f61d5480c.tar.gz 93889096 SHA256 a7cf3b9a8418dd975c0fc598b2db9eaebae2faebbd0417802ebaa48732760fca SHA512 bda40fced5ff27bff413ef9f29f0d3b797f9d614961e1c0f92bb0a122df2a76640726ada8ab00d81c48f5aaa88be69fbe83340d42aa98e12590c3a04b0015d35 WHIRLPOOL 274c6c96ff4e84c9e468f24eb90b26890fa44588b6c106673bd881d276511398819e387c1638fc70d002bbd874a3a58cfb3472822e1b387a814271cc7251afd8
 DIST raspberrypi-firmware-ba8059e890.tar.gz 93890924 SHA256 fadc9c1eae192d214cce1e3870f46d3a251acce3df901cc9bb80f24feebc9090 SHA512 1ca799b9c61f1ac3b149b64b30b75643597c2829d5b15053f02004a692bae570e157f06c51d295f5951462558a65ad9e126c59255e956595e0740965c8615a97 WHIRLPOOL 37a1fd034f722925f5d5fc0a40b5f882ca414bbc889d5da1a187e05745ec171dbd00dde0271231b88698cd9e7952fb48011dc726adbe00f33bf4d9d5b0da41b8
 DIST raspberrypi-firmware-c26501f38b.tar.gz 94624522 SHA256 b122ad9f0dc2e1f2165910083b095212b088f223649967192d9c85c39584703b SHA512 30bca98680f9026b74e361b67c232ba8897589d5b8209706647394995fc485f70bb4ceddb75c7725b700eb05948fb396365179ef62b057f69207827232d29392 WHIRLPOOL 223b3462e634e9286f3f72d92c3ddc783ada9e23c3543f338311ba86627a4406224c7444d6a5aa516e400c048a61ea0d3f068753fae3b7a21dac24a8a831539b
+DIST raspberrypi-image-3.10.10_pre-r20130830.tar.xz 55232432 SHA256 f17b4ae82579b9bbcd9e17c4c5c66db9a73817b115fc60830a2c37f891231318 SHA512 54fa9cec416d684a188f528fc82f46e2f94f5d55664e8ba47846c712752d4c3312b4d781af1b4a1b141e9dc7176edbb14e9cafdc26f9ae5547b0a8a12b9608f7 WHIRLPOOL 11f336c8aaf6e614970ece2934559015b1ea08b249f8d016e51bd5ee08f169bc474efe172b7b82dc4e8ed790dea0da3cabc655134164b33f9eb2a32ac8dc81af
 DIST raspberrypi-image-3.10.4_pre-r20130802.tar.xz 51833888 SHA256 e57b683d93fcfb6c0d9d4c75cb2cd82a594c50e936128c370d5f74723557df46 SHA512 d86cb92b1f5e9f758dad646603f550b53325f252e1cf05a0582749b2921e0626a0c360b08675c7a41a48f0182fc3c4f2604249e9d726c59541a744044a1c5dad WHIRLPOOL 50763baf289e4f8dbec5114cb1ff9397435ab480603787d80fdad539c604ec4cb10afb2525d9574ea02f3a1ad3e23f3a15252b026d42358fb29fecb12ae9905c
 DIST raspberrypi-image-3.10.6_pre-r20130805.tar.xz 51847140 SHA256 4b8f7c02da9eab24b3053150bd70253b20f5eed0450f55ec115410eab4328a86 SHA512 da853d3f0e35efbece772eb3eebba3dd8d092511f8ba59c0adaed669b401c14924ceb2fea32a05c5eff58b6a0dc280667c247041ed685c034510d71d26ffcf04 WHIRLPOOL 5e2cb448a706fb4d207af18861a8ba537fe1668ed34ae345b790df65e62c6149e02610b51f115af16fa277cf64f98a7b616ef7a3728a344b9d313a2958e59f1e
 DIST raspberrypi-image-3.10.7_pre-r20130815.tar.xz 51856812 SHA256 04c9edd8ea1d1b1705dac4bd6d9188250d0d62850061b558f17dc4b5262c9f73 SHA512 b7b5f626de2c9e447c2edab008fb734ee39fd3c180f32ac619d071bb5e59805ac6da85ed9c30f3c62eb116bd7fdc0508ef0225d14b8cc6933dec0b2144dd0e23 WHIRLPOOL a605e369b286a5540e0198bb4fd6076f56a1e37e507c07936961b1ecf20de868dc69bc307fe1a90ab444730a2e476d446972d6689ddceca88778bd9f465007d8
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.10_pre-r20130830.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.10_pre-r20130830.ebuild
new file mode 100644
index 000000000000..2635281e2239
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.10_pre-r20130830.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/raspberrypi-image/raspberrypi-image-3.10.10_pre-r20130830.ebuild,v 1.1 2013/09/05 19:58:04 xmw Exp $
+
+EAPI=5
+
+DESCRIPTION="Raspberry PI precompiled kernel and modules"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+SRC_URI="https://dev.gentoo.org/~xmw/${PN}/${PF}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="${PVR}"
+KEYWORDS="~arm -*"
+IUSE=""
+
+S=${WORKDIR}
+
+RESTRICT="binchecks mirror strip"
+
+src_prepare() {
+	#hide kernel vectors
+	chmod go= boot/System* || die
+	# on a filesystem with permissions
+	mv boot/System* lib/modules/* || die
+	elog "System.map has been moved to $(ls -d lib/modules/*)"
+}
+
+src_install() {
+	mv -v boot "${D}" || die
+
+	dodir /lib
+	mv -v lib/modules "${D}"/lib || die
+}
diff --git a/sys-libs/gpm/gpm-1.20.7-r1.ebuild b/sys-libs/gpm/gpm-1.20.7-r1.ebuild
index ded8dab6f90a..f70343e3e702 100644
--- a/sys-libs/gpm/gpm-1.20.7-r1.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.7-r1.ebuild,v 1.2 2013/09/05 10:42:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.7-r1.ebuild,v 1.4 2013/09/05 14:53:09 jer Exp $
 
 # emacs support disabled due to #99533 #335900
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="selinux static-libs"
 
 RDEPEND="sys-libs/ncurses
diff --git a/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild b/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild
index 261b45c93d48..db1a204acf92 100644
--- a/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild
+++ b/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild,v 1.3 2013/08/20 20:04:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.1.13-r4.ebuild,v 1.4 2013/09/05 19:44:50 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_1 python3_2 )
+PYTHON_COMPAT=( python2_7 python3_2 )
 USE_RUBY="ruby18 ruby19"
 RUBY_OPTIONAL="yes"
 
diff --git a/sys-libs/tevent/tevent-0.9.19.ebuild b/sys-libs/tevent/tevent-0.9.19.ebuild
index 968194f07ce8..8fed7e53145b 100644
--- a/sys-libs/tevent/tevent-0.9.19.ebuild
+++ b/sys-libs/tevent/tevent-0.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.19.ebuild,v 1.12 2013/09/04 07:58:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.19.ebuild,v 1.13 2013/09/05 12:22:07 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -13,7 +13,7 @@ SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sys-libs/talloc-2.0.8[python]
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index ecac9d8afbc5..4f7201e303fd 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -1,3 +1,3 @@
-DIST phc-intel-0.3.199.3_pre.tar.bz2 15508 SHA256 4441af7a0a1335a920b0d18a46483a64fbae8e57d98a6bdbf31dbacac2bbdf82
 DIST phc-intel-0.3.2.10.tar.bz2 20680 SHA256 8483e071ad2644c339539ac5298c7a31a12212fd9a68baa1f6766dad146510f5
 DIST phc-intel-0.3.2.12.1.tar.bz2 14412 SHA256 4f66989d424d328b205873da1b0363e75f27d7912e0e93c1cad3407c17be8264 SHA512 f9a63300fe1d7b42d1167c3b6d1f5b75cb707d8dac26d2d91f40466a26afedf3dccb76a58bb4764233ade6c309cdd554f869cdaeac04bf521607644afb709427 WHIRLPOOL dd064a2f5a67fc2aed96aa32bce4e040daf8468d2a215dbb08e11b00de039e7ac6179ea756a94035478a885a202f13517ec45a8dd8dfcd072436a0c8509e2fd0
+DIST phc-intel-pack-rev11.tar.bz2 76485 SHA256 38f4bd923228ef61315a0739f32504692d7f1809494bdc369658222f6f873479 SHA512 2bb718cc78219db8698f671ecfcc895cfd5be66d7301c56e91d24a534d308121a8a76cbd1259022e8e524b359eee34b7965da952254b26f9cb6a0bd81ff88981 WHIRLPOOL 8d40a2f4319764f15b413621ff30d39b1667281fe08a570b18e32f53197b421c85c0f0a62b99e52c9ccdac887cbcf41366790aab1b86eb79f12799455185d481
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch
deleted file mode 100644
index c456887a541c..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.35.patch
+++ /dev/null
@@ -1,529 +0,0 @@
---- /tmp/acpi-cpufreq.c.orig	2010-08-07 09:25:45.510440771 +0200
-+++ phc-intel-0.3.2-12-1/phc-intel.c
-@@ -25,6 +25,10 @@
-  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  */
- 
-+/* This file has been patched with Linux PHC: www.linux-phc.org
-+* Patch version: linux-phc-0.3.2
-+*/
-+
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -62,12 +66,17 @@
- };
- 
- #define INTEL_MSR_RANGE		(0xffff)
-+#define INTEL_MSR_VID_MASK	(0x00ff)
-+#define INTEL_MSR_FID_MASK	(0xff00)
-+#define INTEL_MSR_FID_SHIFT	(0x8)
-+#define PHC_VERSION_STRING	"0.3.2:2"
- 
- struct acpi_cpufreq_data {
- 	struct acpi_processor_performance *acpi_data;
- 	struct cpufreq_frequency_table *freq_table;
- 	unsigned int resume;
- 	unsigned int cpu_feature;
-+	acpi_integer *original_controls;
- };
- 
- static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
-@@ -103,13 +112,14 @@
- static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
- {
- 	int i;
-+	u32 fid;
- 	struct acpi_processor_performance *perf;
- 
--	msr &= INTEL_MSR_RANGE;
-+	fid = msr & INTEL_MSR_FID_MASK;
- 	perf = data->acpi_data;
- 
- 	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
--		if (msr == perf->states[data->freq_table[i].index].status)
-+		if (fid == (perf->states[data->freq_table[i].index].status & INTEL_MSR_FID_MASK))
- 			return data->freq_table[i].frequency;
- 	}
- 	return data->freq_table[0].frequency;
-@@ -704,6 +714,8 @@
- 		per_cpu(acfreq_data, policy->cpu) = NULL;
- 		acpi_processor_unregister_performance(data->acpi_data,
- 						      policy->cpu);
-+		if (data->original_controls)
-+			kfree(data->original_controls);
- 		kfree(data);
- 	}
- 
-@@ -721,8 +733,470 @@
- 	return 0;
- }
- 
-+
-+/* sysfs interface to change operating points voltages */
-+
-+static unsigned int extract_fid_from_control(unsigned int control)
-+{
-+	return ((control & INTEL_MSR_FID_MASK) >> INTEL_MSR_FID_SHIFT);
-+}
-+
-+static unsigned int extract_vid_from_control(unsigned int control)
-+{
-+	return (control & INTEL_MSR_VID_MASK);
-+}
-+
-+
-+static bool check_cpu_control_capability(struct acpi_cpufreq_data *data) {
-+ /* check if the cpu we are running on is capable of setting new control data
-+  * 
-+  */
-+	if (unlikely(data == NULL || 
-+	             data->acpi_data == NULL || 
-+	             data->freq_table == NULL ||
-+	             data->cpu_feature != SYSTEM_INTEL_MSR_CAPABLE)) {
-+		return false;
-+	} else {
-+		return true;
-+	};
-+}
-+
-+
-+static ssize_t check_origial_table (struct acpi_cpufreq_data *data)
-+{
-+
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int state_index;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	if (data->original_controls == NULL) {
-+		// Backup original control values
-+		data->original_controls = kcalloc(acpi_data->state_count,
-+		                                  sizeof(acpi_integer), GFP_KERNEL);
-+		if (data->original_controls == NULL) {
-+			printk("failed to allocate memory for original control values\n");
-+			return -ENOMEM;
-+		}
-+		for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+			data->original_controls[state_index] = acpi_data->states[state_index].control;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static ssize_t show_freq_attr_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_fids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's frequeny id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", fid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(data->original_controls[freq_table[i].index]);
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+
-+static ssize_t store_freq_attr_vids(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the voltage id's for the related frequency
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int freq_index;
-+	unsigned int state_index;
-+	unsigned int new_vid;
-+	unsigned int original_vid;
-+	unsigned int new_control;
-+	unsigned int original_control;
-+	const char *curr_buf = buf;
-+	char *next_buf;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	/* for each value taken from the sysfs interfalce (phc_vids) get entrys and convert them to unsigned long integers*/
-+	for (freq_index = 0; freq_table[freq_index].frequency != CPUFREQ_TABLE_END; freq_index++) {
-+		new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if (next_buf == curr_buf) {
-+			if ((curr_buf - buf == count - 1) && (*curr_buf == '\n')) {   //end of line?
-+				curr_buf++;
-+				break;
-+			}
-+			//if we didn't got end of line but there is nothing more to read something went wrong...
-+			printk("failed to parse vid value at %i (%s)\n", freq_index, curr_buf);
-+			return -EINVAL;
-+		}
-+
-+		state_index = freq_table[freq_index].index;
-+		original_control = data->original_controls[state_index];
-+		original_vid = original_control & INTEL_MSR_VID_MASK;
-+		
-+		/* before we store the values we do some checks to prevent 
-+		 * users to set up values higher than the default one
-+		 */
-+		if (new_vid <= original_vid) {
-+			new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+			dprintk("setting control at %i to %x (default is %x)\n",
-+			        freq_index, new_control, original_control);
-+			acpi_data->states[state_index].control = new_control;
-+
-+		} else {
-+			printk("skipping vid at %i, %u is greater than default %u\n",
-+			       freq_index, new_vid, original_vid);
-+		}
-+
-+		curr_buf = next_buf;
-+		/* jump over value seperators (space or comma).
-+		 * There could be more than one space or comma character
-+		 * to separate two values so we better do it using a loop.
-+		 */
-+		while ((curr_buf - buf < count) && ((*curr_buf == ' ') || (*curr_buf == ','))) {
-+			curr_buf++;
-+		}
-+	}
-+
-+	/* set new voltage for current frequency */
-+	data->resume = 1;
-+	acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+
-+	return curr_buf - buf;
-+}
-+
-+static ssize_t store_freq_attr_controls(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the controls (frequency id's and related voltage id's)
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	const char   *curr_buf;
-+	unsigned int  op_count;
-+	unsigned int  state_index;
-+	int           isok;
-+	char         *next_buf;
-+	ssize_t       retval;
-+	unsigned int  new_vid;
-+	unsigned int  original_vid;
-+	unsigned int  new_fid;
-+	unsigned int  old_fid;
-+	unsigned int  original_control;
-+	unsigned int  old_control;
-+	unsigned int  new_control;
-+	int           found;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV;
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	op_count = 0;
-+	curr_buf = buf;
-+	next_buf = NULL;
-+	isok     = 1;
-+	
-+	while ( (isok) && (curr_buf != NULL) )
-+	{
-+		op_count++;
-+		// Parse fid
-+		new_fid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if ((next_buf != curr_buf) && (next_buf != NULL))
-+		{
-+			// Parse separator between frequency and voltage 
-+			curr_buf = next_buf;
-+			next_buf = NULL;
-+			if (*curr_buf==':')
-+			{
-+				curr_buf++;
-+				// Parse vid
-+				new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+				if ((next_buf != curr_buf) && (next_buf != NULL))
-+				{
-+					found = 0;
-+					for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+						old_control = acpi_data->states[state_index].control;
-+						old_fid = extract_fid_from_control(old_control);
-+						if (new_fid == old_fid)
-+						{
-+							found = 1;
-+							original_control = data->original_controls[state_index];
-+							original_vid = extract_vid_from_control(original_control);
-+							if (new_vid <= original_vid)
-+							{
-+								new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+								dprintk("setting control at %i to %x (default is %x)\n",
-+								        state_index, new_control, original_control);
-+								acpi_data->states[state_index].control = new_control;
-+
-+							} else {
-+								printk("skipping vid at %i, %u is greater than default %u\n",
-+								       state_index, new_vid, original_vid);
-+							}
-+						}
-+					}
-+
-+					if (found == 0)
-+					{
-+						printk("operating point # %u not found (FID = %u)\n", op_count, new_fid);
-+						isok = 0;
-+					}
-+
-+					// Parse seprator before next operating point, if any
-+					curr_buf = next_buf;
-+					next_buf = NULL;
-+					if ((*curr_buf == ',') || (*curr_buf == ' '))
-+						curr_buf++;
-+					else
-+						curr_buf = NULL;
-+				}
-+				else
-+				{
-+					printk("failed to parse VID of operating point # %u (%s)\n", op_count, curr_buf);
-+					isok = 0;
-+				}
-+			}
-+			else
-+			{
-+				printk("failed to parse operating point # %u (%s)\n", op_count, curr_buf);
-+				isok = 0;
-+			}
-+		}
-+		else
-+		{
-+			printk("failed to parse FID of operating point # %u (%s)\n", op_count, curr_buf);
-+			isok = 0;
-+		}
-+	}
-+
-+	if (isok)
-+	{
-+		retval = count;
-+		/* set new voltage at current frequency */
-+		data->resume = 1;
-+		acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+	}
-+	else
-+	{
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+static ssize_t show_freq_attr_phc_version(struct cpufreq_policy *policy, char *buf)
-+ /* print out the phc version string set at the beginning of that file
-+  */
-+{
-+	ssize_t count = 0;
-+	count += sprintf(&buf[count], "%s\n", PHC_VERSION_STRING);
-+	return count;
-+}
-+
-+
-+
-+static struct freq_attr cpufreq_freq_attr_phc_version =
-+{
-+	/*display phc's version string*/
-+       .attr = { .name = "phc_version", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_phc_version,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_vids =
-+{
-+	/*display phc's voltage id's for the cpu*/
-+       .attr = { .name = "phc_vids", .mode = 0644, .owner = THIS_MODULE },
-+       .show = show_freq_attr_vids,
-+       .store = store_freq_attr_vids,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_vids =
-+{
-+	/*display acpi's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_default_vids", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_default_vids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_fids =
-+{
-+	/*display phc's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_fids", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_fids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_controls =
-+{
-+	/*display phc's current voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_controls", .mode = 0644, .owner = THIS_MODULE },
-+       .show = show_freq_attr_controls,
-+       .store = store_freq_attr_controls,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_controls =
-+{
-+	/*display acpi's default voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_default_controls", .mode = 0444, .owner = THIS_MODULE },
-+       .show = show_freq_attr_default_controls,
-+       .store = NULL,
-+};
-+
- static struct freq_attr *acpi_cpufreq_attr[] = {
--	&cpufreq_freq_attr_scaling_available_freqs,
-+ 	&cpufreq_freq_attr_scaling_available_freqs,
-+	&cpufreq_freq_attr_phc_version,
-+	&cpufreq_freq_attr_vids,
-+	&cpufreq_freq_attr_default_vids,
-+	&cpufreq_freq_attr_fids,
-+	&cpufreq_freq_attr_controls,
-+	&cpufreq_freq_attr_default_controls,
- 	NULL,
- };
- 
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.36.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.36.patch
deleted file mode 100644
index 80d3b239d04a..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.36.patch
+++ /dev/null
@@ -1,529 +0,0 @@
---- /tmp/acpi-cpufreq.c.orig	2010-08-07 09:25:45.510440771 +0200
-+++ phc-intel-0.3.2-12-1/phc-intel.c
-@@ -25,6 +25,10 @@
-  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  */
- 
-+/* This file has been patched with Linux PHC: www.linux-phc.org
-+* Patch version: linux-phc-0.3.2
-+*/
-+
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -62,12 +66,17 @@
- };
- 
- #define INTEL_MSR_RANGE		(0xffff)
-+#define INTEL_MSR_VID_MASK	(0x00ff)
-+#define INTEL_MSR_FID_MASK	(0xff00)
-+#define INTEL_MSR_FID_SHIFT	(0x8)
-+#define PHC_VERSION_STRING	"0.3.2:2"
- 
- struct acpi_cpufreq_data {
- 	struct acpi_processor_performance *acpi_data;
- 	struct cpufreq_frequency_table *freq_table;
- 	unsigned int resume;
- 	unsigned int cpu_feature;
-+	acpi_integer *original_controls;
- };
- 
- static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
-@@ -103,13 +112,14 @@
- static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
- {
- 	int i;
-+	u32 fid;
- 	struct acpi_processor_performance *perf;
- 
--	msr &= INTEL_MSR_RANGE;
-+	fid = msr & INTEL_MSR_FID_MASK;
- 	perf = data->acpi_data;
- 
- 	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
--		if (msr == perf->states[data->freq_table[i].index].status)
-+		if (fid == (perf->states[data->freq_table[i].index].status & INTEL_MSR_FID_MASK))
- 			return data->freq_table[i].frequency;
- 	}
- 	return data->freq_table[0].frequency;
-@@ -704,6 +714,8 @@
- 		per_cpu(acfreq_data, policy->cpu) = NULL;
- 		acpi_processor_unregister_performance(data->acpi_data,
- 						      policy->cpu);
-+		if (data->original_controls)
-+			kfree(data->original_controls);
- 		kfree(data);
- 	}
- 
-@@ -721,8 +733,470 @@
- 	return 0;
- }
- 
-+
-+/* sysfs interface to change operating points voltages */
-+
-+static unsigned int extract_fid_from_control(unsigned int control)
-+{
-+	return ((control & INTEL_MSR_FID_MASK) >> INTEL_MSR_FID_SHIFT);
-+}
-+
-+static unsigned int extract_vid_from_control(unsigned int control)
-+{
-+	return (control & INTEL_MSR_VID_MASK);
-+}
-+
-+
-+static bool check_cpu_control_capability(struct acpi_cpufreq_data *data) {
-+ /* check if the cpu we are running on is capable of setting new control data
-+  * 
-+  */
-+	if (unlikely(data == NULL || 
-+	             data->acpi_data == NULL || 
-+	             data->freq_table == NULL ||
-+	             data->cpu_feature != SYSTEM_INTEL_MSR_CAPABLE)) {
-+		return false;
-+	} else {
-+		return true;
-+	};
-+}
-+
-+
-+static ssize_t check_origial_table (struct acpi_cpufreq_data *data)
-+{
-+
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int state_index;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	if (data->original_controls == NULL) {
-+		// Backup original control values
-+		data->original_controls = kcalloc(acpi_data->state_count,
-+		                                  sizeof(acpi_integer), GFP_KERNEL);
-+		if (data->original_controls == NULL) {
-+			printk("failed to allocate memory for original control values\n");
-+			return -ENOMEM;
-+		}
-+		for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+			data->original_controls[state_index] = acpi_data->states[state_index].control;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static ssize_t show_freq_attr_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_fids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's frequeny id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", fid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(data->original_controls[freq_table[i].index]);
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+
-+static ssize_t store_freq_attr_vids(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the voltage id's for the related frequency
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int freq_index;
-+	unsigned int state_index;
-+	unsigned int new_vid;
-+	unsigned int original_vid;
-+	unsigned int new_control;
-+	unsigned int original_control;
-+	const char *curr_buf = buf;
-+	char *next_buf;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	/* for each value taken from the sysfs interfalce (phc_vids) get entrys and convert them to unsigned long integers*/
-+	for (freq_index = 0; freq_table[freq_index].frequency != CPUFREQ_TABLE_END; freq_index++) {
-+		new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if (next_buf == curr_buf) {
-+			if ((curr_buf - buf == count - 1) && (*curr_buf == '\n')) {   //end of line?
-+				curr_buf++;
-+				break;
-+			}
-+			//if we didn't got end of line but there is nothing more to read something went wrong...
-+			printk("failed to parse vid value at %i (%s)\n", freq_index, curr_buf);
-+			return -EINVAL;
-+		}
-+
-+		state_index = freq_table[freq_index].index;
-+		original_control = data->original_controls[state_index];
-+		original_vid = original_control & INTEL_MSR_VID_MASK;
-+		
-+		/* before we store the values we do some checks to prevent 
-+		 * users to set up values higher than the default one
-+		 */
-+		if (new_vid <= original_vid) {
-+			new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+			dprintk("setting control at %i to %x (default is %x)\n",
-+			        freq_index, new_control, original_control);
-+			acpi_data->states[state_index].control = new_control;
-+
-+		} else {
-+			printk("skipping vid at %i, %u is greater than default %u\n",
-+			       freq_index, new_vid, original_vid);
-+		}
-+
-+		curr_buf = next_buf;
-+		/* jump over value seperators (space or comma).
-+		 * There could be more than one space or comma character
-+		 * to separate two values so we better do it using a loop.
-+		 */
-+		while ((curr_buf - buf < count) && ((*curr_buf == ' ') || (*curr_buf == ','))) {
-+			curr_buf++;
-+		}
-+	}
-+
-+	/* set new voltage for current frequency */
-+	data->resume = 1;
-+	acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+
-+	return curr_buf - buf;
-+}
-+
-+static ssize_t store_freq_attr_controls(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the controls (frequency id's and related voltage id's)
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	const char   *curr_buf;
-+	unsigned int  op_count;
-+	unsigned int  state_index;
-+	int           isok;
-+	char         *next_buf;
-+	ssize_t       retval;
-+	unsigned int  new_vid;
-+	unsigned int  original_vid;
-+	unsigned int  new_fid;
-+	unsigned int  old_fid;
-+	unsigned int  original_control;
-+	unsigned int  old_control;
-+	unsigned int  new_control;
-+	int           found;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV;
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	op_count = 0;
-+	curr_buf = buf;
-+	next_buf = NULL;
-+	isok     = 1;
-+	
-+	while ( (isok) && (curr_buf != NULL) )
-+	{
-+		op_count++;
-+		// Parse fid
-+		new_fid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if ((next_buf != curr_buf) && (next_buf != NULL))
-+		{
-+			// Parse separator between frequency and voltage 
-+			curr_buf = next_buf;
-+			next_buf = NULL;
-+			if (*curr_buf==':')
-+			{
-+				curr_buf++;
-+				// Parse vid
-+				new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+				if ((next_buf != curr_buf) && (next_buf != NULL))
-+				{
-+					found = 0;
-+					for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+						old_control = acpi_data->states[state_index].control;
-+						old_fid = extract_fid_from_control(old_control);
-+						if (new_fid == old_fid)
-+						{
-+							found = 1;
-+							original_control = data->original_controls[state_index];
-+							original_vid = extract_vid_from_control(original_control);
-+							if (new_vid <= original_vid)
-+							{
-+								new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+								dprintk("setting control at %i to %x (default is %x)\n",
-+								        state_index, new_control, original_control);
-+								acpi_data->states[state_index].control = new_control;
-+
-+							} else {
-+								printk("skipping vid at %i, %u is greater than default %u\n",
-+								       state_index, new_vid, original_vid);
-+							}
-+						}
-+					}
-+
-+					if (found == 0)
-+					{
-+						printk("operating point # %u not found (FID = %u)\n", op_count, new_fid);
-+						isok = 0;
-+					}
-+
-+					// Parse seprator before next operating point, if any
-+					curr_buf = next_buf;
-+					next_buf = NULL;
-+					if ((*curr_buf == ',') || (*curr_buf == ' '))
-+						curr_buf++;
-+					else
-+						curr_buf = NULL;
-+				}
-+				else
-+				{
-+					printk("failed to parse VID of operating point # %u (%s)\n", op_count, curr_buf);
-+					isok = 0;
-+				}
-+			}
-+			else
-+			{
-+				printk("failed to parse operating point # %u (%s)\n", op_count, curr_buf);
-+				isok = 0;
-+			}
-+		}
-+		else
-+		{
-+			printk("failed to parse FID of operating point # %u (%s)\n", op_count, curr_buf);
-+			isok = 0;
-+		}
-+	}
-+
-+	if (isok)
-+	{
-+		retval = count;
-+		/* set new voltage at current frequency */
-+		data->resume = 1;
-+		acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+	}
-+	else
-+	{
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+static ssize_t show_freq_attr_phc_version(struct cpufreq_policy *policy, char *buf)
-+ /* print out the phc version string set at the beginning of that file
-+  */
-+{
-+	ssize_t count = 0;
-+	count += sprintf(&buf[count], "%s\n", PHC_VERSION_STRING);
-+	return count;
-+}
-+
-+
-+
-+static struct freq_attr cpufreq_freq_attr_phc_version =
-+{
-+	/*display phc's version string*/
-+       .attr = { .name = "phc_version", .mode = 0444 },
-+       .show = show_freq_attr_phc_version,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_vids =
-+{
-+	/*display phc's voltage id's for the cpu*/
-+       .attr = { .name = "phc_vids", .mode = 0644 },
-+       .show = show_freq_attr_vids,
-+       .store = store_freq_attr_vids,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_vids =
-+{
-+	/*display acpi's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_default_vids", .mode = 0444 },
-+       .show = show_freq_attr_default_vids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_fids =
-+{
-+	/*display phc's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_fids", .mode = 0444 },
-+       .show = show_freq_attr_fids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_controls =
-+{
-+	/*display phc's current voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_controls", .mode = 0644 },
-+       .show = show_freq_attr_controls,
-+       .store = store_freq_attr_controls,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_controls =
-+{
-+	/*display acpi's default voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_default_controls", .mode = 0444 },
-+       .show = show_freq_attr_default_controls,
-+       .store = NULL,
-+};
-+
- static struct freq_attr *acpi_cpufreq_attr[] = {
--	&cpufreq_freq_attr_scaling_available_freqs,
-+ 	&cpufreq_freq_attr_scaling_available_freqs,
-+	&cpufreq_freq_attr_phc_version,
-+	&cpufreq_freq_attr_vids,
-+	&cpufreq_freq_attr_default_vids,
-+	&cpufreq_freq_attr_fids,
-+	&cpufreq_freq_attr_controls,
-+	&cpufreq_freq_attr_default_controls,
- 	NULL,
- };
- 
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.37.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.37.patch
deleted file mode 100644
index 4789d84939b6..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-2.6.37.patch
+++ /dev/null
@@ -1,528 +0,0 @@
---- linux-2.6.37-gentoo/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
-+++ phc-intel-0.3.2-12-1/phc-intel.c
-@@ -25,6 +25,10 @@
-  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  */
- 
-+/* This file has been patched with Linux PHC: www.linux-phc.org
-+* Patch version: linux-phc-0.3.2
-+*/
-+
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -61,12 +65,17 @@
- };
- 
- #define INTEL_MSR_RANGE		(0xffff)
-+#define INTEL_MSR_VID_MASK	(0x00ff)
-+#define INTEL_MSR_FID_MASK	(0xff00)
-+#define INTEL_MSR_FID_SHIFT	(0x8)
-+#define PHC_VERSION_STRING	"0.3.2:2"
- 
- struct acpi_cpufreq_data {
- 	struct acpi_processor_performance *acpi_data;
- 	struct cpufreq_frequency_table *freq_table;
- 	unsigned int resume;
- 	unsigned int cpu_feature;
-+	acpi_integer *original_controls;
- };
- 
- static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
-@@ -102,13 +111,14 @@
- static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
- {
- 	int i;
-+	u32 fid;
- 	struct acpi_processor_performance *perf;
- 
--	msr &= INTEL_MSR_RANGE;
-+	fid = msr & INTEL_MSR_FID_MASK;
- 	perf = data->acpi_data;
- 
- 	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
--		if (msr == perf->states[data->freq_table[i].index].status)
-+		if (fid == (perf->states[data->freq_table[i].index].status & INTEL_MSR_FID_MASK))
- 			return data->freq_table[i].frequency;
- 	}
- 	return data->freq_table[0].frequency;
-@@ -701,6 +711,8 @@
- 		per_cpu(acfreq_data, policy->cpu) = NULL;
- 		acpi_processor_unregister_performance(data->acpi_data,
- 						      policy->cpu);
-+		if (data->original_controls)
-+			kfree(data->original_controls);
- 		kfree(data->freq_table);
- 		kfree(data);
- 	}
-@@ -719,8 +731,470 @@
- 	return 0;
- }
- 
-+/* sysfs interface to change operating points voltages */
-+
-+static unsigned int extract_fid_from_control(unsigned int control)
-+{
-+	return ((control & INTEL_MSR_FID_MASK) >> INTEL_MSR_FID_SHIFT);
-+}
-+
-+static unsigned int extract_vid_from_control(unsigned int control)
-+{
-+	return (control & INTEL_MSR_VID_MASK);
-+}
-+
-+
-+static bool check_cpu_control_capability(struct acpi_cpufreq_data *data) {
-+ /* check if the cpu we are running on is capable of setting new control data
-+  * 
-+  */
-+	if (unlikely(data == NULL || 
-+	             data->acpi_data == NULL || 
-+	             data->freq_table == NULL ||
-+	             data->cpu_feature != SYSTEM_INTEL_MSR_CAPABLE)) {
-+		return false;
-+	} else {
-+		return true;
-+	};
-+}
-+
-+
-+static ssize_t check_origial_table (struct acpi_cpufreq_data *data)
-+{
-+
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int state_index;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	if (data->original_controls == NULL) {
-+		// Backup original control values
-+		data->original_controls = kcalloc(acpi_data->state_count,
-+		                                  sizeof(acpi_integer), GFP_KERNEL);
-+		if (data->original_controls == NULL) {
-+			printk("failed to allocate memory for original control values\n");
-+			return -ENOMEM;
-+		}
-+		for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+			data->original_controls[state_index] = acpi_data->states[state_index].control;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static ssize_t show_freq_attr_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_fids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's frequeny id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", fid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(data->original_controls[freq_table[i].index]);
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+
-+static ssize_t store_freq_attr_vids(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the voltage id's for the related frequency
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int freq_index;
-+	unsigned int state_index;
-+	unsigned int new_vid;
-+	unsigned int original_vid;
-+	unsigned int new_control;
-+	unsigned int original_control;
-+	const char *curr_buf = buf;
-+	char *next_buf;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	/* for each value taken from the sysfs interfalce (phc_vids) get entrys and convert them to unsigned long integers*/
-+	for (freq_index = 0; freq_table[freq_index].frequency != CPUFREQ_TABLE_END; freq_index++) {
-+		new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if (next_buf == curr_buf) {
-+			if ((curr_buf - buf == count - 1) && (*curr_buf == '\n')) {   //end of line?
-+				curr_buf++;
-+				break;
-+			}
-+			//if we didn't got end of line but there is nothing more to read something went wrong...
-+			printk("failed to parse vid value at %i (%s)\n", freq_index, curr_buf);
-+			return -EINVAL;
-+		}
-+
-+		state_index = freq_table[freq_index].index;
-+		original_control = data->original_controls[state_index];
-+		original_vid = original_control & INTEL_MSR_VID_MASK;
-+		
-+		/* before we store the values we do some checks to prevent 
-+		 * users to set up values higher than the default one
-+		 */
-+		if (new_vid <= original_vid) {
-+			new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+			pr_debug("setting control at %i to %x (default is %x)\n",
-+			        freq_index, new_control, original_control);
-+			acpi_data->states[state_index].control = new_control;
-+
-+		} else {
-+			pr_debug("skipping vid at %i, %u is greater than default %u\n",
-+			       freq_index, new_vid, original_vid);
-+		}
-+
-+		curr_buf = next_buf;
-+		/* jump over value seperators (space or comma).
-+		 * There could be more than one space or comma character
-+		 * to separate two values so we better do it using a loop.
-+		 */
-+		while ((curr_buf - buf < count) && ((*curr_buf == ' ') || (*curr_buf == ','))) {
-+			curr_buf++;
-+		}
-+	}
-+
-+	/* set new voltage for current frequency */
-+	data->resume = 1;
-+	acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+
-+	return curr_buf - buf;
-+}
-+
-+static ssize_t store_freq_attr_controls(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the controls (frequency id's and related voltage id's)
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	const char   *curr_buf;
-+	unsigned int  op_count;
-+	unsigned int  state_index;
-+	int           isok;
-+	char         *next_buf;
-+	ssize_t       retval;
-+	unsigned int  new_vid;
-+	unsigned int  original_vid;
-+	unsigned int  new_fid;
-+	unsigned int  old_fid;
-+	unsigned int  original_control;
-+	unsigned int  old_control;
-+	unsigned int  new_control;
-+	int           found;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV;
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	op_count = 0;
-+	curr_buf = buf;
-+	next_buf = NULL;
-+	isok     = 1;
-+	
-+	while ( (isok) && (curr_buf != NULL) )
-+	{
-+		op_count++;
-+		// Parse fid
-+		new_fid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if ((next_buf != curr_buf) && (next_buf != NULL))
-+		{
-+			// Parse separator between frequency and voltage 
-+			curr_buf = next_buf;
-+			next_buf = NULL;
-+			if (*curr_buf==':')
-+			{
-+				curr_buf++;
-+				// Parse vid
-+				new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+				if ((next_buf != curr_buf) && (next_buf != NULL))
-+				{
-+					found = 0;
-+					for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+						old_control = acpi_data->states[state_index].control;
-+						old_fid = extract_fid_from_control(old_control);
-+						if (new_fid == old_fid)
-+						{
-+							found = 1;
-+							original_control = data->original_controls[state_index];
-+							original_vid = extract_vid_from_control(original_control);
-+							if (new_vid <= original_vid)
-+							{
-+								new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+								pr_debug("setting control at %i to %x (default is %x)\n",
-+								        state_index, new_control, original_control);
-+								acpi_data->states[state_index].control = new_control;
-+
-+							} else {
-+								printk("skipping vid at %i, %u is greater than default %u\n",
-+								       state_index, new_vid, original_vid);
-+							}
-+						}
-+					}
-+
-+					if (found == 0)
-+					{
-+						printk("operating point # %u not found (FID = %u)\n", op_count, new_fid);
-+						isok = 0;
-+					}
-+
-+					// Parse seprator before next operating point, if any
-+					curr_buf = next_buf;
-+					next_buf = NULL;
-+					if ((*curr_buf == ',') || (*curr_buf == ' '))
-+						curr_buf++;
-+					else
-+						curr_buf = NULL;
-+				}
-+				else
-+				{
-+					printk("failed to parse VID of operating point # %u (%s)\n", op_count, curr_buf);
-+					isok = 0;
-+				}
-+			}
-+			else
-+			{
-+				printk("failed to parse operating point # %u (%s)\n", op_count, curr_buf);
-+				isok = 0;
-+			}
-+		}
-+		else
-+		{
-+			printk("failed to parse FID of operating point # %u (%s)\n", op_count, curr_buf);
-+			isok = 0;
-+		}
-+	}
-+
-+	if (isok)
-+	{
-+		retval = count;
-+		/* set new voltage at current frequency */
-+		data->resume = 1;
-+		acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+	}
-+	else
-+	{
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+static ssize_t show_freq_attr_phc_version(struct cpufreq_policy *policy, char *buf)
-+ /* print out the phc version string set at the beginning of that file
-+  */
-+{
-+	ssize_t count = 0;
-+	count += sprintf(&buf[count], "%s\n", PHC_VERSION_STRING);
-+	return count;
-+}
-+
-+
-+
-+static struct freq_attr cpufreq_freq_attr_phc_version =
-+{
-+	/*display phc's version string*/
-+       .attr = { .name = "phc_version", .mode = 0444 },
-+       .show = show_freq_attr_phc_version,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_vids =
-+{
-+	/*display phc's voltage id's for the cpu*/
-+       .attr = { .name = "phc_vids", .mode = 0644 },
-+       .show = show_freq_attr_vids,
-+       .store = store_freq_attr_vids,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_vids =
-+{
-+	/*display acpi's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_default_vids", .mode = 0444 },
-+       .show = show_freq_attr_default_vids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_fids =
-+{
-+	/*display phc's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_fids", .mode = 0444 },
-+       .show = show_freq_attr_fids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_controls =
-+{
-+	/*display phc's current voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_controls", .mode = 0644 },
-+       .show = show_freq_attr_controls,
-+       .store = store_freq_attr_controls,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_controls =
-+{
-+	/*display acpi's default voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_default_controls", .mode = 0444 },
-+       .show = show_freq_attr_default_controls,
-+       .store = NULL,
-+};
-+
-+
- static struct freq_attr *acpi_cpufreq_attr[] = {
- 	&cpufreq_freq_attr_scaling_available_freqs,
-+	&cpufreq_freq_attr_phc_version,
-+	&cpufreq_freq_attr_vids,
-+	&cpufreq_freq_attr_default_vids,
-+	&cpufreq_freq_attr_fids,
-+	&cpufreq_freq_attr_controls,
-+	&cpufreq_freq_attr_default_controls,
- 	NULL,
- };
- 
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-3.7.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-3.7.patch
deleted file mode 100644
index 5d2949e92d46..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.1-3.7.patch
+++ /dev/null
@@ -1,534 +0,0 @@
---- hc-intel-0.3.2-12-1/phc-intel.c
-+++ hc-intel-0.3.2-12-1/phc-intel.c
-@@ -25,6 +25,10 @@
-  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  */
- 
-+/* This file has been patched with Linux PHC: www.linux-phc.org
-+* Patch version: linux-phc-0.3.2
-+*/
-+
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/init.h>
-@@ -61,6 +65,10 @@ enum {
- };
- 
- #define INTEL_MSR_RANGE		(0xffff)
-+#define INTEL_MSR_VID_MASK	(0x00ff)
-+#define INTEL_MSR_FID_MASK	(0xff00)
-+#define INTEL_MSR_FID_SHIFT	(0x8)
-+#define PHC_VERSION_STRING	"0.3.2:2"
- #define AMD_MSR_RANGE		(0x7)
- 
- #define MSR_K7_HWCR_CPB_DIS	(1ULL << 25)
-@@ -70,6 +78,7 @@ struct acpi_cpufreq_data {
- 	struct cpufreq_frequency_table *freq_table;
- 	unsigned int resume;
- 	unsigned int cpu_feature;
-+	acpi_integer *original_controls;
- };
- 
- static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
-@@ -222,17 +231,18 @@ static unsigned extract_io(u32 value, st
- static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
- {
- 	int i;
-+	u32 fid;
- 	struct acpi_processor_performance *perf;
- 
- 	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
- 		msr &= AMD_MSR_RANGE;
- 	else
--		msr &= INTEL_MSR_RANGE;
-+		fid = msr & INTEL_MSR_FID_MASK;
- 
- 	perf = data->acpi_data;
- 
- 	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
--		if (msr == perf->states[data->freq_table[i].index].status)
-+		if (fid == (perf->states[data->freq_table[i].index].status & INTEL_MSR_FID_MASK))
- 			return data->freq_table[i].frequency;
- 	}
- 	return data->freq_table[0].frequency;
-@@ -868,6 +878,8 @@ static int acpi_cpufreq_cpu_init(struct
- 	return result;
- 
- err_freqfree:
-+	if (data->original_controls)
-+		kfree(data->original_controls);
- 	kfree(data->freq_table);
- err_unreg:
- 	acpi_processor_unregister_performance(perf, cpu);
-@@ -907,8 +919,471 @@ static int acpi_cpufreq_resume(struct cp
- 	return 0;
- }
- 
-+/* sysfs interface to change operating points voltages */
-+
-+static unsigned int extract_fid_from_control(unsigned int control)
-+{
-+	return ((control & INTEL_MSR_FID_MASK) >> INTEL_MSR_FID_SHIFT);
-+}
-+
-+static unsigned int extract_vid_from_control(unsigned int control)
-+{
-+	return (control & INTEL_MSR_VID_MASK);
-+}
-+
-+
-+static bool check_cpu_control_capability(struct acpi_cpufreq_data *data) {
-+ /* check if the cpu we are running on is capable of setting new control data
-+  * 
-+  */
-+	if (unlikely(data == NULL || 
-+	             data->acpi_data == NULL || 
-+	             data->freq_table == NULL ||
-+	             data->cpu_feature != SYSTEM_INTEL_MSR_CAPABLE)) {
-+		return false;
-+	} else {
-+		return true;
-+	};
-+}
-+
-+
-+static ssize_t check_origial_table (struct acpi_cpufreq_data *data)
-+{
-+
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int state_index;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	if (data->original_controls == NULL) {
-+		// Backup original control values
-+		data->original_controls = kcalloc(acpi_data->state_count,
-+		                                  sizeof(acpi_integer), GFP_KERNEL);
-+		if (data->original_controls == NULL) {
-+			printk("failed to allocate memory for original control values\n");
-+			return -ENOMEM;
-+		}
-+		for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+			data->original_controls[state_index] = acpi_data->states[state_index].control;
-+		}
-+	}
-+	return 0;
-+}
-+
-+static ssize_t show_freq_attr_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_vids(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default voltage id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u ", vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_fids(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's frequeny id's
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u ", fid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display phc's controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
-+		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+static ssize_t show_freq_attr_default_controls(struct cpufreq_policy *policy, char *buf)
-+ /* display acpi's default controls for the cpu (frequency id's and related voltage id's)
-+  * 
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int i;
-+	unsigned int fid;
-+	unsigned int vid;
-+	ssize_t count = 0;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	freq_table = data->freq_table;
-+
-+	for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-+		fid = extract_fid_from_control(data->original_controls[freq_table[i].index]);
-+		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
-+		count += sprintf(&buf[count], "%u:%u ", fid, vid);
-+	}
-+	count += sprintf(&buf[count], "\n");
-+
-+	return count;
-+}
-+
-+
-+static ssize_t store_freq_attr_vids(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the voltage id's for the related frequency
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	unsigned int freq_index;
-+	unsigned int state_index;
-+	unsigned int new_vid;
-+	unsigned int original_vid;
-+	unsigned int new_control;
-+	unsigned int original_control;
-+	const char *curr_buf = buf;
-+	char *next_buf;
-+	ssize_t retval;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV; //check if CPU is capable of changing controls
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval; 
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	/* for each value taken from the sysfs interfalce (phc_vids) get entrys and convert them to unsigned long integers*/
-+	for (freq_index = 0; freq_table[freq_index].frequency != CPUFREQ_TABLE_END; freq_index++) {
-+		new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if (next_buf == curr_buf) {
-+			if ((curr_buf - buf == count - 1) && (*curr_buf == '\n')) {   //end of line?
-+				curr_buf++;
-+				break;
-+			}
-+			//if we didn't got end of line but there is nothing more to read something went wrong...
-+			printk("failed to parse vid value at %i (%s)\n", freq_index, curr_buf);
-+			return -EINVAL;
-+		}
-+
-+		state_index = freq_table[freq_index].index;
-+		original_control = data->original_controls[state_index];
-+		original_vid = original_control & INTEL_MSR_VID_MASK;
-+		
-+		/* before we store the values we do some checks to prevent 
-+		 * users to set up values higher than the default one
-+		 */
-+		if (new_vid <= original_vid) {
-+			new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+			pr_debug("setting control at %i to %x (default is %x)\n",
-+			        freq_index, new_control, original_control);
-+			acpi_data->states[state_index].control = new_control;
-+
-+		} else {
-+			pr_debug("skipping vid at %i, %u is greater than default %u\n",
-+			       freq_index, new_vid, original_vid);
-+		}
-+
-+		curr_buf = next_buf;
-+		/* jump over value seperators (space or comma).
-+		 * There could be more than one space or comma character
-+		 * to separate two values so we better do it using a loop.
-+		 */
-+		while ((curr_buf - buf < count) && ((*curr_buf == ' ') || (*curr_buf == ','))) {
-+			curr_buf++;
-+		}
-+	}
-+
-+	/* set new voltage for current frequency */
-+	data->resume = 1;
-+	acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+
-+	return curr_buf - buf;
-+}
-+
-+static ssize_t store_freq_attr_controls(struct cpufreq_policy *policy, const char *buf, size_t count)
-+ /* store the controls (frequency id's and related voltage id's)
-+  * We are going to do some sanity checks here to prevent users 
-+  * from setting higher voltages than the default one.
-+  */
-+{
-+	struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-+	struct acpi_processor_performance *acpi_data;
-+	struct cpufreq_frequency_table *freq_table;
-+	const char   *curr_buf;
-+	unsigned int  op_count;
-+	unsigned int  state_index;
-+	int           isok;
-+	char         *next_buf;
-+	ssize_t       retval;
-+	unsigned int  new_vid;
-+	unsigned int  original_vid;
-+	unsigned int  new_fid;
-+	unsigned int  old_fid;
-+	unsigned int  original_control;
-+	unsigned int  old_control;
-+	unsigned int  new_control;
-+	int           found;
-+
-+	if (!check_cpu_control_capability(data)) return -ENODEV;
-+
-+	retval = check_origial_table(data);
-+        if (0 != retval)
-+		return retval;
-+
-+	acpi_data = data->acpi_data;
-+	freq_table = data->freq_table;
-+
-+	op_count = 0;
-+	curr_buf = buf;
-+	next_buf = NULL;
-+	isok     = 1;
-+	
-+	while ( (isok) && (curr_buf != NULL) )
-+	{
-+		op_count++;
-+		// Parse fid
-+		new_fid = simple_strtoul(curr_buf, &next_buf, 10);
-+		if ((next_buf != curr_buf) && (next_buf != NULL))
-+		{
-+			// Parse separator between frequency and voltage 
-+			curr_buf = next_buf;
-+			next_buf = NULL;
-+			if (*curr_buf==':')
-+			{
-+				curr_buf++;
-+				// Parse vid
-+				new_vid = simple_strtoul(curr_buf, &next_buf, 10);
-+				if ((next_buf != curr_buf) && (next_buf != NULL))
-+				{
-+					found = 0;
-+					for (state_index = 0; state_index < acpi_data->state_count; state_index++) {
-+						old_control = acpi_data->states[state_index].control;
-+						old_fid = extract_fid_from_control(old_control);
-+						if (new_fid == old_fid)
-+						{
-+							found = 1;
-+							original_control = data->original_controls[state_index];
-+							original_vid = extract_vid_from_control(original_control);
-+							if (new_vid <= original_vid)
-+							{
-+								new_control = (original_control & ~INTEL_MSR_VID_MASK) | new_vid;
-+								pr_debug("setting control at %i to %x (default is %x)\n",
-+								        state_index, new_control, original_control);
-+								acpi_data->states[state_index].control = new_control;
-+
-+							} else {
-+								printk("skipping vid at %i, %u is greater than default %u\n",
-+								       state_index, new_vid, original_vid);
-+							}
-+						}
-+					}
-+
-+					if (found == 0)
-+					{
-+						printk("operating point # %u not found (FID = %u)\n", op_count, new_fid);
-+						isok = 0;
-+					}
-+
-+					// Parse seprator before next operating point, if any
-+					curr_buf = next_buf;
-+					next_buf = NULL;
-+					if ((*curr_buf == ',') || (*curr_buf == ' '))
-+						curr_buf++;
-+					else
-+						curr_buf = NULL;
-+				}
-+				else
-+				{
-+					printk("failed to parse VID of operating point # %u (%s)\n", op_count, curr_buf);
-+					isok = 0;
-+				}
-+			}
-+			else
-+			{
-+				printk("failed to parse operating point # %u (%s)\n", op_count, curr_buf);
-+				isok = 0;
-+			}
-+		}
-+		else
-+		{
-+			printk("failed to parse FID of operating point # %u (%s)\n", op_count, curr_buf);
-+			isok = 0;
-+		}
-+	}
-+
-+	if (isok)
-+	{
-+		retval = count;
-+		/* set new voltage at current frequency */
-+		data->resume = 1;
-+		acpi_cpufreq_target(policy, get_cur_freq_on_cpu(policy->cpu), CPUFREQ_RELATION_L);
-+	}
-+	else
-+	{
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+static ssize_t show_freq_attr_phc_version(struct cpufreq_policy *policy, char *buf)
-+ /* print out the phc version string set at the beginning of that file
-+  */
-+{
-+	ssize_t count = 0;
-+	count += sprintf(&buf[count], "%s\n", PHC_VERSION_STRING);
-+	return count;
-+}
-+
-+
-+
-+static struct freq_attr cpufreq_freq_attr_phc_version =
-+{
-+	/*display phc's version string*/
-+       .attr = { .name = "phc_version", .mode = 0444 },
-+       .show = show_freq_attr_phc_version,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_vids =
-+{
-+	/*display phc's voltage id's for the cpu*/
-+       .attr = { .name = "phc_vids", .mode = 0644 },
-+       .show = show_freq_attr_vids,
-+       .store = store_freq_attr_vids,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_vids =
-+{
-+	/*display acpi's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_default_vids", .mode = 0444 },
-+       .show = show_freq_attr_default_vids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_fids =
-+{
-+	/*display phc's default frequency id's for the cpu*/
-+       .attr = { .name = "phc_fids", .mode = 0444 },
-+       .show = show_freq_attr_fids,
-+       .store = NULL,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_controls =
-+{
-+	/*display phc's current voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_controls", .mode = 0644 },
-+       .show = show_freq_attr_controls,
-+       .store = store_freq_attr_controls,
-+};
-+
-+static struct freq_attr cpufreq_freq_attr_default_controls =
-+{
-+	/*display acpi's default voltage/frequency controls for the cpu*/
-+       .attr = { .name = "phc_default_controls", .mode = 0444 },
-+       .show = show_freq_attr_default_controls,
-+       .store = NULL,
-+};
-+
-+
-+
- static struct freq_attr *acpi_cpufreq_attr[] = {
- 	&cpufreq_freq_attr_scaling_available_freqs,
-+	&cpufreq_freq_attr_phc_version,
-+	&cpufreq_freq_attr_vids,
-+	&cpufreq_freq_attr_default_vids,
-+	&cpufreq_freq_attr_fids,
-+	&cpufreq_freq_attr_controls,
-+	&cpufreq_freq_attr_default_controls,
- 	NULL,	/* this is a placeholder for cpb, do not remove */
- 	NULL,
- };
diff --git a/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch b/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch
new file mode 100644
index 000000000000..303e8f1cd723
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch
@@ -0,0 +1,1482 @@
+Remove trailing white spaces from /proc output.
+
+Signed-off-by: Michael Weber <xmw@gentoo.org>
+--- phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -757,12 +769,477 @@
++@@ -757,12 +769,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
+@@ -74,7 +74,7 @@
+  
+  	return 0;
+  }
+-@@ -758,12 +770,477 @@
++@@ -758,12 +770,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -157,6 +157,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -186,6 +187,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -212,6 +214,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -240,6 +243,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -271,6 +275,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -758,12 +770,477 @@
++@@ -758,12 +770,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -778,12 +790,477 @@
++@@ -778,12 +790,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -790,12 +802,477 @@
++@@ -790,12 +802,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -797,12 +809,474 @@
++@@ -797,12 +809,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -793,12 +805,474 @@
++@@ -793,12 +805,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -756,12 +768,474 @@
++@@ -756,12 +768,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -757,12 +769,474 @@
++@@ -757,12 +769,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -758,12 +770,474 @@
++@@ -758,12 +770,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -759,12 +771,474 @@
++@@ -759,12 +771,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -759,12 +771,474 @@
++@@ -759,12 +771,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -760,12 +772,474 @@
++@@ -760,12 +772,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -719,12 +731,474 @@
++@@ -719,12 +731,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -720,12 +732,474 @@
++@@ -720,12 +732,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -716,12 +728,474 @@
++@@ -716,12 +728,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -717,12 +729,474 @@
++@@ -717,12 +729,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -717,12 +729,474 @@
++@@ -717,12 +729,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.0/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.0/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.1/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.1/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -963,10 +965,484 @@
++@@ -963,10 +965,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
+@@ -122,7 +122,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -986,10 +987,485 @@
++@@ -986,10 +987,490 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -200,6 +200,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -229,6 +230,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -255,6 +257,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -283,6 +286,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -314,6 +318,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.2/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.2/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.3/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.3/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.4/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.4/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.7/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.7/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -966,10 +968,484 @@
++@@ -966,10 +968,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -966,10 +968,484 @@
++@@ -966,10 +968,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -970,10 +972,484 @@
++@@ -970,10 +972,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
diff --git a/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild b/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
new file mode 100644
index 000000000000..3dfd094d689c
--- /dev/null
+++ b/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild,v 1.2 2013/09/05 22:38:45 xmw Exp $
+
+EAPI=5
+
+inherit linux-info linux-mod eutils
+
+DESCRIPTION="Processor Hardware Control for Intel CPUs"
+HOMEPAGE="http://www.linux-phc.org/
+	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
+#no automatic filenames here, sorry
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
+ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
+
+MODULE_NAMES="phc-intel(misc:)"
+BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
+BUILD_TARGETS="all"
+
+S=${WORKDIR}/${A/.tar.bz2}
+
+pkg_setup() {
+	if kernel_is lt 2 6 27 ; then
+		eerror "Your kernel version is no longer supported by this version of ${PN}."
+		eerror "Please use a previous version of ${PN} or a newer kernel."
+		die
+	fi
+	if kernel_is gt 3 11 ; then
+		eerror "Your kernel version is not yet supported by this version of ${PN}."
+		eerror "Please use a newer version of ${PN} or an older kernel."
+		die
+	fi
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/phc-intel-pack-rev11-trailing-space.patch
+
+	sed -e '/^all:/s:prepare::' \
+		-i Makefile || die
+
+	local my_sub=arch/x86/kernel/cpu
+	if kernel_is gt 2 6 39 ; then
+		my_sub=drivers
+	fi
+	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/{acpi-cpufreq.c,mperf.h} . || die
+
+	if kernel_is lt 3 0 ; then
+		epatch inc/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}/linux-phc-0.4.0.patch
+	else
+		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.4.0.patch
+	fi
+
+	mv acpi-cpufreq.c phc-intel.c || die
+}
diff --git a/sys-power/phc-intel/phc-intel-0.3.199.3_pre.ebuild b/sys-power/phc-intel/phc-intel-0.3.199.3_pre.ebuild
deleted file mode 100644
index a45f3327f5e4..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.199.3_pre.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.199.3_pre.ebuild,v 1.1 2010/08/24 00:51:14 xmw Exp $
-
-EAPI=2
-
-inherit linux-info linux-mod versionator
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/"
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=86 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-S=${WORKDIR}/test-release-$(replace_version_separator 3 '-' $(get_version_component_range 1-4))
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module or Not set to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="prepare all"
-
-pkg_setup() {
-	if ! kernel_is eq 2 6 31 ; then
-		elog "This testrelease only supports kernel version 2.6.31."
-		die
-	fi
-	elog "Please read /usr/share/doc/${PVF}/README carefully"
-	elog "before updating your current config"
-}
-
-src_install() {
-	linux-mod_src_install
-	newdoc "READ BEFORE INSTALL" README || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild
deleted file mode 100644
index 6c00ae0243a9..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.1-r3.ebuild,v 1.3 2012/05/24 05:47:16 vapier Exp $
-
-EAPI=2
-
-inherit linux-info linux-mod versionator eutils
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/"
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=94 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-$(replace_version_separator 3 '-' $(replace_version_separator 4 '-'))
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if kernel_is lt 2 6 33 ; then
-		eerror "Your kernel version is no longer supported by this version of ${PN}."
-		eerror "Please use a previous version of ${PN} or a newer kernel."
-		die
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -e '/^all:/s:prepare::' \
-		-e '/error Only support for 2.6 series kernels/d' \
-		-i Makefile || die
-
-	local my_sub=arch/x86/kernel/cpu
-	if kernel_is gt 2 6 39 ; then
-		my_sub=drivers
-	fi
-	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c phc-intel.c || die
-	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
-
-	if kernel_is eq 2 6 35 || kernel_is eq 2 6 36 ; then
-		epatch "${FILESDIR}"/${P}-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.patch
-	else
-		epatch "${FILESDIR}"/${P}-2.6.37.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r4.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.1-r4.ebuild
deleted file mode 100644
index e1d8f7f36d9e..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.1-r4.ebuild,v 1.1 2012/11/15 01:08:43 xmw Exp $
-
-EAPI=2
-
-inherit linux-info linux-mod versionator eutils
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/"
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=94 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-$(replace_version_separator 3 '-' $(replace_version_separator 4 '-'))
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if kernel_is lt 2 6 33 ; then
-		eerror "Your kernel version is no longer supported by this version of ${PN}."
-		eerror "Please use a previous version of ${PN} or a newer kernel."
-		die
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -e '/^all:/s:prepare::' \
-		-e '/error Only support for 2.6 series kernels/d' \
-		-i Makefile || die
-
-	local my_sub=arch/x86/kernel/cpu
-	if kernel_is gt 2 6 39 ; then
-		my_sub=drivers
-	fi
-	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c phc-intel.c || die
-	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
-
-	if kernel_is eq 2 6 35 || kernel_is eq 2 6 36 ; then
-		epatch "${FILESDIR}"/${P}-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.patch
-	elif kernel_is lt 3 7 ; then
-		epatch "${FILESDIR}"/${P}-2.6.37.patch
-	else
-		epatch "${FILESDIR}"/${P}-3.7.patch
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r5.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.1-r5.ebuild
index 6acb5784c820..feaa2e6529e9 100644
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.1-r5.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.1-r5.ebuild,v 1.1 2012/12/17 07:20:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.1-r5.ebuild,v 1.2 2013/09/05 13:08:45 xmw Exp $
 
 EAPI=2
 
@@ -30,6 +30,11 @@ pkg_setup() {
 		eerror "Please use a previous version of ${PN} or a newer kernel."
 		die
 	fi
+	if kernel_is gt 3 10 ; then
+		eerror "Your kernel version is not supported by this version of ${PN}."
+		eerror "Please use a newer version for kernels 3.11 and above."
+		die
+	fi
 	linux-mod_pkg_setup
 }
 
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
new file mode 100644
index 000000000000..7197f522195f
--- /dev/null
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild,v 1.2 2013/09/05 22:38:45 xmw Exp $
+
+EAPI=5
+
+inherit linux-info linux-mod eutils
+
+DESCRIPTION="Processor Hardware Control for Intel CPUs"
+HOMEPAGE="http://www.linux-phc.org/
+	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
+#no automatic filenames here, sorry
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
+ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
+
+MODULE_NAMES="phc-intel(misc:)"
+BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
+BUILD_TARGETS="all"
+
+S=${WORKDIR}/${A/.tar.bz2}
+
+pkg_setup() {
+	if kernel_is lt 2 6 27 ; then
+		eerror "Your kernel version is no longer supported by this version of ${PN}."
+		eerror "Please use a previous version of ${PN} or a newer kernel."
+		die
+	fi
+	if kernel_is gt 3 11 ; then
+		eerror "Your kernel version is not yet supported by this version of ${PN}."
+		eerror "Please use a newer version of ${PN} or an older kernel."
+		die
+	fi
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/phc-intel-pack-rev11-trailing-space.patch
+
+	sed -e '/^all:/s:prepare::' \
+		-i Makefile || die
+
+	local my_sub=arch/x86/kernel/cpu
+	if kernel_is gt 2 6 39 ; then
+		my_sub=drivers
+	fi
+	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/{acpi-cpufreq.c,mperf.h} . || die
+
+	if kernel_is lt 3 0 ; then
+		epatch inc/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}/linux-phc-0.3.2.patch
+	else
+		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
+	fi
+
+	mv acpi-cpufreq.c phc-intel.c || die
+}
diff --git a/sys-power/powertop/powertop-2.4.ebuild b/sys-power/powertop/powertop-2.4.ebuild
index a36791ec60fb..a378db775158 100644
--- a/sys-power/powertop/powertop-2.4.ebuild
+++ b/sys-power/powertop/powertop-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.4.ebuild,v 1.4 2013/09/04 07:26:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/powertop/powertop-2.4.ebuild,v 1.5 2013/09/05 19:23:45 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://01.org/powertop/sites/default/files/downloads/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="tool that helps you find what software is using the most power"
diff --git a/sys-power/upower/upower-0.9.21.ebuild b/sys-power/upower/upower-0.9.21.ebuild
index 3c5c13fd0dfa..e57c3ce54068 100644
--- a/sys-power/upower/upower-0.9.21.ebuild
+++ b/sys-power/upower/upower-0.9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.21.ebuild,v 1.6 2013/09/04 09:02:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.21.ebuild,v 1.8 2013/09/05 19:23:33 ago Exp $
 
 EAPI=5
 inherit eutils systemd
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux systemd"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/sys-process/iotop/iotop-0.6.ebuild b/sys-process/iotop/iotop-0.6.ebuild
index 9dff9cb6fda3..81f0fa0f1deb 100644
--- a/sys-process/iotop/iotop-0.6.ebuild
+++ b/sys-process/iotop/iotop-0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/iotop/iotop-0.6.ebuild,v 1.8 2013/08/07 13:20:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/iotop/iotop-0.6.ebuild,v 1.9 2013/09/05 19:44:51 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 PYTHON_REQ_USE="ncurses(+)"
 
 inherit distutils-r1 linux-info
diff --git a/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild
new file mode 100644
index 000000000000..4d51f540db46
--- /dev/null
+++ b/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-ExtUtils-Command/perl-ExtUtils-Command-1.170.0-r4.ebuild,v 1.1 2013/09/06 02:55:03 patrick Exp $
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+RDEPEND="|| ( =dev-lang/perl-5.18* =dev-lang/perl-5.16* =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV}  )"
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.280.0.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.280.0.ebuild
index 4b468a01f37d..777d8f158e19 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.280.0.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.280.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Simple/perl-Pod-Simple-3.280.0.ebuild,v 1.1 2013/08/14 06:10:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Pod-Simple/perl-Pod-Simple-3.280.0.ebuild,v 1.2 2013/09/06 03:27:11 floppym Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -11,4 +11,4 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND="~perl-core/${PN#perl-}-${PV}"
+RDEPEND="|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/pmw/pmw-1.ebuild b/virtual/pmw/pmw-1.ebuild
index 84dfe5c7e408..b84a89e30c91 100644
--- a/virtual/pmw/pmw-1.ebuild
+++ b/virtual/pmw/pmw-1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pmw/pmw-1.ebuild,v 1.2 2013/03/30 13:08:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pmw/pmw-1.ebuild,v 1.3 2013/09/05 19:44:50 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-r1
 
diff --git a/virtual/pyparsing/pyparsing-0.ebuild b/virtual/pyparsing/pyparsing-0.ebuild
index 8bd032538462..ff4298da45e9 100644
--- a/virtual/pyparsing/pyparsing-0.ebuild
+++ b/virtual/pyparsing/pyparsing-0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-0.ebuild,v 1.2 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-0.ebuild,v 1.3 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit python-r1
 
 DESCRIPTION="A virtual for pyparsing, for Python 2 & 3"
diff --git a/virtual/pyparsing/pyparsing-1.ebuild b/virtual/pyparsing/pyparsing-1.ebuild
index 8ac64ca3b4ce..220588178989 100644
--- a/virtual/pyparsing/pyparsing-1.ebuild
+++ b/virtual/pyparsing/pyparsing-1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-1.ebuild,v 1.2 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-1.ebuild,v 1.3 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit python-r1
 
 DESCRIPTION="A virtual for pyparsing, for Python 2 & 3"
diff --git a/virtual/pyparsing/pyparsing-2.ebuild b/virtual/pyparsing/pyparsing-2.ebuild
index 4b28e8c67eda..8065fa52787a 100644
--- a/virtual/pyparsing/pyparsing-2.ebuild
+++ b/virtual/pyparsing/pyparsing-2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-2.ebuild,v 1.4 2013/08/07 11:55:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-2.ebuild,v 1.5 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for pyparsing, for Python 2 & 3"
diff --git a/virtual/pyparsing/pyparsing-3.ebuild b/virtual/pyparsing/pyparsing-3.ebuild
index 8dc1e555cbdd..a75869fe73e5 100644
--- a/virtual/pyparsing/pyparsing-3.ebuild
+++ b/virtual/pyparsing/pyparsing-3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-3.ebuild,v 1.1 2013/08/11 03:14:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pyparsing/pyparsing-3.ebuild,v 1.2 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for pyparsing, for Python 2 & 3"
diff --git a/virtual/python-argparse/python-argparse-0.ebuild b/virtual/python-argparse/python-argparse-0.ebuild
index b041c8c43b61..63de114c3c66 100644
--- a/virtual/python-argparse/python-argparse-0.ebuild
+++ b/virtual/python-argparse/python-argparse-0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-0.ebuild,v 1.4 2013/08/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-0.ebuild,v 1.5 2013/09/05 19:33:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy1_9 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit python-r1
 
 DESCRIPTION="A virtual for the Python argparse module"
diff --git a/virtual/python-argparse/python-argparse-1.ebuild b/virtual/python-argparse/python-argparse-1.ebuild
index 0e7f795fd96d..b59de33158ec 100644
--- a/virtual/python-argparse/python-argparse-1.ebuild
+++ b/virtual/python-argparse/python-argparse-1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.11 2013/08/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.12 2013/09/05 19:33:16 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for the Python argparse module"
@@ -15,12 +15,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
-setup_globals() {
-	local flag
-
-	RDEPEND="${PYTHON_DEPS}"
-	for flag in python_targets_python{2_5,2_6,3_1}; do
-		RDEPEND+=" ${flag}? ( dev-python/argparse[${flag}] )"
-	done
-}
-setup_globals
+RDEPEND="${PYTHON_DEPS}
+	python_targets_python2_6? (
+		dev-python/argparse[python_targets_python2_6] )"
diff --git a/virtual/python-imaging/python-imaging-1.ebuild b/virtual/python-imaging/python-imaging-1.ebuild
index 091b5ac3e4ea..08b9201722f9 100644
--- a/virtual/python-imaging/python-imaging-1.ebuild
+++ b/virtual/python-imaging/python-imaging-1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-imaging/python-imaging-1.ebuild,v 1.3 2013/06/10 15:56:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-imaging/python-imaging-1.ebuild,v 1.4 2013/09/05 13:55:39 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 inherit python-r1
 
@@ -15,15 +15,8 @@ LICENSE=""
 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"
 IUSE="tk"
-REQUIRED_USE="
-	python_targets_python2_5? (
-		!python_targets_python3_2
-		!python_targets_python3_3
-	)
-"
 
 RDEPEND="
-	python_targets_python2_5? ( dev-python/imaging[tk?,python_targets_python2_5(-)] )
 	python_targets_python2_6? ( || (
 		dev-python/pillow[tk?,python_targets_python2_6(-)]
 		dev-python/imaging[tk?,python_targets_python2_6(-)]
diff --git a/virtual/python-json/python-json-0.ebuild b/virtual/python-json/python-json-0.ebuild
index 4627d33ee237..40210cd86bea 100644
--- a/virtual/python-json/python-json-0.ebuild
+++ b/virtual/python-json/python-json-0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-json/python-json-0.ebuild,v 1.3 2013/05/03 01:08:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-json/python-json-0.ebuild,v 1.4 2013/09/05 13:56:50 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for JSON support in Python, with simplejson fallback"
@@ -15,8 +15,5 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
-# Only Python 2.5 lacks built-in JSON support. Most packages use
-# simplejson fallback, and those packages should use this virtual.
-RDEPEND="${PYTHON_DEPS}
-	python_targets_python2_5? (
-		dev-python/simplejson[python_targets_python2_5] )"
+# Every in-tree Python has JSON built-in.
+RDEPEND="${PYTHON_DEPS}"
diff --git a/virtual/python-unittest2/python-unittest2-1-r1.ebuild b/virtual/python-unittest2/python-unittest2-1-r1.ebuild
index 35ea9e6997bc..fc55421c01a2 100644
--- a/virtual/python-unittest2/python-unittest2-1-r1.ebuild
+++ b/virtual/python-unittest2/python-unittest2-1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1-r1.ebuild,v 1.11 2013/08/07 13:26:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1-r1.ebuild,v 1.12 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1"
diff --git a/virtual/python-unittest2/python-unittest2-1-r2.ebuild b/virtual/python-unittest2/python-unittest2-1-r2.ebuild
index b4b25ed9733d..9fcdbb5192e6 100644
--- a/virtual/python-unittest2/python-unittest2-1-r2.ebuild
+++ b/virtual/python-unittest2/python-unittest2-1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1-r2.ebuild,v 1.1 2013/07/19 07:58:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1-r2.ebuild,v 1.2 2013/09/05 14:13:00 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1"
@@ -18,6 +18,4 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	python_targets_python2_5? ( dev-python/unittest2[python_targets_python2_5] )
-	python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] )
-	python_targets_python3_1? ( dev-python/unittest2[python_targets_python3_1] )"
+	python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] )"
diff --git a/virtual/python-unittest2/python-unittest2-1.ebuild b/virtual/python-unittest2/python-unittest2-1.ebuild
index ad58d78bdf30..538b4afd11e3 100644
--- a/virtual/python-unittest2/python-unittest2-1.ebuild
+++ b/virtual/python-unittest2/python-unittest2-1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1.ebuild,v 1.3 2013/01/28 13:37:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1.ebuild,v 1.4 2013/09/05 19:44:43 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
 inherit python-r1
 
 DESCRIPTION="A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1"
diff --git a/virtual/ruby-minitest/ruby-minitest-0-r3.ebuild b/virtual/ruby-minitest/ruby-minitest-0-r3.ebuild
index 29a5e40bb606..2e11043e751d 100644
--- a/virtual/ruby-minitest/ruby-minitest-0-r3.ebuild
+++ b/virtual/ruby-minitest/ruby-minitest-0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-minitest/ruby-minitest-0-r3.ebuild,v 1.3 2013/09/01 14:46:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-minitest/ruby-minitest-0-r3.ebuild,v 1.4 2013/09/05 15:43:03 jer Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 ruby20 jruby"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="ruby_targets_ruby18? ( dev-ruby/minitest[ruby_targets_ruby18] )
diff --git a/virtual/ruby-rdoc/ruby-rdoc-3.ebuild b/virtual/ruby-rdoc/ruby-rdoc-3.ebuild
index 26757297497d..8622cd4cfd45 100644
--- a/virtual/ruby-rdoc/ruby-rdoc-3.ebuild
+++ b/virtual/ruby-rdoc/ruby-rdoc-3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-rdoc/ruby-rdoc-3.ebuild,v 1.6 2013/09/01 14:46:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-rdoc/ruby-rdoc-3.ebuild,v 1.7 2013/09/05 15:48:44 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby20"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${USE_RUBY}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| ( dev-ruby/rdoc[ruby_targets_ruby20] )"
diff --git a/virtual/rubygems/rubygems-6.ebuild b/virtual/rubygems/rubygems-6.ebuild
index ed511f335096..a0a52aa1e019 100644
--- a/virtual/rubygems/rubygems-6.ebuild
+++ b/virtual/rubygems/rubygems-6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/rubygems-6.ebuild,v 1.3 2013/09/01 14:45:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/rubygems-6.ebuild,v 1.4 2013/09/05 15:49:42 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby20"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${USE_RUBY}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-ruby/rubygems[ruby_targets_ruby20]"
diff --git a/www-apps/roundup/roundup-1.4.21.ebuild b/www-apps/roundup/roundup-1.4.21.ebuild
index 960d8aa25321..10c758212e57 100644
--- a/www-apps/roundup/roundup-1.4.21.ebuild
+++ b/www-apps/roundup/roundup-1.4.21.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-1.4.21.ebuild,v 1.1 2013/03/30 07:49:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/roundup/roundup-1.4.21.ebuild,v 1.2 2013/09/05 19:44:53 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit distutils-r1
 
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 0479dcee2620..d0560287d2d9 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_30.0.1599.22-1_amd64.deb 44365686 SHA256 2a73720c3a913e60ed40d6263ce55af83171f9f7e44af9224e40d4e925065e49 SHA512 f38fca54ffd93e28c2d7861a5b4daa461e01d4c0e5586410a4ceb2c39e0e3aca9cf78c1f4cdeebb438b5d8138b0a3822ed77bec2edb2c48de235b59656bc31ae WHIRLPOOL 9326d9e6206e1a7738b45595db6b71029b4aa7d925317b92de733dbb1197c0538305c71fb4c7b25bad69b3d671c32728faf6869f1edbbb6b4b61290196919f3f
-DIST google-chrome-beta_30.0.1599.22-1_i386.deb 42157052 SHA256 57b8557b13d51f9ffff343f10495cb9422cc3075d1e57f137854250f75a4c368 SHA512 c2f8f0faa1c3bec7fe6440dd08ac591ae86668fcd51dc4d91ef30bb9c72ad149b80c78a7df86ebdd5809e99f9bf283d172c8b123ab8255eb98ac91e7a5c7b475 WHIRLPOOL a37e300cb9c85b9ee840eb0eacc12fb5d0ca54e22246c8708df75e27738ee49b5caba52336533b2af6c22301c6f1df2268d93499c52de6f8b065d5f67cdca5df
+DIST google-chrome-beta_30.0.1599.28-1_amd64.deb 44471356 SHA256 71d57fd9150b089adecf75ed36f14f335067a2f37257223ce566e4ea899743ea SHA512 f894a4ef55bacd900cdf85524669d2f0f52c13cce3b123e436aa4453ed486219b100a180703e1017cb066b9ecce2a89f940e109e346bed2cbeb909f9d3c96f23 WHIRLPOOL 342eb019f8a4cee3529ca452d7ec3d1e4e3e75da8274958856b42b3407d91304c1bcc03e412c64efdf2a39f931fdc13b91e18d90c1fe405ae46db9f19853bfc5
+DIST google-chrome-beta_30.0.1599.28-1_i386.deb 42324934 SHA256 cb3af8b063e98c45b24c607e6bd89e862fa6bc64ade093fd073e5f9326de91ea SHA512 c645ecc455a3e56db566e0fc11b5bf09c90be25e71c83f74ae3c12eb56aa7e2167d46dc2aa42a5dbbbcc26419affe022464b44e8105ba4f596910f538c7e1c5c WHIRLPOOL a912a5638f64bfff54a9e4b36da95ae3f6afba06e9e3474e65a0e13e7087d99d146a20589141876c1eadcae49298a6dd588babf09301f9ec7ced751c26381a22
 DIST google-chrome-stable_29.0.1547.65-r220622_amd64.deb 44155284 SHA256 f7944e9c8b09d5e48443d46f5981a56ec6b2c9dff1c809fd659369715a6eb7d2 SHA512 8219c2a046837176a7810717e768e20dfd107a9a613aee98842da93512fc58573c6a06cbb4e316a3af8ec7bc3b1cd2b86a72471505b235b636a1f2bd8126a50f WHIRLPOOL 7335797805567380ff272795caed08b1e03bd566a3f9fb53f1c75de975fb928bce92f5c5a8c019ae91dce6a868f33221a08271fa8d98f0f20a8af4406f64e955
 DIST google-chrome-stable_29.0.1547.65-r220622_i386.deb 41904804 SHA256 b3456451079b21e8d93d71b4540565d8905da6b829880e0554d9f36548f41626 SHA512 c19de9eb739f7ef395a00c897a1c6d7f64d9188f875215742e88dad78e486a1b4502f297fede0523468de82d2c8cdea9dd5e3d0e9ded8223f0c805ab64087d86 WHIRLPOOL 3d535bf21f00f316f17e826233bda4b699aac4e1c724971926aafc44252be636f913c3387ee71b0b4bfacacdb1e57a497a9fdaff3e6e5678c313bccaa8c2df53
 DIST google-chrome-unstable_31.0.1612.0-1_amd64.deb 44604006 SHA256 94259e86f087aa3ac349a23d52d2e05c37fb20fd70f47353e564d64030bba3ff SHA512 cb2c2c0c069894fe9c145e07c27f538b6f7489746ce5ec9b10da4268d94c556af6934cec1955964cb55715e28ec7585a2bcb078759fb4a89011840b99ea96f62 WHIRLPOOL 352500128c6971bea135b14e9ff40d836902d996cea031561e9cc3946e2f4f61f02144c600492460cab7e772a502645ec116279054b0f9529ce00d93a8101767
diff --git a/www-client/google-chrome/google-chrome-30.0.1599.22_beta1.ebuild b/www-client/google-chrome/google-chrome-30.0.1599.28_beta1.ebuild
similarity index 98%
rename from www-client/google-chrome/google-chrome-30.0.1599.22_beta1.ebuild
rename to www-client/google-chrome/google-chrome-30.0.1599.28_beta1.ebuild
index c7d78fb31845..8c74a064f209 100644
--- a/www-client/google-chrome/google-chrome-30.0.1599.22_beta1.ebuild
+++ b/www-client/google-chrome/google-chrome-30.0.1599.28_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-30.0.1599.22_beta1.ebuild,v 1.1 2013/08/28 17:39:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-30.0.1599.28_beta1.ebuild,v 1.1 2013/09/05 22:59:35 floppym Exp $
 
 EAPI="4"
 
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 0479dcee2620..d0560287d2d9 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_30.0.1599.22-1_amd64.deb 44365686 SHA256 2a73720c3a913e60ed40d6263ce55af83171f9f7e44af9224e40d4e925065e49 SHA512 f38fca54ffd93e28c2d7861a5b4daa461e01d4c0e5586410a4ceb2c39e0e3aca9cf78c1f4cdeebb438b5d8138b0a3822ed77bec2edb2c48de235b59656bc31ae WHIRLPOOL 9326d9e6206e1a7738b45595db6b71029b4aa7d925317b92de733dbb1197c0538305c71fb4c7b25bad69b3d671c32728faf6869f1edbbb6b4b61290196919f3f
-DIST google-chrome-beta_30.0.1599.22-1_i386.deb 42157052 SHA256 57b8557b13d51f9ffff343f10495cb9422cc3075d1e57f137854250f75a4c368 SHA512 c2f8f0faa1c3bec7fe6440dd08ac591ae86668fcd51dc4d91ef30bb9c72ad149b80c78a7df86ebdd5809e99f9bf283d172c8b123ab8255eb98ac91e7a5c7b475 WHIRLPOOL a37e300cb9c85b9ee840eb0eacc12fb5d0ca54e22246c8708df75e27738ee49b5caba52336533b2af6c22301c6f1df2268d93499c52de6f8b065d5f67cdca5df
+DIST google-chrome-beta_30.0.1599.28-1_amd64.deb 44471356 SHA256 71d57fd9150b089adecf75ed36f14f335067a2f37257223ce566e4ea899743ea SHA512 f894a4ef55bacd900cdf85524669d2f0f52c13cce3b123e436aa4453ed486219b100a180703e1017cb066b9ecce2a89f940e109e346bed2cbeb909f9d3c96f23 WHIRLPOOL 342eb019f8a4cee3529ca452d7ec3d1e4e3e75da8274958856b42b3407d91304c1bcc03e412c64efdf2a39f931fdc13b91e18d90c1fe405ae46db9f19853bfc5
+DIST google-chrome-beta_30.0.1599.28-1_i386.deb 42324934 SHA256 cb3af8b063e98c45b24c607e6bd89e862fa6bc64ade093fd073e5f9326de91ea SHA512 c645ecc455a3e56db566e0fc11b5bf09c90be25e71c83f74ae3c12eb56aa7e2167d46dc2aa42a5dbbbcc26419affe022464b44e8105ba4f596910f538c7e1c5c WHIRLPOOL a912a5638f64bfff54a9e4b36da95ae3f6afba06e9e3474e65a0e13e7087d99d146a20589141876c1eadcae49298a6dd588babf09301f9ec7ced751c26381a22
 DIST google-chrome-stable_29.0.1547.65-r220622_amd64.deb 44155284 SHA256 f7944e9c8b09d5e48443d46f5981a56ec6b2c9dff1c809fd659369715a6eb7d2 SHA512 8219c2a046837176a7810717e768e20dfd107a9a613aee98842da93512fc58573c6a06cbb4e316a3af8ec7bc3b1cd2b86a72471505b235b636a1f2bd8126a50f WHIRLPOOL 7335797805567380ff272795caed08b1e03bd566a3f9fb53f1c75de975fb928bce92f5c5a8c019ae91dce6a868f33221a08271fa8d98f0f20a8af4406f64e955
 DIST google-chrome-stable_29.0.1547.65-r220622_i386.deb 41904804 SHA256 b3456451079b21e8d93d71b4540565d8905da6b829880e0554d9f36548f41626 SHA512 c19de9eb739f7ef395a00c897a1c6d7f64d9188f875215742e88dad78e486a1b4502f297fede0523468de82d2c8cdea9dd5e3d0e9ded8223f0c805ab64087d86 WHIRLPOOL 3d535bf21f00f316f17e826233bda4b699aac4e1c724971926aafc44252be636f913c3387ee71b0b4bfacacdb1e57a497a9fdaff3e6e5678c313bccaa8c2df53
 DIST google-chrome-unstable_31.0.1612.0-1_amd64.deb 44604006 SHA256 94259e86f087aa3ac349a23d52d2e05c37fb20fd70f47353e564d64030bba3ff SHA512 cb2c2c0c069894fe9c145e07c27f538b6f7489746ce5ec9b10da4268d94c556af6934cec1955964cb55715e28ec7585a2bcb078759fb4a89011840b99ea96f62 WHIRLPOOL 352500128c6971bea135b14e9ff40d836902d996cea031561e9cc3946e2f4f61f02144c600492460cab7e772a502645ec116279054b0f9529ce00d93a8101767
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.22_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.28_beta1.ebuild
similarity index 95%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.22_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.28_beta1.ebuild
index 9834ac224b12..27e9f77ea305 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.22_beta1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.28_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.22_beta1.ebuild,v 1.1 2013/08/28 17:40:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-30.0.1599.28_beta1.ebuild,v 1.1 2013/09/05 23:32:13 floppym Exp $
 
 EAPI=4
 
diff --git a/www-servers/mongrel_cluster/mongrel_cluster-1.0.5-r1.ebuild b/www-servers/mongrel_cluster/mongrel_cluster-1.0.5-r1.ebuild
deleted file mode 100644
index 520c65256016..000000000000
--- a/www-servers/mongrel_cluster/mongrel_cluster-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mongrel_cluster/mongrel_cluster-1.0.5-r1.ebuild,v 1.3 2012/04/30 06:51:31 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-RUBY_FAKEGEM_EXTRAINSTALL="resources"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes"
-HOMEPAGE="http://mongrel.rubyforge.org/docs/mongrel_cluster.html"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=www-servers/mongrel-1.0.2
-	>=dev-ruby/gem_plugin-0.2.3"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newinitd "${FILESDIR}/mongrel_cluster" mongrel_cluster
-}
diff --git a/www-servers/nginx/nginx-1.4.1-r5.ebuild b/www-servers/nginx/nginx-1.4.1-r5.ebuild
index ec5a09c5b2cc..9eb4f488ef79 100644
--- a/www-servers/nginx/nginx-1.4.1-r5.ebuild
+++ b/www-servers/nginx/nginx-1.4.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r5.ebuild,v 1.2 2013/06/02 22:48:30 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r5.ebuild,v 1.3 2013/09/05 17:47:13 ago Exp $
 
 EAPI="5"
 
@@ -131,7 +131,7 @@ SRC_URI="http://nginx.org/download/${P}.tar.gz
 
 LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
 geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
diff --git a/www-servers/tornado/tornado-2.4-r1.ebuild b/www-servers/tornado/tornado-2.4-r1.ebuild
index 14b4f7cd2c8c..6695d96f6dfa 100644
--- a/www-servers/tornado/tornado-2.4-r1.ebuild
+++ b/www-servers/tornado/tornado-2.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.4 2013/05/20 15:51:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.6 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
-RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )
-	python_targets_python2_5? (
-		dev-python/simplejson[python_targets_python2_5] )"
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/tornado/tornado-2.4.1.ebuild b/www-servers/tornado/tornado-2.4.1.ebuild
index 306950865043..d31839a18d30 100644
--- a/www-servers/tornado/tornado-2.4.1.ebuild
+++ b/www-servers/tornado/tornado-2.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.2 2013/05/20 15:51:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.4 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
 inherit distutils-r1
 
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
-RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )
-	python_targets_python2_5? (
-		dev-python/simplejson[python_targets_python2_5] )"
+RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7aa3e3db1230..1311a4e088ba 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,4 +1,5 @@
 DIST NVIDIA-FreeBSD-x86-173.14.37.tar.gz 19603409 SHA256 568109656f95791448306d55e7732ca5f963c8ecd06cb0bf8c41c8b75d8eaa44 SHA512 86bd796210b18d634d6733f1d4fd3fefa91cffdd2be5ad0c9712f04c8740b8f9446e9ef04daf44d7cc8d5a491c1d34060837a8bdff5e7be2c390897049ee601b WHIRLPOOL 64c4ebe9e0ab8abb8c136a8aa9a0c7546958e54cdb229dca96a469356d56e1e74dcb9e5913472a8306b0cd17454bb8da5d688453b318e328419c529e6f820b26
+DIST NVIDIA-FreeBSD-x86-173.14.38.tar.gz 19603538 SHA256 5e2d8e2151240df06632d9fd42bdb2ecdbf2ed8b29487f84f0f90a68e3f08185 SHA512 4b3d94e1d9718d651025410d32eb93c0536bf72bd9963671ac063804f9d32ea30aeeb691638927b7045fa7f192a93f312e296bd1ac51f226058cf073a79a0c6d WHIRLPOOL 02efd3e25bae76c89f647ed10ad5398702ff5b23723619a90e68f4b4c0155d273ff89e5397ddd6dfff0ba8a23691f173ccedcb8f247b60a919848813b560e82c
 DIST NVIDIA-FreeBSD-x86-304.108.tar.gz 33658984 SHA256 75908c8d062c8eeb1bc32ba1497485b4528f164bba2b2f6ba535e7c39ff04d4a SHA512 f16a742aac04f4f9e69ae466c5ec5d3a050bdbc10c70310f9d34ad3a553df02718e47f4b4c1eb9d1c103886959a787bb931782d9792f7055234d80c99d02f056 WHIRLPOOL 25e0e929c16b62669c105d2f8d9a4be3507cfba4088c6af63f3aa0473e72e1e8c05be7693bbac0e3c0a7f8e04b6abf2b400a2ad9f0da56ba7caaf96cdb3cfe88
 DIST NVIDIA-FreeBSD-x86-304.88.tar.gz 33651825 SHA256 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d SHA512 6dab929d2d2bacfc3a96ab24ff02996938613851e2b3c050ed3a1d0cca3751c574f12508e21119f2b43ff0421c3f88bf4edd51a37f3374c72c6337bcb8d6bcdb WHIRLPOOL b9be513a8dd8ce4cd6eeb23a24e725c751bb2cce0745477df2b4b84d7d03ad557d0b16bcdfb8d642168de09d59b057cb2955fca11f50b281ebad92f30a7dc4e1
 DIST NVIDIA-FreeBSD-x86-310.51.tar.gz 19512752 SHA256 95772b0b31a438f5f58e15c09d752a0dd7c3e98afda60e7b8239ebd2557d43a0 SHA512 9060d16e38c3edd080328dadc03df0601be76a79fa5610024077705c2ff177e6c7dc4e9a2c5fad6b58ef77b2c34477408a377a4dd12fe7ed47fcd48199bd572f WHIRLPOOL 151d874e61880a2eee146ca51d20a66c2f563b6c2e04c3070a1e6309c2a572dafdb18a6c8e385a2f767d652b2a236e5bd3a355e9abcf23d750fff5d2a9371817
@@ -17,6 +18,7 @@ DIST NVIDIA-FreeBSD-x86_64-319.49.tar.gz 34444632 SHA256 36b09e0c01907a7f50fe4a9
 DIST NVIDIA-FreeBSD-x86_64-325.08.tar.gz 34575119 SHA256 e51b13e63ac83d61f44068d9e883854fb3c2773a85ed4e6a44eec7e68dfc08eb SHA512 39a30e558e2253a112f8cef89b4f15a2c9f783cc8cf4bebd3404f5547505310ce48522676e2c1ac3d4d906dbc4a22a3d1032f9970a676a2f15b5c4f20f70ad58 WHIRLPOOL 58f753dba1e58380fa1763c5b03d624fc957973551645900ef92760ca65c9ffb584cd5045793755a01298077f44875425d368238c4fb6205d40493cf2be99b6f
 DIST NVIDIA-FreeBSD-x86_64-325.15.tar.gz 34590166 SHA256 92429119ca8e50baa06c6681ed2b9eb6c37cdf256a19ba4e1827be4b202a0569 SHA512 c9e4d41a5dcb02a280fb323fd4578bc7851d4242890f1d8e69a59e083a2a76cccdaba3ed55f8eb8f983e9c89326f0a9d7152bd7770230fbe45fc7b5865c486b6 WHIRLPOOL c54638af7fb6aaf63222ea75cc377e5e449dfaa80dd47a23aed2eec8da1c460c9e3c24627a2853287585a65b0f562e3efc7916fe985a4816d82aebc12bf7021b
 DIST NVIDIA-Linux-x86-173.14.37-pkg0.run 14765478 SHA256 0c16885a1d8c370f85be73fe2ebb1e74c0e23932b349ca381b02c2b67ab9371a SHA512 0329bb7a971a93982be2626661d6f3faeede19ce6fef603afc85cce74cea1d5ffd7c93091c4e82de60a5a54d869b47cb2014677ae64081d234d7eb0745e01937 WHIRLPOOL dd558a6ef3a08d7cd1471c25b2d2b533f0a4631e58705d01eedf13b66a134797a07d8e7377313b9cdd55edcf1344c58e6f225998cb593f8eb6e26846a62dfb5d
+DIST NVIDIA-Linux-x86-173.14.38-pkg0.run 14762614 SHA256 386ca230632f617de0ae975c037e3570469d3313a8ef488620d4af40c50e3d41 SHA512 1467a5d79bbc6a655dd3475e6a1e9281a525ae11c11207a9ffa797187ba3d040762e40380632ade02bc0125686e1dbc0cd9f5ac7fcaf4e95f5bacd0c80f7c123 WHIRLPOOL 815258bb2f0715c0330b273c224f6b42a84a59b9eb336a079e39914a4196bfceb30a0ddd3a02fea76e96ed3d74623c4204e44570d29f6f5592f4eb90f614ea90
 DIST NVIDIA-Linux-x86-304.108.run 39700058 SHA256 c965d36f896ed154f0801a3e1936fcc195f12e76cf300fc6d890c3195082c838 SHA512 a8478f098962fdd4a6db80d844930e39e020f7842407d6c5770e2aecdd8aea7fcd83c5fc527ec3b0c3688ee834d002657b40fff9deb6b4d6a67bc8c29053f714 WHIRLPOOL 8e2e4f7bdcdfaa602cffac1ec5413e137763dd0868c03d0b49322c80f6f0b82248ec8b5af2815bd4a5b504b776a5b36b69e2021ecc92d173206ee326d6450f02
 DIST NVIDIA-Linux-x86-304.88.run 39682604 SHA256 71e10294f073e31a387da4282b95cdde5fbfc996cb1c564f290eb0df1289b7cb SHA512 ba6f0236aead2f5161c94c7eaffb2497815ba1a7cbf872ae37d620d66533d4847acb6dfcc230e2b751aa9717ae552940ed6d3da1a9209aa54f6a810e3f551e49 WHIRLPOOL 9c2e0438630e86ca8c7aa2f26928113e5f15dcf808be8a4c2e937fd04b8d1aa7304bda714580834cc5ef4dc57304f41be62b55ee75545b9cfca3533b6db737e6
 DIST NVIDIA-Linux-x86-310.51.run 38891291 SHA256 f2162d903bf0873b9d4e1ad6dc464a10ee9f28b508a10525879c51ed5f47c6ca SHA512 41e14da121140be7c068703e9adbb4208cd3d9b786167523b1fc04420b7f830d89b1bcaa4a1cfa991bd59f48e1d74bb50f16493256e5fab355047985d180d26a WHIRLPOOL e548ac02b98e13aa72d9291ab668f60ba0491f9b8b91e7dda129f1e2968e105945fa41da388af189e3ceec2d699c2bc591e3dfac4759c62726a139087389f956
@@ -27,6 +29,7 @@ DIST NVIDIA-Linux-x86-325.08.run 27288921 SHA256 37d0f16a75d9cf176557cc35a00c599
 DIST NVIDIA-Linux-x86-325.15.run 27409286 SHA256 3d790e4bfed24641f7cc76879144ab5d52b12271012ba381b0d33aa1a2e08775 SHA512 48052c3daa8748a7c43de1c24e00fdd3f94cebbe7f5efbb185a0472a1d0bbab8adfe377359ccdc6cd8e437a80506fdd551408237b0842c194a3497c43cf3487e WHIRLPOOL 387fb8af1a31cc295abe7b15fee7d5bc01c515603b178abe7f50864dbbf0685ca50f88e67359adc4af8e90caaeb1fba95aa6af9f54e6fced46c82c5cfc094390
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.37-pkg2.run 20647769 SHA256 3e34a48cf4143469e6ae60c792932b5e920d7244ed374eb818d5d72af94a7809 SHA512 618a4379694a3102a7c0487c552aca3664639c45432b64aadac9f90c0e9dcad4de82b0dec15f7fdf03b2b222713133ee9f4a936755915d38a2c2fef0bc97f342 WHIRLPOOL 9ed7b65a26b6f846d0ec1aeb1eb051331e808c6791ace7324951bdf20861701fc1b9c9cbc00cacd9d86c9d9568509069d9ecf35b7fd8d1c5b5dc0e3ef9c3db0a
+DIST NVIDIA-Linux-x86_64-173.14.38-pkg2.run 20649787 SHA256 d1c383e2c17fd176adabf6b5c0ef43004aa2be37c10edd47f65ed727a63d2c30 SHA512 9a8906b8232e11f0b839011fef312104d9d0ae15c2cb1b60217e8c31a3ce17b4f1536709d398ce3abc7740a2e586bdf30d9ce8299e2c6bb4dd4ec7cea85623d4 WHIRLPOOL 27ea0450fc9538f4fd1ea65baeda5da534b78e15cf73818fb1c974edf293259a4ab1bcfba8a4eae1c770028b30403668cce51c928c431d061b3cccbb7bb476c6
 DIST NVIDIA-Linux-x86_64-304.108.run 68052588 SHA256 56a61871f0488521f50c04607c568a177cad48a577c0f4ca625665d0015e2b39 SHA512 f8dfd38c4a9b8e127fe7ca567a46edfaca3e410bdfb82a7de0d72f78144013537638f6cad760dee06f911a04f2897410280fe560a84b55225cc7e42525159f90 WHIRLPOOL 6a0b14caea8167c328141f69fe538bd798040969c1e718c93f5fca7a077b652f6ceea96962212d432baf69e2b687ce0f2a3a7463a4549b5697e7ec4fc2bc8208
 DIST NVIDIA-Linux-x86_64-304.88.run 68041437 SHA256 c1a73211566b085214b0ad1824733aa56d09c6139f729feebd0eff44f6113da3 SHA512 8a907f9ed307b1e4b5563a9aba9d6c1c036885cd64a4a229d6831eb7a855921971e652b7940333e366d5088f97cf3596fb739853b3c3cf94446ee0cea6164ab2 WHIRLPOOL 2e43479bb52d1dcbe1007cda779ab21ed064883769358a09bdd765e55f6b35a855a51006e070d33ddd2a3808802cdb4fa2ae63cc7cc189561934d00574492ca8
 DIST NVIDIA-Linux-x86_64-310.51.run 68401088 SHA256 4d0f9829105a8f06121f8308fa5e67834f52b84add48eaf4101b02522db15f53 SHA512 d36406d9adbb77f80386191f623c845977fbbd86c994b60920ba97fff974efd68e4c83d8d8f2bf9323903bc49391f21c82425eef8f011549aa7b4591634232aa WHIRLPOOL c4ef120eb72b0789158e8f6f3806538523a1aff015a78eb6b089aca7baf1e9a4563e4116a22a18c22548a0708ee504f10a94b3f5504e229d69b519615ff12fb5
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild
new file mode 100644
index 000000000000..9495d4013e93
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.38.ebuild,v 1.3 2013/09/05 14:49:10 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
+	unpacker user versionator
+
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="GPL-2 NVIDIA-r1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="acpi multilib kernel_linux tools"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="
+	>=app-admin/eselect-opengl-1.0.9
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	<x11-base/xorg-server-1.14.99
+	acpi? ( sys-power/acpid )
+	multilib? (
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-opengl
+		)
+	)
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+"
+
+QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/libcuda.so.${PV}
+	usr/lib/libnvidia-cfg.so.${PV}
+	usr/lib/libvdpau_nvidia.so.${PV}
+	usr/lib/libXvMCNVIDIA.so.${PV}"
+
+QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
+	usr/lib/opengl/nvidia/lib/libGL.so.1
+	usr/lib/opengl/nvidia/lib/libGLcore.so.1
+	usr/lib/libnvidia-cfg.so.1
+	usr/lib/opengl/nvidia/extensions/libglx.so.1
+	usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
+QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib32/libcuda.so.${PV}
+	usr/lib32/libvdpau_nvidia.so.${PV}"
+
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
+
+QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/libnvcompiler.so.${PV}
+	usr/lib64/libXvMCNVIDIA.so.${PV}
+	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
+	usr/lib64/libnvidia-cfg.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
+	opt/bin/nvidia-settings
+	opt/bin/nvidia-smi
+	opt/bin/nvidia-xconfig"
+
+QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/libXvMCNVIDIA.a"
+
+QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
+
+QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
+
+QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib32/libvdpau_nvidia.so.${PV}
+	usr/lib64/libXvMCNVIDIA.so.${PV}
+	usr/lib64/libcuda.so.${PV}
+	usr/lib64/libnvidia-cfg.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
+	usr/lib64/libvdpau_nvidia.so.${PV}
+	opt/bin/nvidia-settings
+	opt/bin/nvidia-smi
+	opt/bin/nvidia-xconfig"
+
+QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
+	usr/lib/libnvidia-cfg.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/libXvMCNVIDIA.so.${PV}
+	usr/lib/libvdpau_nvidia.so.${PV}
+	opt/bin/nvidia-settings
+	opt/bin/nvidia-smi
+	opt/bin/nvidia-xconfig"
+
+S="${WORKDIR}/"
+
+mtrr_check() {
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "Please enable MTRR support in your kernel config, found at:"
+		eerror
+		eerror "  Processor type and features"
+		eerror "    [*] MTRR (Memory Type Range Register) support"
+		eerror
+		eerror "and recompile your kernel ..."
+		die "MTRR support not detected!"
+	fi
+}
+
+lockdep_check() {
+	if linux_chkconfig_present LOCKDEP; then
+		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
+		eerror "which will prevent ${P} from compiling."
+		eerror "Please make sure the following options have been unset:"
+		eerror "    Kernel hacking  --->"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
+		eerror "in 'menuconfig'"
+		die "LOCKDEP enabled"
+	fi
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default abi."
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+		mtrr_check
+		lockdep_check
+	fi
+
+	# On BSD userland it wants real make command
+	use userland_BSD && MAKE="$(get_bmake)"
+
+	export _POSIX2_VERSION="199209"
+
+	if use kernel_linux && kernel_is ge 3 12 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-3.12"
+		ewarn "<sys-kernel/vanilla-sources-3.12"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_EXEC="${S}/obj"
+		NV_LIB="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_X11_DRV="${NV_X11}"
+		NV_X11_EXT="${NV_X11}"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}/usr/share/doc"
+		NV_EXEC="${S}/usr/bin"
+		NV_LIB="${S}/usr/lib"
+		NV_SRC="${S}/usr/src/nv"
+		NV_MAN="${S}/usr/share/man/man1"
+		NV_X11="${S}/usr/X11R6/lib"
+		NV_X11_DRV="${NV_X11}/modules/drivers"
+		NV_X11_EXT="${NV_X11}/modules/extensions"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_unpack() {
+	if use kernel_linux && kernel_is lt 2 6 7; then
+		echo
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+		ewarn "This is not officially supported for ${P}. It is likely you"
+		ewarn "will not be able to compile or use the kernel module."
+		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+		echo
+		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+	fi
+
+	if ! use x86-fbsd; then
+		mkdir "${S}"
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+	use x86-fbsd && cd doc
+
+	# Use the correct defines to make gtkglext build work
+	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
+
+	if use kernel_linux; then
+		# Quiet down warnings the user does not need to see
+		sed -i \
+			-e 's:-Wpointer-arith::g' \
+			-e 's:-Wsign-compare::g' \
+			"${NV_SRC}"/Makefile.kbuild
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use x86-fbsd; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)"
+	elif use kernel_linux; then
+		linux-mod_src_compile
+	fi
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "$VIDEOGROUP" ]; then
+			eerror "Failed to determine the video group gid."
+			die "Failed to determine the video group gid."
+		fi
+
+		# Add the aliases
+		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
+		sed -e 's:PACKAGE:'${PF}':g' \
+			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
+			"${WORKDIR}"/nvidia
+		insinto /etc/modprobe.d
+		newins "${WORKDIR}"/nvidia nvidia.conf
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld"
+
+		exeinto /boot/modules
+		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
+		die "failed to install libnvidia-cfg"
+	dosym libnvidia-cfg.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libnvidia-cfg.so.1 || \
+		die "failed to create libnvidia-cfg.so.1 symlink"
+	dosym libnvidia-cfg.so.1 \
+		/usr/$(get_libdir)/libnvidia-cfg.so || \
+		die "failed to create libnvidia-cfg.so symlink"
+
+	# Xorg DDX driver
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+	doins ${NV_X11_DRV}/nvidia_drv.so
+
+	# Xorg GLX driver
+	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
+	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
+		die "failed to install libglx.so"
+	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
+		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
+		die "failed to create libglx.so symlink"
+
+	# XvMC driver
+	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+		die "failed to install libXvMCNVIDIA.so"
+	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
+		die "failed to install libXvMCNVIDIA.so"
+	dosym libXvMCNVIDIA.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
+		die "failed to create libXvMCNVIDIA.so.1 symlink"
+	dosym libXvMCNVIDIA.so.1 \
+		/usr/$(get_libdir)/libXvMCNVIDIA.so || \
+		die "failed to create libXvMCNVIDIA.so symlink"
+	dosym libXvMCNVIDIA.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+		die "failed to create libXvMCNVIDIA_dynamic.so.1 symlink"
+
+	# CUDA headers (driver to come)
+	if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
+		dodir /usr/include/cuda
+		insinto /usr/include/cuda
+		doins usr/include/cuda/*.h
+	fi
+
+	# OpenCL headers (driver to come)
+	if [[ -d ${S}/usr/include/CL ]]; then
+		dodir /usr/include/CL
+		insinto /usr/include/CL
+		doins usr/include/CL/*.h
+	fi
+
+	# Documentation
+	dodoc ${NV_DOC}/XF86Config.sample
+	dohtml ${NV_DOC}/html/*
+	if use x86-fbsd; then
+		dodoc "${NV_DOC}/README"
+		doman "${NV_MAN}/nvidia-xconfig.1"
+		doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		doman "${NV_MAN}/nvidia-settings.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+	doexe ${NV_EXEC}/nvidia-xconfig
+	doexe ${NV_EXEC}/nvidia-bug-report.sh
+	if use tools; then
+		doexe usr/bin/nvidia-settings
+	fi
+	if use kernel_linux; then
+		doexe ${NV_EXEC}/nvidia-smi
+	fi
+
+	# Desktop entry for nvidia-settings
+	if use tools && use kernel_linux; then
+		sed -e 's:__UTILS_PATH__:/opt/bin:' \
+			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+			-e '/^Categories/s|Application;||g' \
+			-i "${S}"/usr/share/applications//nvidia-settings.desktop
+		newmenu "${S}"/usr/share/applications/nvidia-settings.desktop \
+			nvidia-settings-opt.desktop
+	fi
+
+	if has_multilib_profile ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second parameter is the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	doexe $2.$3
+	dosym ${libname}.$3 $1/${libname}
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local libdir= sover=
+
+	if use kernel_linux; then
+		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+			libdir=usr/lib32
+		else
+			libdir=usr/lib
+		fi
+		sover=${PV}
+	else
+		libdir=obj
+		# on FreeBSD it has just .1 suffix
+		sover=1
+	fi
+
+	# The GLX libraries
+	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
+	if use x86-fbsd; then
+		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
+	else
+		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
+	fi
+
+	#cuda
+	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
+		dolib.so ${libdir}/libcuda.so.${sover}
+		[[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
+		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
+	fi
+
+	#vdpau
+	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
+		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
+		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
+	fi
+
+	# OpenCL
+	# NOTE: This isn't currently available in the publicly released drivers.
+	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
+
+		dolib.so ${libdir}/libnvcompiler.so.${sover}
+		[[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
+		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
+
+		dolib.so ${libdir}/libOpenCL.so.1.0.0
+		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
+		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
+	fi
+}
+
+pkg_preinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+
+	elog "You must be in the video group to use the NVIDIA device"
+	elog "For more info, read the docs at"
+	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
+	elog
+	elog "This ebuild installs a kernel module and X driver. Both must"
+	elog "match explicitly in their version. This means, if you restart"
+	elog "X, you must modprobe -r nvidia before starting it back up"
+	elog
+	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
+	elog
+	elog "NVIDIA has requested that any bug reports submitted have the"
+	elog "output of nvidia-bug-report.sh included."
+	elog
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+	fi
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild
index 9c98e860860f..fa6c5d53d3c1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild,v 1.1 2013/08/26 00:11:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild,v 1.2 2013/09/05 13:16:23 jer Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
diff --git a/x11-libs/libxcb/libxcb-1.9-r1.ebuild b/x11-libs/libxcb/libxcb-1.9-r1.ebuild
index eaee6ec4b7d6..01a03ff388b0 100644
--- a/x11-libs/libxcb/libxcb-1.9-r1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.9-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.9-r1.ebuild,v 1.3 2013/06/30 15:16:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.9-r1.ebuild,v 1.4 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE=xml
 
 XORG_DOC=doc
diff --git a/x11-libs/libxcb/libxcb-1.9.1.ebuild b/x11-libs/libxcb/libxcb-1.9.1.ebuild
index b61ad3a1247e..3fce45305947 100644
--- a/x11-libs/libxcb/libxcb-1.9.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.9.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.9.1.ebuild,v 1.3 2013/06/30 15:16:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.9.1.ebuild,v 1.4 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE=xml
 
 XORG_DOC=doc
diff --git a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild b/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
index a08ca23c1271..2a99e3697b1d 100644
--- a/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.7 2013/09/04 09:20:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.7.2.ebuild,v 1.9 2013/09/05 19:25:00 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0/9"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="doc python"
 
 DEPEND="
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r1.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r1.ebuild
index 063772a49933..ce231283acf9 100644
--- a/x11-libs/xpyb/xpyb-1.3.1-r1.ebuild
+++ b/x11-libs/xpyb/xpyb-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpyb/xpyb-1.3.1-r1.ebuild,v 1.13 2013/04/10 19:52:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xpyb/xpyb-1.3.1-r1.ebuild,v 1.14 2013/09/05 19:44:47 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit python-single-r1 xorg-2
 
 #EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/xpyb"
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
index bb69800fc425..c0d5d6a00ce4 100644
--- a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.6 2013/03/09 10:45:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.7 2013/09/05 19:44:48 mgorny Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver"
 [[ ${PV} = 9999 ]] && inherit git-2
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils autotools python-any-r1
 
 DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
index 5458992a3df0..a79c2eaaa45d 100644
--- a/x11-libs/xvba-video/xvba-video-9999.ebuild
+++ b/x11-libs/xvba-video/xvba-video-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.6 2013/03/09 10:45:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.7 2013/09/05 19:44:48 mgorny Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver"
 [[ ${PV} = 9999 ]] && inherit git-2
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit eutils autotools python-any-r1
 
 DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
diff --git a/x11-misc/devilspie2/devilspie2-0.30.ebuild b/x11-misc/devilspie2/devilspie2-0.30.ebuild
index 051b5ebd0bdf..1c4619c2b2d2 100644
--- a/x11-misc/devilspie2/devilspie2-0.30.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/devilspie2/devilspie2-0.30.ebuild,v 1.2 2013/08/31 09:44:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/devilspie2/devilspie2-0.30.ebuild,v 1.3 2013/09/05 19:22:33 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://devilspie2.gusnan.se/download/${PN}_${PV}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.32.4:2
diff --git a/x11-misc/dex/dex-0.6.ebuild b/x11-misc/dex/dex-0.6.ebuild
index 87179b12223d..08696aa9e41c 100644
--- a/x11-misc/dex/dex-0.6.ebuild
+++ b/x11-misc/dex/dex-0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dex/dex-0.6.ebuild,v 1.2 2013/01/09 13:03:37 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dex/dex-0.6.ebuild,v 1.3 2013/09/05 19:44:44 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{3_2,3_3} )
 inherit eutils python-r1
 
 DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries"
diff --git a/x11-misc/evolvotron/evolvotron-0.6.2.ebuild b/x11-misc/evolvotron/evolvotron-0.6.2.ebuild
index 859ac5e3004a..fd01c7edba1b 100644
--- a/x11-misc/evolvotron/evolvotron-0.6.2.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/evolvotron/evolvotron-0.6.2.ebuild,v 1.4 2013/08/31 09:44:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/evolvotron/evolvotron-0.6.2.ebuild,v 1.5 2013/09/05 19:24:10 ago Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/py3status/py3status-1.0.ebuild b/x11-misc/py3status/py3status-1.0.ebuild
index 580a7d6ab268..f37e503b213a 100644
--- a/x11-misc/py3status/py3status-1.0.ebuild
+++ b/x11-misc/py3status/py3status-1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/py3status/py3status-1.0.ebuild,v 1.2 2013/08/31 12:12:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/py3status/py3status-1.0.ebuild,v 1.3 2013/09/05 19:44:56 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
 SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz"
 
diff --git a/x11-misc/treeline/treeline-1.4.1-r1.ebuild b/x11-misc/treeline/treeline-1.4.1-r1.ebuild
index 630ccff84880..c8d324ef20bb 100644
--- a/x11-misc/treeline/treeline-1.4.1-r1.ebuild
+++ b/x11-misc/treeline/treeline-1.4.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.4.1-r1.ebuild,v 1.1 2013/07/22 12:15:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/treeline/treeline-1.4.1-r1.ebuild,v 1.2 2013/09/05 19:44:50 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils python-single-r1
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.0.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.0.ebuild
index 8c220b7c194b..964e0561eced 100644
--- a/x11-misc/urxvt-perls/urxvt-perls-2.0.ebuild
+++ b/x11-misc/urxvt-perls/urxvt-perls-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/urxvt-perls/urxvt-perls-2.0.ebuild,v 1.2 2013/09/04 13:25:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/urxvt-perls/urxvt-perls-2.0.ebuild,v 1.3 2013/09/05 19:22:00 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/muennich/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-misc/xsel
diff --git a/x11-misc/xscreensaver/xscreensaver-5.22.ebuild b/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
index 042b737ba29e..7826c62e85db 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.22.ebuild,v 1.9 2013/09/02 11:14:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.22.ebuild,v 1.10 2013/09/05 12:22:57 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib pam
@@ -11,7 +11,7 @@ SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="dev-libs/libxml2
diff --git a/x11-plugins/screenlets/screenlets-0.1.6.ebuild b/x11-plugins/screenlets/screenlets-0.1.6.ebuild
index 21288f64af6d..6f1efd362a11 100644
--- a/x11-plugins/screenlets/screenlets-0.1.6.ebuild
+++ b/x11-plugins/screenlets/screenlets-0.1.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/screenlets/screenlets-0.1.6.ebuild,v 1.3 2013/06/01 14:10:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/screenlets/screenlets-0.1.6.ebuild,v 1.4 2013/09/05 19:44:54 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_COMPAT=( python2_{6,7} )
 DISTUTILS_SINGLE_IMPL=yes
 
 inherit distutils-r1 eutils
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild
index b7d6da89e436..c9414bcdad84 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild,v 1.14 2013/04/10 19:52:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r1.ebuild,v 1.15 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit python-single-r1 xorg-2
 
 DESCRIPTION="X C-language Bindings protocol headers"
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild
index e1a85ae4b5fb..f8c1acdb7688 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild,v 1.1 2013/03/23 18:45:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r2.ebuild,v 1.2 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 XORG_MULTILIB=yes
 inherit python-single-r1 xorg-2
 
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
index 3b97c7e69743..b5f15923d4cc 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild,v 1.2 2013/05/23 19:39:59 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild,v 1.3 2013/09/05 19:44:45 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 XORG_MULTILIB=yes
 
 inherit python-r1 xorg-2
diff --git a/x11-wm/xpra/xpra-0.8.8.ebuild b/x11-wm/xpra/xpra-0.8.8.ebuild
index b764402762a7..6f573a0b0ccc 100644
--- a/x11-wm/xpra/xpra-0.8.8.ebuild
+++ b/x11-wm/xpra/xpra-0.8.8.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.8.ebuild,v 1.4 2013/08/11 23:02:34 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.8.ebuild,v 1.5 2013/09/05 19:44:49 mgorny Exp $
 
 EAPI=5
 
 #dev-python/pygobject and dev-python/pygtk do not support python3
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"