diff --git a/app-admin/sysstat/sysstat-10.2.1-r1.ebuild b/app-admin/sysstat/sysstat-10.2.1-r1.ebuild
index 86355cb22e4a..4a21dd829b7b 100644
--- a/app-admin/sysstat/sysstat-10.2.1-r1.ebuild
+++ b/app-admin/sysstat/sysstat-10.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.1-r1.ebuild,v 1.7 2014/07/11 21:27:46 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.1-r1.ebuild,v 1.8 2014/07/20 11:32:04 klausman Exp $
 
 EAPI=5
 inherit eutils multilib systemd toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="cron debug +doc isag nls lm_sensors selinux"
 
 RDEPEND="
diff --git a/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild b/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild
index 7d47e9ebdc13..c0b818f6fd30 100644
--- a/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild
+++ b/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild,v 1.7 2014/06/15 14:39:50 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-de-alt/myspell-de-alt-20120929.ebuild,v 1.8 2014/07/20 08:47:37 klausman Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/german-de-de-1901-ol
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 src_prepare() {
 	# Nicely rename; http://www.iana.org/assignments/language-subtag-registry
diff --git a/app-misc/spacenavd/spacenavd-0.5-r4.ebuild b/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
index 67170db155b4..0365a910d008 100644
--- a/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.6 2013/02/12 16:51:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.7 2014/07/20 12:07:30 pacho Exp $
 
 EAPI="4"
 
diff --git a/app-misc/spacenavd/spacenavd-0.5-r5.ebuild b/app-misc/spacenavd/spacenavd-0.5-r5.ebuild
index abf2873b0009..b26dcfba3d49 100644
--- a/app-misc/spacenavd/spacenavd-0.5-r5.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r5.ebuild,v 1.1 2014/03/30 09:53:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r5.ebuild,v 1.2 2014/07/20 12:07:30 pacho Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X"
 
 RDEPEND="X? ( x11-apps/xdpyinfo )"
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
index 0f56e685f03b..785dac945c72 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild,v 1.4 2014/06/19 18:13:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.2.ebuild,v 1.5 2014/07/20 12:15:05 klausman Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~amd64 arm hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-text/qpdf/qpdf-5.1.1.ebuild b/app-text/qpdf/qpdf-5.1.1.ebuild
index ebfd90a0373c..c2c07f00c82c 100644
--- a/app-text/qpdf/qpdf-5.1.1.ebuild
+++ b/app-text/qpdf/qpdf-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-5.1.1.ebuild,v 1.6 2014/06/08 11:07:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-5.1.1.ebuild,v 1.7 2014/07/20 11:56:18 klausman Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0/13" # subslot = libqpdf soname version
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples static-libs test"
 
 RDEPEND="dev-libs/libpcre
diff --git a/app-text/xapian-omega/xapian-omega-1.2.17.ebuild b/app-text/xapian-omega/xapian-omega-1.2.17.ebuild
index a4db2f06fac0..b6efe9d838d7 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.17.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.17.ebuild,v 1.5 2014/06/18 10:35:25 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.17.ebuild,v 1.6 2014/07/20 10:02:57 klausman Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/xapian-${PV}
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
index 153a4eb1d0a8..e62ddbb56485 100644
--- a/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild,v 1.3 2013/06/27 21:43:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.3-r1.ebuild,v 1.5 2014/07/20 09:20:33 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
index 2038aef46d7c..604f2b83d725 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild,v 1.2 2014/05/30 11:46:09 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild,v 1.4 2014/07/20 09:20:22 pacho Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE="c3p0 log4j"
 
diff --git a/dev-libs/xapian/xapian-1.2.17.ebuild b/dev-libs/xapian/xapian-1.2.17.ebuild
index d3c7a9646007..33188a19d932 100644
--- a/dev-libs/xapian/xapian-1.2.17.ebuild
+++ b/dev-libs/xapian/xapian-1.2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.17.ebuild,v 1.5 2014/06/18 10:33:58 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.17.ebuild,v 1.6 2014/07/20 10:02:37 klausman Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="doc static-libs -sse +sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.17.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.17.0.ebuild
index 4e40a8d8582d..14b0f576886d 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.17.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.17.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.17.0.ebuild,v 1.5 2014/06/18 10:34:44 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.17.0.ebuild,v 1.6 2014/07/20 10:02:47 klausman Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library."
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~mips ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="~dev-libs/xapian-${VERSION}
diff --git a/dev-python/chardet/chardet-2.2.1.ebuild b/dev-python/chardet/chardet-2.2.1.ebuild
index de3a2dfbaa50..432db3bb3ea8 100644
--- a/dev-python/chardet/chardet-2.2.1.ebuild
+++ b/dev-python/chardet/chardet-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chardet/chardet-2.2.1.ebuild,v 1.12 2014/06/19 18:12:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/chardet/chardet-2.2.1.ebuild,v 1.13 2014/07/20 12:15:29 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fixtures/fixtures-0.3.14-r2.ebuild b/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
index 491194a2137a..156bdf57dfbb 100644
--- a/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r2.ebuild,v 1.2 2014/06/29 08:48:51 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14-r2.ebuild,v 1.3 2014/07/20 11:05:10 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # nose not listed but provides coverage output of tests
diff --git a/dev-python/flake8/flake8-2.0.ebuild b/dev-python/flake8/flake8-2.0.ebuild
index be78434e310e..725a2719edf9 100644
--- a/dev-python/flake8/flake8-2.0.ebuild
+++ b/dev-python/flake8/flake8-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0.ebuild,v 1.9 2014/06/08 09:25:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.0.ebuild,v 1.10 2014/07/20 11:05:24 klausman Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="http://bitbucket.org/tarek/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 x86"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild
index 874a4bb1b9de..6af6e8c5b87a 100644
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ b/dev-python/flake8/flake8-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.1.0.ebuild,v 1.6 2014/06/08 09:25:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flake8/flake8-2.1.0.ebuild,v 1.7 2014/07/20 09:45:32 klausman Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
 HOMEPAGE="http://bitbucket.org/tarek/flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index aec77b682fd2..50382141d2cb 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.8 2014/06/08 09:23:49 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mccabe/mccabe-0.2.1.ebuild,v 1.9 2014/07/20 11:06:08 klausman Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="a plugin for flake8"
 HOMEPAGE="https://github.com/flintwork/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild
index 717c54faa6f0..c244eff04773 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild,v 1.7 2014/06/19 18:12:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ndg-httpsclient/ndg-httpsclient-0.3.2.ebuild,v 1.8 2014/07/20 12:15:35 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pyopenssl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pbr/pbr-0.8.0.ebuild b/dev-python/pbr/pbr-0.8.0.ebuild
index 806383ec67d1..3f086b7cc64b 100644
--- a/dev-python/pbr/pbr-0.8.0.ebuild
+++ b/dev-python/pbr/pbr-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.0.ebuild,v 1.4 2014/06/08 09:53:20 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pbr/pbr-0.8.0.ebuild,v 1.5 2014/07/20 11:04:41 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index 1f89a83bf52b..e611bf36b9ad 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.5.7.ebuild,v 1.3 2014/06/08 09:16:29 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.5.7.ebuild,v 1.4 2014/07/20 11:06:02 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/pip-1.4.1.ebuild b/dev-python/pip/pip-1.4.1.ebuild
index 6b50519b381e..666327ab11ea 100644
--- a/dev-python/pip/pip-1.4.1.ebuild
+++ b/dev-python/pip/pip-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.4.1.ebuild,v 1.5 2014/03/31 20:40:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.4.1.ebuild,v 1.6 2014/07/20 11:05:37 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="zsh-completion"
 
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
index 522a3b414b10..bc078606e748 100644
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.8.1.ebuild,v 1.5 2014/06/08 09:22:28 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyflakes/pyflakes-0.8.1.ebuild,v 1.6 2014/07/20 11:05:53 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_7,3_{2,3,4}} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests/requests-2.3.0.ebuild b/dev-python/requests/requests-2.3.0.ebuild
index 8b6746117a70..4233e51f6e79 100644
--- a/dev-python/requests/requests-2.3.0.ebuild
+++ b/dev-python/requests/requests-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.3.0.ebuild,v 1.5 2014/06/19 18:12:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.3.0.ebuild,v 1.6 2014/07/20 12:15:19 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ~ia64 ~mips ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 # bundles dev-python/urllib3 snapshot
diff --git a/dev-python/setuptools/setuptools-2.2.ebuild b/dev-python/setuptools/setuptools-2.2.ebuild
index 852033c1d691..79aff0522a6f 100644
--- a/dev-python/setuptools/setuptools-2.2.ebuild
+++ b/dev-python/setuptools/setuptools-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-2.2.ebuild,v 1.9 2014/06/29 09:45:47 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-2.2.ebuild,v 1.10 2014/07/20 11:10:28 klausman Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
index 2a66280306a7..e4143e405b59 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild,v 1.4 2014/06/08 09:56:27 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.ebuild,v 1.5 2014/07/20 11:05:03 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild
index fdc10d62bf2b..19caa0a99b5b 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild,v 1.5 2014/06/19 18:13:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ssl-fetch/ssl-fetch-0.2.ebuild,v 1.6 2014/07/20 12:15:12 klausman Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~amd64 arm hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~x86"
 
 DEPEND=""
 
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index a9707023ed5c..c225be6a41c9 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18-r1.ebuild,v 1.1 2014/06/12 08:14:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testrepository/testrepository-0.0.18-r1.ebuild,v 1.2 2014/07/20 11:05:18 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index c6cad12ebe7e..d21e44234b78 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/testresources-0.2.7-r2.ebuild,v 1.2 2014/07/06 12:50:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testresources/testresources-0.2.7-r2.ebuild,v 1.3 2014/07/20 11:05:30 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/testscenarios/testscenarios-0.4-r5.ebuild b/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
index 9e946a511595..f6b690f91a3e 100644
--- a/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testscenarios/testscenarios-0.4-r5.ebuild,v 1.1 2014/06/12 08:13:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testscenarios/testscenarios-0.4-r5.ebuild,v 1.2 2014/07/20 11:05:44 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy2_0 pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/unidecode/unidecode-0.04.14.ebuild b/dev-python/unidecode/unidecode-0.04.14.ebuild
index 828ed68180e5..d7ef7d71b1f2 100644
--- a/dev-python/unidecode/unidecode-0.04.14.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.14.ebuild,v 1.6 2014/05/15 20:01:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.14.ebuild,v 1.7 2014/07/20 12:20:19 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~x86"
+KEYWORDS="alpha ~amd64 ~arm hppa ~x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-vcs/git-annex/files/git-annex-5.20140717-old-feed.patch b/dev-vcs/git-annex/files/git-annex-5.20140717-old-feed.patch
new file mode 100644
index 000000000000..c67024c6e910
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-5.20140717-old-feed.patch
@@ -0,0 +1,24 @@
+commit d15bfc9061d370b22ba4de8146fab92d3fa3ff02
+Author: Joey Hess <joey@kitenet.net>
+Date:   Sat Jul 19 18:30:08 2014 -0400
+
+    fix build with old feed
+
+diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs
+index e785885..1fdba46 100644
+--- a/Command/ImportFeed.hs
++++ b/Command/ImportFeed.hs
+@@ -227,9 +227,13 @@ feedFile tmpl i extension = Utility.Format.format tmpl $
+ #endif
+ 
+ extractMetaData :: ToDownload -> MetaData
++#if MIN_VERSION_feed(0,3,9)
+ extractMetaData i = case getItemPublishDate (item i) :: Maybe (Maybe UTCTime) of
+ 	Just (Just d) -> unionMetaData meta (dateMetaData d meta)
+ 	_ -> meta
++#else
++extractMetaData i = meta
++#endif
+   where
+ 	tometa (k, v) = (mkMetaFieldUnchecked k, S.singleton (toMetaValue v))
+ 	meta = MetaData $ M.fromList $ map tometa $ extractFields i
diff --git a/dev-vcs/git-annex/git-annex-5.20140717.ebuild b/dev-vcs/git-annex/git-annex-5.20140717.ebuild
index b8b5bf759d19..4c24aa25ea5c 100644
--- a/dev-vcs/git-annex/git-annex-5.20140717.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20140717.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140717.ebuild,v 1.1 2014/07/19 06:27:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-5.20140717.ebuild,v 1.2 2014/07/20 07:35:01 slyfox Exp $
 
 EAPI=5
 
@@ -114,6 +114,8 @@ src_prepare() {
 
 	cabal_chdeps \
 		'hamlet' 'hamlet, shakespeare'
+
+	epatch "${FILESDIR}"/${P}-old-feed.patch
 }
 
 src_configure() {
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index 4cda7ae93b59..88aaac09a39c 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/metadata.xml
@@ -5,6 +5,10 @@
 		<email>tommy@gentoo.org</email>
 		<name>Thomas Sachau</name>
 	</maintainer>
+	<maintainer restrict="&gt;=dev-vcs/subversion-1.8.0">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<use>
 		<flag name="ctypes-python">Build and install Ctypes Python bindings</flag>
 		<flag name="dso">Enable runtime module search</flag>
diff --git a/mail-client/cone/cone-0.90-r1.ebuild b/mail-client/cone/cone-0.90-r1.ebuild
index 297d4b8d485b..2e0a426ed41c 100644
--- a/mail-client/cone/cone-0.90-r1.ebuild
+++ b/mail-client/cone/cone-0.90-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.90-r1.ebuild,v 1.3 2014/06/14 09:30:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.90-r1.ebuild,v 1.4 2014/07/20 10:59:21 eras Exp $
 
 EAPI=4
 
@@ -40,6 +40,8 @@ src_prepare() {
 	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in */configure.in || die
 	eautoreconf
+	# TODO: Find and fix the bug - #514048
+	cd cone && eautoreconf
 }
 
 src_configure() {
diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
index b775ea617834..892b0950655f 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild,v 1.5 2014/06/24 02:08:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild,v 1.7 2014/07/20 09:20:10 pacho Exp $
 
 EAPI=4
 inherit eutils systemd user
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
index 51a5b7e4a6b4..458f62a7b15a 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild,v 1.7 2014/07/15 21:45:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild,v 1.8 2014/07/20 08:33:51 klausman Exp $
 
 EAPI=5
 inherit autotools db-use eutils flag-o-matic toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="berkdb sqlite tokyocabinet"
 
 DEPEND="virtual/libiconv
diff --git a/mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild b/mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild
index 2a50f2154acc..b07ae0b3e864 100644
--- a/mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild
+++ b/mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild,v 1.1 2014/03/30 13:53:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/sqlgrey/sqlgrey-1.7.6-r1.ebuild,v 1.2 2014/07/20 12:08:47 pacho Exp $
 
 inherit eutils systemd user
 
@@ -21,7 +21,7 @@ RDEPEND="dev-lang/perl
 	!postgres? ( !mysql? ( !sqlite? ( dev-perl/DBD-Pg ) ) )"
 DEPEND="$RDEPEND
 	sys-apps/sed"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 pkg_setup() {
 	enewgroup sqlgrey
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild
index e6d46a0959c4..fc266e3ee8f5 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild,v 1.6 2014/06/09 23:31:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild,v 1.7 2014/07/20 08:44:23 klausman Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-sound/pavucontrol/pavucontrol-2.0.ebuild b/media-sound/pavucontrol/pavucontrol-2.0.ebuild
index f71a8b2da115..f5e396fc84db 100644
--- a/media-sound/pavucontrol/pavucontrol-2.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-2.0.ebuild,v 1.2 2014/07/15 15:14:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pavucontrol/pavucontrol-2.0.ebuild,v 1.4 2014/07/20 09:33:10 pacho Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index 4a0c02eb9beb..4a373a1c3da2 100644
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -1,4 +1,3 @@
 DIST minitube-2.0.tar.gz 713577 SHA256 1ba1dd7725e6e0c92653fdee7bcfa4b833346d2ef4c091d94b181b60bb592554 SHA512 f08f49549486f22d6156aa4344fd0698e03b0fcf669530010a648467cd3da1edbe6ee9e7c7578c69c7f410a03afe2e5c25bb84e6e1dc70c6534210566789f81e WHIRLPOOL 415d5b17a0862aa74c09a4950be43cd78b5ab5f26c7d0bd5d4c4b78d97989b181ecdc86955f843348b52fc582346fbae32d664f43e5ba76fcc995a59c572776b
-DIST minitube-2.1.3.tar.gz 816226 SHA256 387b43fc9ee68da57d69b0622b2a61c82f816401da5ad8830563d792e402b8fc SHA512 6652f3c7fb5b2f045e6a14c983ab1f4696dac2a4fb539334a8818387fad4ae2fc8326df635b0a946244741aa7b03ee1089b4fde51fbc20e6d13d1f20274c9c0c WHIRLPOOL fbab01fa89509343b09486c7d3879aed0a73cb085cbc0c75f4063b7b8fb4eb046fd14fc3a13d88416e352ad052f547611f9e869cd6674b609bffa66c9b57057d
-DIST minitube-2.1.5.tar.gz 819076 SHA256 e8fc812c007de8998c4d07983a7397a25ff1ec77da07766f155314c05ed14c59 SHA512 67c9e2bf32700203a487f5dbfba0d4c69686921192407f626542b0a3c1cc932507b334776e1b71852e2fceb35843b6195f76c916fcb272af8efbb547c3e28dcd WHIRLPOOL 8008170e76c03528ded2c72f3954d71f4c50f38131010c1c440f9abdfc6f59f655de1e0dbf06eb9ee4cf8cade483c782ede983df0669613956e8e7c033eaa839
 DIST minitube-2.1.6.tar.gz 870000 SHA256 1a9b9386f20e42274c1b13a729268f1cb8e7978d3ae930f8acdff7d3b270c724 SHA512 0e87c2139a2e51283ef63cbc3e6115014bb64894c4380101ae4df45ce55a8799830304a012b79634482ad019414ec44de8422c24d2e52d2e298e06e813131da2 WHIRLPOOL c0147648adc8f25ed99963ca65ef6896abc808e430d91589057034b5a6c844ea848b0c3a2bfae40aa61ed5d4c4060f6882c0f3ac27f213bfce29ccffb2b42ca7
+DIST minitube-2.2.tar.gz 878634 SHA256 1076981044d62e5c0b52754d34acde46be5e8bdf4813ae7cead7c9ae038133e1 SHA512 75c783f22171e56875d2d2ba3260f5402ab3c638fb84f5d0c97d3bc05597b66e45f9d8e9bdfec9c30574af1aca5e74a40ad879c8943767271414968ea98221a1 WHIRLPOOL f765de44d3597e4f1f00e6157e73553ec5180f6cc5bc26a5c116efde21c9444d5c1aa2ac232a082793ca69f1fbe1e2b35c71fcdef0ac89da842a8e2af349caa6
diff --git a/media-video/minitube/minitube-2.1.3.ebuild b/media-video/minitube/minitube-2.1.3.ebuild
deleted file mode 100644
index f13715ae7dff..000000000000
--- a/media-video/minitube/minitube-2.1.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-2.1.3.ebuild,v 1.5 2014/01/02 20:46:36 hwoarang Exp $
-
-EAPI=5
-PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr he_IL hr hu
-ia it jv nl pl pl_PL pt_BR ro ru sk sl tr zh_CN"
-PLOCALE_BACKUP="en"
-
-inherit l10n qt4-r2
-
-DESCRIPTION="Qt4 YouTube Client"
-HOMEPAGE="http://flavio.tordini.org/minitube"
-# As usual, upstream never releases proper tarballs
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug download gstreamer kde"
-
-DEPEND=">=dev-qt/qtgui-4.8:4[accessibility]
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtsql-4.8:4
-	kde? ( || ( media-libs/phonon[gstreamer?] >=dev-qt/qtphonon-4.8:4 ) )
-	!kde? ( || ( >=dev-qt/qtphonon-4.8:4 media-libs/phonon[gstreamer?] ) )
-	gstreamer? (
-		media-plugins/gst-plugins-soup:0.10
-		media-plugins/gst-plugins-ffmpeg:0.10
-		media-plugins/gst-plugins-faac:0.10
-		media-plugins/gst-plugins-faad:0.10
-		media-plugins/gst-plugins-theora
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-DOCS="AUTHORS CHANGES TODO"
-
-#455976
-PATCHES=( "${FILESDIR}"/${P}-disable-updates.patch )
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Remove unneeded translations
-	local trans=
-	for x in $(l10n_get_locales); do
-		trans+="${x}.ts "
-	done
-	if [[ -n ${trans} ]]; then
-		sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
-	fi
-	# gcc-4.7. Bug #422977. Will probably be fixed
-	# once ubuntu moves to gcc-4.7
-	epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
-	# Enable video downloads. Bug #491344
-	use download && { echo "DEFINES += APP_DOWNLOADS" >> ${PN}.pro; }
-}
-
-src_install() {
-	qt4-r2_src_install
-	newicon images/app.png minitube.png
-}
-
-pkg_postinst() {
-	if use download; then
-		elog "You activated the 'download' USE flag. This allows you to"
-		elog "download videos from youtube, which might violate the youtube"
-		elog "terms-of-service (TOS) in some legislations. If downloading"
-		elog "youtube-videos is not allowed in your legislation, please"
-		elog "disable the 'download' use flag. For details on the youtube TOS,"
-		elog "see http://www.youtube.com/t/terms"
-	fi
-}
diff --git a/media-video/minitube/minitube-2.1.5.ebuild b/media-video/minitube/minitube-2.2.ebuild
similarity index 97%
rename from media-video/minitube/minitube-2.1.5.ebuild
rename to media-video/minitube/minitube-2.2.ebuild
index ea3f7fc7e8f1..5d019c7ad97c 100644
--- a/media-video/minitube/minitube-2.1.5.ebuild
+++ b/media-video/minitube/minitube-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-2.1.5.ebuild,v 1.2 2014/01/02 20:46:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-2.2.ebuild,v 1.1 2014/07/20 10:52:54 hwoarang Exp $
 
 EAPI=5
 PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr he_IL hr hu
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8711fd9f9424..282792c31619 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Jul 2014 07:07:03 +0000
+Sun, 20 Jul 2014 12:37:03 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8711fd9f9424..282792c31619 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Jul 2014 07:07:03 +0000
+Sun, 20 Jul 2014 12:37:03 +0000
diff --git a/metadata/md5-cache/app-admin/sysstat-10.2.1-r1 b/metadata/md5-cache/app-admin/sysstat-10.2.1-r1
index 855893e19ebe..b729fd5d907e 100644
--- a/metadata/md5-cache/app-admin/sysstat-10.2.1-r1
+++ b/metadata/md5-cache/app-admin/sysstat-10.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=System performance tools for Linux
 EAPI=5
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
 IUSE=cron debug +doc isag nls lm_sensors selinux
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 ~arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=cron? ( sys-process/cronbase ) isag? ( dev-lang/tk dev-vcs/rcs sci-visualization/gnuplot ) nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
 SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-10.2.1.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=221c1d9fb9561258acb2c4074f5f818b
+_md5_=a2cc2fe33edf9b84c33602031f3e4a6a
diff --git a/metadata/md5-cache/app-dicts/myspell-de-alt-20120929 b/metadata/md5-cache/app-dicts/myspell-de-alt-20120929
index 87893fc40b99..34cec458f242 100644
--- a/metadata/md5-cache/app-dicts/myspell-de-alt-20120929
+++ b/metadata/md5-cache/app-dicts/myspell-de-alt-20120929
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=German (traditional orthography) dictionaries for myspell/hunspell
 EAPI=5
 HOMEPAGE=http://www.j3e.de/myspell/ http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 SLOT=0
 SRC_URI=http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries/pscreleasefolder.2011-11-04.1209635399/2012.09.29/dict-de_de-1901_oldspell_2012-09-29.oxt
 _eclasses_=myspell-r2	16f301e982001f671a68d8c364cabbd0
-_md5_=f5f542ac3d4b21084b2ffaaa04671689
+_md5_=860602f7cdcef00416503c6ff0b5b137
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r4 b/metadata/md5-cache/app-misc/spacenavd-0.5-r4
index e74dd8741780..99bb18a69b74 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r4
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r4
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	8cd692457c1524c7be9af69831698a78	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b38163d06c78f350c30ba4a9ea0f1dcf
+_md5_=a6758409f0336950441ead94f01d95d6
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r5 b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
index cb394192748e..56a69f6adc78 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r5
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
@@ -4,10 +4,10 @@ DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
 EAPI=4
 HOMEPAGE=http://spacenav.sourceforge.net/
 IUSE=X
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	8cd692457c1524c7be9af69831698a78	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7b85189a6a76b70e04227058937a4047
+_md5_=ba8e15442f940e508cdfbda9b3fbcb88
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.2
index 2874b072cdb0..b8762b5d7873 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.2
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Mirrorselect
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 arm hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.2.tar.gz http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	prefix	21058c21ca48453d771df15500873ede	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1c1ca802e930f3818ebea41f85f7bd15
+_md5_=427f7d53dd2624972ae5b0fddde4f2cd
diff --git a/metadata/md5-cache/app-text/qpdf-5.1.1 b/metadata/md5-cache/app-text/qpdf-5.1.1
index 557d3bdeb92d..5942d54ceccd 100644
--- a/metadata/md5-cache/app-text/qpdf-5.1.1
+++ b/metadata/md5-cache/app-text/qpdf-5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line program that does structural, content-preserving tran
 EAPI=5
 HOMEPAGE=http://qpdf.sourceforge.net/
 IUSE=doc examples static-libs test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
 LICENSE=Artistic-2
 RDEPEND=dev-libs/libpcre sys-libs/zlib >=dev-lang/perl-5.8
 SLOT=0/13
 SRC_URI=mirror://sourceforge/qpdf/qpdf-5.1.1.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=da2b6c1eb6c2a87244440c300d701dc7
+_md5_=df9302551085dd356170429f92c5c310
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.2.17 b/metadata/md5-cache/app-text/xapian-omega-1.2.17
index c33014188240..a18aa92d089d 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.17
+++ b/metadata/md5-cache/app-text/xapian-omega-1.2.17
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/xapian-1.2.17 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.2.17 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.17/xapian-omega-1.2.17.tar.xz
-_md5_=42ff4a1528bdea1af381629bc310b176
+_md5_=0b1a254b76496ade9e4b73d60117f292
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
index dbdc533c2bf6..4f37d07eaaef 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The leading SQL relational database engine written in Java.
 EAPI=5
 HOMEPAGE=http://hsqldb.org
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
 RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d0c24a072b46456ccd6b8767ab52edf7
+_md5_=a4f425956ce769aac4a612422cf7e4f7
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
index 1f465c4bd16a..5de1961b494b 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
@@ -4,11 +4,11 @@ DESCRIPTION=MySQL JDBC driver
 EAPI=5
 HOMEPAGE=http://www.mysql.com/products/connector/j/
 IUSE=c3p0 log4j elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0? ( dev-java/c3p0:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ffb5139a72b2d41ce55474b9f4a989b0
+_md5_=c87d1b9f9da9212d6dd3a4de5c51de27
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.17 b/metadata/md5-cache/dev-libs/xapian-1.2.17
index 4c3b7e68b721..085b478c2f38 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.17
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.17
@@ -4,9 +4,9 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -sse +sse2 +brass +chert +inmemory
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.17/xapian-core-1.2.17.tar.xz
-_md5_=92eea3d1147173441b57829ee1b84f42
+_md5_=cc2f83d69b9c7f307638257821ecf133
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.17.0 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.17.0
index 7dfc577cdabe..adc61be89716 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.17.0
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.17.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl XS frontend to the Xapian C++ search library.
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Search-Xapian/
 IUSE=examples
-KEYWORDS=amd64 arm ~mips ppc ppc64 x86
+KEYWORDS=alpha amd64 arm ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=~dev-libs/xapian-1.2.17 !dev-libs/xapian-bindings[perl] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.17.0.tar.gz http://oligarchy.co.uk/xapian/1.2.17/Search-Xapian-1.2.17.0.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=41c7531a220457925e89ae403d9417cd
+_md5_=72b5fb8208df82b6ed14728e0430a11d
diff --git a/metadata/md5-cache/dev-python/chardet-2.2.1 b/metadata/md5-cache/dev-python/chardet-2.2.1
index a43eb7027f71..0e3ff9bece6a 100644
--- a/metadata/md5-cache/dev-python/chardet-2.2.1
+++ b/metadata/md5-cache/dev-python/chardet-2.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Universal encoding detector
 EAPI=5
 HOMEPAGE=https://github.com/chardet/chardet http://pypi.python.org/pypi/chardet
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/chardet/chardet-2.2.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=3ab644c41ff83fd91efe10168ad923ab
+_md5_=7316b25096e51fc610f6008b3fe32bb4
diff --git a/metadata/md5-cache/dev-python/fixtures-0.3.14-r2 b/metadata/md5-cache/dev-python/fixtures-0.3.14-r2
index 290bacc06e97..3684a41deb6d 100644
--- a/metadata/md5-cache/dev-python/fixtures-0.3.14-r2
+++ b/metadata/md5-cache/dev-python/fixtures-0.3.14-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Fixtures, reusable state for writing clean tests and more.
 EAPI=5
 HOMEPAGE=https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=>=dev-python/testtools-0.9.22 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-0.3.14.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=33625c2ee8d3d8b0ced43d92c9356b29
+_md5_=09eba7955ef02a44cc62f5d714ec2112
diff --git a/metadata/md5-cache/dev-python/flake8-2.0 b/metadata/md5-cache/dev-python/flake8-2.0
index 049e8fa0d7b6..742361e6ed29 100644
--- a/metadata/md5-cache/dev-python/flake8-2.0
+++ b/metadata/md5-cache/dev-python/flake8-2.0
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=5
 HOMEPAGE=http://bitbucket.org/tarek/flake8
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=amd64 ~arm ~hppa ~ia64 x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 x86
 LICENSE=MIT
 PDEPEND=dev-python/mccabe[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(-)]
 RDEPEND=>=dev-python/pyflakes-0.6.1[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(-)] >=dev-python/pep8-1.4.3[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=425238b59d004dab6f3dd021dff912fa
+_md5_=7e674ea056e3abfae807b4e10271e2e0
diff --git a/metadata/md5-cache/dev-python/flake8-2.1.0 b/metadata/md5-cache/dev-python/flake8-2.1.0
index 4cc7b755c9af..df817ed40c12 100644
--- a/metadata/md5-cache/dev-python/flake8-2.1.0
+++ b/metadata/md5-cache/dev-python/flake8-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=5
 HOMEPAGE=http://bitbucket.org/tarek/flake8
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=>=dev-python/mccabe-0.2.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 RDEPEND=>=dev-python/pyflakes-0.7.3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pep8-1.4.6[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-2.1.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=59320deae3f08ff35df5803b57d596a8
+_md5_=ead5231eabc85c1082a8ede62d318896
diff --git a/metadata/md5-cache/dev-python/mccabe-0.2.1 b/metadata/md5-cache/dev-python/mccabe-0.2.1
index c445cda59716..6a85c660e511 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.2.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=a plugin for flake8
 EAPI=5
 HOMEPAGE=https://github.com/flintwork/mccabe
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~hppa ~ia64 x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pep8-1.4.3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.2.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=2d14d2b3e17048637ad5b3d5f75194a8
+_md5_=8cd0a504e0c09cd1eaed24183509c340
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.3.2 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.3.2
index 0df136cbbdc8..408fa733b364 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.3.2
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Provides enhanced HTTPS support for httplib and urllib2 using PyOpen
 EAPI=5
 HOMEPAGE=http://ndg-security.ceda.ac.uk/wiki/ndg_httpsclient https://pypi.python.org/pypi/ndg-httpsclient
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=~amd64 arm hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.3.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=523fb0f726b2fa4cfa977f0c2569a326
+_md5_=f7f1aa334cdf62a79b76a11dc92cfc70
diff --git a/metadata/md5-cache/dev-python/pbr-0.8.0 b/metadata/md5-cache/dev-python/pbr-0.8.0
index 859af9a03c8f..d797236666d5 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.0
+++ b/metadata/md5-cache/dev-python/pbr-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=PBR is a library that injects some useful and sensible default behav
 EAPI=5
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pip-1.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-0.8.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8b4307921e1dacf90e64bb8425aeeb1d
+_md5_=45704797260083dffb07c5ba8eb0636a
diff --git a/metadata/md5-cache/dev-python/pep8-1.5.7 b/metadata/md5-cache/dev-python/pep8-1.5.7
index 315352e02cf6..afe08a781acf 100644
--- a/metadata/md5-cache/dev-python/pep8-1.5.7
+++ b/metadata/md5-cache/dev-python/pep8-1.5.7
@@ -4,11 +4,11 @@ DESCRIPTION=Python style guide checker
 EAPI=5
 HOMEPAGE=http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8
 IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.5.7.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=2224edb5e892650aa2c323304193290a
+_md5_=4ee6ca5179a4d950d2bf319aaf7c5dd8
diff --git a/metadata/md5-cache/dev-python/pip-1.4.1 b/metadata/md5-cache/dev-python/pip-1.4.1
index a5de97703915..b49aeb2d9a47 100644
--- a/metadata/md5-cache/dev-python/pip-1.4.1
+++ b/metadata/md5-cache/dev-python/pip-1.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=5
 HOMEPAGE=http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/
 IUSE=zsh-completion python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pip/pip-1.4.1.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c858b0e725b34534d74de75b62b85375
+_md5_=1636eb224abf63af16afafb1cde682ca
diff --git a/metadata/md5-cache/dev-python/pyflakes-0.8.1 b/metadata/md5-cache/dev-python/pyflakes-0.8.1
index 73a1c122bff1..dfd956e505ee 100644
--- a/metadata/md5-cache/dev-python/pyflakes-0.8.1
+++ b/metadata/md5-cache/dev-python/pyflakes-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Passive checker for Python programs
 EAPI=5
 HOMEPAGE=https://launchpad.net/pyflakes http://pypi.python.org/pypi/pyflakes
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-0.8.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a6ae42de3186daf4aec4c08497c75399
+_md5_=f438eb05eafe471bd067e5d384213cff
diff --git a/metadata/md5-cache/dev-python/requests-2.3.0 b/metadata/md5-cache/dev-python/requests-2.3.0
index 097733b142d7..b40c5239b249 100644
--- a/metadata/md5-cache/dev-python/requests-2.3.0
+++ b/metadata/md5-cache/dev-python/requests-2.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=5
 HOMEPAGE=http://python-requests.org/ http://pypi.python.org/pypi/requests
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 arm hppa ~ia64 ~mips ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.3.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=d91aef0d851100f6bf703aaf0f5bcfa5
+_md5_=1866753bc02bcf08762cf6a6e5af0d13
diff --git a/metadata/md5-cache/dev-python/setuptools-2.2 b/metadata/md5-cache/dev-python/setuptools-2.2
index 664ea9d9dc12..8357823c2c62 100644
--- a/metadata/md5-cache/dev-python/setuptools-2.2
+++ b/metadata/md5-cache/dev-python/setuptools-2.2
@@ -4,11 +4,11 @@ DESCRIPTION=a collection of extensions to Distutils
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/setuptools
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-2.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8c0ed69debfeee9cace3bee9186d6ba6
+_md5_=c1bdea07ea7f71858a9264faec29e23e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
index 92114b9e36df..88ede8301976 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9
@@ -4,11 +4,11 @@ DESCRIPTION=SQLAlchemy Schema Migration Tools
 EAPI=5
 HOMEPAGE=http://code.google.com/p/sqlalchemy-migrate/ http://pypi.python.org/pypi/sqlalchemy-migrate
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.5.21[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/tempita-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.9.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c55418ffc2ef375582fcd32d574a2be9
+_md5_=8401de78a540928191379da6230bd374
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.2 b/metadata/md5-cache/dev-python/ssl-fetch-0.2
index ffb455f8f72c..6396f3e53e31 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.2
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A small convinience library for fetching files securely
 EAPI=5
 HOMEPAGE=https://github.com/dol-sen/ssl-fetch
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 arm hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/requests-1.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/ndg-httpsclient[python_targets_python2_7] dev-python/pyasn1[python_targets_python2_7] >=dev-python/pyopenssl-0.13[python_targets_python2_7] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f3f4c72271b80ed32c774a7f52905c17
+_md5_=7fb615cab8577dffc1790b2d1d3b1554
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1 b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
index 6999a509c312..f4cd3ab7482a 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A repository of test results.
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/subunit-0.0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/testtools-0.9.30[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/fixtures[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.18.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=b78f5e3c0b2107c9476fd9ff9b28c7ed
+_md5_=8791e18137a17a701ca3a269639b8b20
diff --git a/metadata/md5-cache/dev-python/testresources-0.2.7-r2 b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
index 9c3e9a12bb19..0ef867755d2f 100644
--- a/metadata/md5-cache/dev-python/testresources-0.2.7-r2
+++ b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Testresources, a pyunit extension for managing expensive test resour
 EAPI=5
 HOMEPAGE=https://launchpad.net/testresources
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-0.2.7.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=16b30ecda2b28c1d3868ab3e988a1dcb
+_md5_=bd99cafceb9d4eb10b07b47a13a68255
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.4-r5 b/metadata/md5-cache/dev-python/testscenarios-0.4-r5
index 104651cb5a9a..1c7f44d7ca8c 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.4-r5
+++ b/metadata/md5-cache/dev-python/testscenarios-0.4-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Testscenarios, a pyunit extension for dependency injection
 EAPI=5
 HOMEPAGE=https://launchpad.net/testscenarios
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/testtools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/testscenarios/testscenarios-0.4.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=765ed96775054ba3384572bb2ea63c2c
+_md5_=9acee09ef9681213d697f8dc7c434543
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.14 b/metadata/md5-cache/dev-python/unidecode-0.04.14
index c1b25e16add0..9e13de583202 100644
--- a/metadata/md5-cache/dev-python/unidecode-0.04.14
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.14
@@ -4,11 +4,11 @@ DESCRIPTION=Module providing ASCII transliterations of Unicode text
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/Unidecode
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm hppa ~x86
+KEYWORDS=alpha ~amd64 ~arm hppa ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-0.04.14.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5f5603afb8c19d1dbdadaabe0f810282
+_md5_=c2560428a5a2cc34ec09f2356c08f565
diff --git a/metadata/md5-cache/dev-vcs/git-annex-5.20140717 b/metadata/md5-cache/dev-vcs/git-annex-5.20140717
index bb5e7baa81b3..1945dbfef233 100644
--- a/metadata/md5-cache/dev-vcs/git-annex-5.20140717
+++ b/metadata/md5-cache/dev-vcs/git-annex-5.20140717
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/git-annex/5.20140717/git-annex-5.20140717.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	ghc-package	9dd58db252d8252779bb74ed015196e3	haskell-cabal	b6154aeaa4dfbbc6d8a66d7f739c22d1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1b7cb2d8025dac5ea3150d292af5b91e
+_md5_=b4feff86a4a2072fdec1f112d627bb42
diff --git a/metadata/md5-cache/mail-client/cone-0.90-r1 b/metadata/md5-cache/mail-client/cone-0.90-r1
index 61907809fb89..0c075a8405da 100644
--- a/metadata/md5-cache/mail-client/cone-0.90-r1
+++ b/metadata/md5-cache/mail-client/cone-0.90-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/openssl-0.9.6 dev-libs/libxml2 sys-libs/ncurses crypt? ( >=ap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/cone-0.90.tar.bz2
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=50bda8ac7770a9e0c0f194374e740cb1
+_md5_=3bf297a2e920dda739c0b253c31f2f3f
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1 b/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1
index 16938a2955dd..67e0edaa1e1d 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance interface between the MTA and content checkers.
 EAPI=4
 HOMEPAGE=http://www.ijs.si/software/amavisd/
 IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.8.2 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 dev-perl/Convert-TNEF >=dev-perl/Convert-UUlib-1.08 virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/net-server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy dev-perl/IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin ) zmq? ( dev-perl/ZMQ-LibZMQ2 )
 SLOT=0
 SRC_URI=http://www.ijs.si/software/amavisd/amavisd-new-2.8.1.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=88663722f874fef808813e2b7b78658b
+_md5_=acc0b1930460c7c94ec9651cba621e74
diff --git a/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r1 b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r1
index 810116423b11..e6fa8706f239 100644
--- a/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r1
+++ b/metadata/md5-cache/mail-filter/bogofilter-1.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Bayesian spam filter designed with fast algorithms, and tuned for sp
 EAPI=5
 HOMEPAGE=http://bogofilter.sourceforge.net/
 IUSE=berkdb sqlite tokyocabinet
-KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=virtual/libiconv berkdb? ( >=sys-libs/db-3.2 ) !berkdb? ( sqlite? ( >=dev-db/sqlite-3.6.22 ) !sqlite? ( tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( >=sys-libs/db-3.2 ) ) ) sci-libs/gsl app-arch/pax
 SLOT=0
 SRC_URI=mirror://sourceforge/bogofilter/bogofilter-1.2.4.tar.bz2
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	db-use	1c719875d6599536f956fafea9e1f404	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	9836bc51856bcaffac53c9cd4b59a8be	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6ff41f498be19ac6e69b0cff821d8e0f
+_md5_=2fb5474b833a6f2f4755f0afc7308cbf
diff --git a/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r1 b/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r1
index fd0e85148d20..5ec681bf5a8d 100644
--- a/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r1
+++ b/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl dev-perl/DBI dev-perl/net-server dev-perl/Date-Calc virtual
 DESCRIPTION=SQLgrey is a postfix policy service implementing a grey-listing policy
 HOMEPAGE=http://sqlgrey.sourceforge.net/
 IUSE=mysql postgres sqlite
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/DBI dev-perl/net-server dev-perl/Date-Calc virtual/mailx postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) mysql? ( dev-perl/DBD-mysql ) !postgres? ( !mysql? ( !sqlite? ( dev-perl/DBD-Pg ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/sqlgrey/sqlgrey-1.7.6.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f7ff0c0293fd00ba083be6eaa2bebc38
+_md5_=a27f3bf9494164418aa2091dfef87f84
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
index 412689a2db14..b1798f19825e 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
 EAPI=5
 HOMEPAGE=http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/
 IUSE=java static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2b35e08247dd1e45b122e652acbae56d
+_md5_=81ff3a97e877ac77aa3e9581f4eb6707
diff --git a/metadata/md5-cache/media-sound/pavucontrol-2.0 b/metadata/md5-cache/media-sound/pavucontrol-2.0
index 3c8f74a50325..3ec108b24350 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-2.0
+++ b/metadata/md5-cache/media-sound/pavucontrol-2.0
@@ -4,9 +4,9 @@ DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
 EAPI=5
 HOMEPAGE=http://freedesktop.org/software/pulseaudio/pavucontrol/
 IUSE=nls
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/gtkmm-3.0:3.0 >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-sound/pulseaudio-3[glib] virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-2.0.tar.xz
-_md5_=3a9a1da8971fcbb593f98242809eb932
+_md5_=23a3f5b79a7769d0d4e891b6d9c28b07
diff --git a/metadata/md5-cache/media-video/minitube-2.1.5 b/metadata/md5-cache/media-video/minitube-2.1.5
deleted file mode 100644
index f0a4a8334bfe..000000000000
--- a/metadata/md5-cache/media-video/minitube-2.1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=>=dev-qt/qtgui-4.8:4[accessibility] >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtsql-4.8:4 kde? ( || ( media-libs/phonon[gstreamer?] >=dev-qt/qtphonon-4.8:4 ) ) !kde? ( || ( >=dev-qt/qtphonon-4.8:4 media-libs/phonon[gstreamer?] ) ) gstreamer? ( media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-ffmpeg:0.10 media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 media-plugins/gst-plugins-theora )
-DESCRIPTION=Qt4 YouTube Client
-EAPI=5
-HOMEPAGE=http://flavio.tordini.org/minitube
-IUSE=debug download gstreamer kde linguas_ar linguas_ca linguas_ca_ES linguas_da linguas_de_DE linguas_el linguas_en linguas_es linguas_es_AR linguas_es_ES linguas_fi linguas_fi_FI linguas_fr linguas_he_IL linguas_hr linguas_hu linguas_ia linguas_it linguas_jv linguas_nl linguas_pl linguas_pl_PL linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_tr linguas_zh_CN
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtgui-4.8:4[accessibility] >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtsql-4.8:4 kde? ( || ( media-libs/phonon[gstreamer?] >=dev-qt/qtphonon-4.8:4 ) ) !kde? ( || ( >=dev-qt/qtphonon-4.8:4 media-libs/phonon[gstreamer?] ) ) gstreamer? ( media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-ffmpeg:0.10 media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 media-plugins/gst-plugins-theora )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/minitube-2.1.5.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	dd0375da11f79aa416ff97913c59d01c	qt4-r2	b40473dafd07d7c5fe4aef1c1b902f39	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1a3d4aa1847d959279b14f8d8ee67c67
diff --git a/metadata/md5-cache/media-video/minitube-2.1.3 b/metadata/md5-cache/media-video/minitube-2.2
similarity index 93%
rename from metadata/md5-cache/media-video/minitube-2.1.3
rename to metadata/md5-cache/media-video/minitube-2.2
index 8842ab0f0241..bd1eab73239c 100644
--- a/metadata/md5-cache/media-video/minitube-2.1.3
+++ b/metadata/md5-cache/media-video/minitube-2.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtgui-4.8:4[accessibility] >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtsql-4.8:4 kde? ( || ( media-libs/phonon[gstreamer?] >=dev-qt/qtphonon-4.8:4 ) ) !kde? ( || ( >=dev-qt/qtphonon-4.8:4 media-libs/phonon[gstreamer?] ) ) gstreamer? ( media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-ffmpeg:0.10 media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 media-plugins/gst-plugins-theora )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/minitube-2.1.3.tar.gz
+SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/minitube-2.2.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	dd0375da11f79aa416ff97913c59d01c	qt4-r2	b40473dafd07d7c5fe4aef1c1b902f39	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5bd072ef6e15ef8a6451e7fdd20861c1
+_md5_=9e7cca91ab967542c48953bf63788354
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
index e3da3a55475e..3a7309216364 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Munin Server Monitoring Tool
 EAPI=5
 HOMEPAGE=http://munin-monitoring.org/
 IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) 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-DNS 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[graph,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
 SRC_URI=mirror://sourceforge/munin/munin-2.0.19.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.19-gentoo-1.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=af4d60da793ac7bb13957b1ea2d8e7f1
+_md5_=996028c5c3365fdf36bae0584d3b6eab
diff --git a/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1 b/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
index ee7234850622..1f2b6ef9980d 100644
--- a/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
+++ b/metadata/md5-cache/net-dialup/gtkterm-0.99.7_rc1
@@ -4,10 +4,10 @@ DESCRIPTION=A serial port terminal written in GTK+, similar to Windows' HyperTer
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/gtkterm/
 IUSE=nls linguas_fr linguas_hu
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.16:2 >=x11-libs/vte-0.20:0
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/gtkterm/gtkterm-0.99.7-rc1.tar.gz
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=708f3f7099ca36f3612005927e3635ba
+_md5_=defb2164459ef531823e153386673636
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1 b/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1
index 9eeb4b88f082..91c08599552b 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.1.37-r1
@@ -4,10 +4,10 @@ DESCRIPTION=fax and voice modem programs
 EAPI=5
 HOMEPAGE=http://mgetty.greenie.net/
 IUSE=doc +fax fidonet
-KEYWORDS=alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=doc? ( virtual/latex-base virtual/texi2dvi ) >=sys-apps/sed-4 sys-apps/groff dev-lang/perl sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.1/mgetty1.1.37-Jun05.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	9836bc51856bcaffac53c9cd4b59a8be	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=62945af6dcced0b23a0b9a0da49bc1d9
+_md5_=2ba4f726937df7cc23478153934ee7e4
diff --git a/metadata/md5-cache/net-libs/libmbim-1.6.0 b/metadata/md5-cache/net-libs/libmbim-1.6.0
index 15659e464f16..8433db97b40c 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.6.0
+++ b/metadata/md5-cache/net-libs/libmbim-1.6.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32 virtual/libgudev doc? ( dev-util/gtk-doc ) virtual/pkgconfig
 DESCRIPTION=MBIM modem protocol helper library
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/libmbim/
 IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=~alpha amd64 ~arm x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/libmbim/libmbim-1.6.0.tar.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7e7cba50b2fceecacbf3ec6ac5ce5326
+_md5_=3e9b370ceb4f36e048180c543b30194b
diff --git a/metadata/md5-cache/net-libs/libmbim-9999 b/metadata/md5-cache/net-libs/libmbim-9999
index a688ff77288d..a58a3ad6295f 100644
--- a/metadata/md5-cache/net-libs/libmbim-9999
+++ b/metadata/md5-cache/net-libs/libmbim-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.32 doc? ( dev-util/gtk-doc ) virtual/pkgconfig dev-util/gtk-doc >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.32 virtual/libgudev doc? ( dev-util/gtk-doc ) virtual/pkgconfig dev-util/gtk-doc >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=MBIM modem protocol helper library
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/libmbim/
@@ -8,4 +8,4 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32
 SLOT=0
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	git-r3	49fc3d60d7bcd6f8913ad6ec0cb4c67b	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=32671a6e16d08208779ba90c9f95c35a
+_md5_=c63860ce31d0f84d8541076589eb6ede
diff --git a/metadata/md5-cache/net-libs/openslp-1.2.1-r3 b/metadata/md5-cache/net-libs/openslp-1.2.1-r3
index 0a76a4d59ce9..c234f3e9c7e5 100644
--- a/metadata/md5-cache/net-libs/openslp-1.2.1-r3
+++ b/metadata/md5-cache/net-libs/openslp-1.2.1-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install unpack
 DEPEND=dev-libs/openssl !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=An open-source implementation of Service Location Protocol
 HOMEPAGE=http://www.openslp.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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 ~x86-linux
 LICENSE=BSD GPL-2
 RDEPEND=dev-libs/openssl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openslp/openslp-1.2.1.tar.gz
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7e7c51aa187ba164140682e18311a367
+_md5_=590aa5950200a697bd16fafd2b5d5531
diff --git a/metadata/md5-cache/net-misc/oidentd-2.0.8-r5 b/metadata/md5-cache/net-misc/oidentd-2.0.8-r5
index c974dd7f1b8a..817e06a8805f 100644
--- a/metadata/md5-cache/net-misc/oidentd-2.0.8-r5
+++ b/metadata/md5-cache/net-misc/oidentd-2.0.8-r5
@@ -4,9 +4,9 @@ DESCRIPTION=Another (RFC1413 compliant) ident daemon
 EAPI=5
 HOMEPAGE=http://ojnk.sourceforge.net/
 IUSE=debug ipv6 masquerade
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ojnk/oidentd-2.0.8.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=da2bf3ccb8fdd4d6924e98ae820c93f1
+_md5_=d2910a1a959261525c9b9edfd5e4076d
diff --git a/metadata/md5-cache/net-misc/openntpd-20080406-r8 b/metadata/md5-cache/net-misc/openntpd-20080406-r8
index aeece665baea..35fb2e4c7def 100644
--- a/metadata/md5-cache/net-misc/openntpd-20080406-r8
+++ b/metadata/md5-cache/net-misc/openntpd-20080406-r8
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight NTP server ported from OpenBSD
 EAPI=5
 HOMEPAGE=http://www.openntpd.org/
 IUSE=ssl selinux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/openntpd/openntpd_20080406p.orig.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_20080406p-6.debian.tar.gz
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c7c30c9e1971e0a4b530a0924943171d
+_md5_=87643b0dd258768cc0063650823cbe26
diff --git a/metadata/md5-cache/net-misc/socat-1.7.2.3 b/metadata/md5-cache/net-misc/socat-1.7.2.3
deleted file mode 100644
index b499b863be40..000000000000
--- a/metadata/md5-cache/net-misc/socat-1.7.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Multipurpose relay (SOcket CAT)
-EAPI=5
-HOMEPAGE=http://www.dest-unreach.org/socat/
-IUSE=ssl readline ipv6 tcpd
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.2.3.tar.bz2
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	9836bc51856bcaffac53c9cd4b59a8be	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5c8a2a2a610d15673bc91ecba029546f
diff --git a/metadata/md5-cache/net-misc/socat-1.7.2.4-r1 b/metadata/md5-cache/net-misc/socat-1.7.2.4-r1
index 0f744a8a71da..66d55aa3343d 100644
--- a/metadata/md5-cache/net-misc/socat-1.7.2.4-r1
+++ b/metadata/md5-cache/net-misc/socat-1.7.2.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Multipurpose relay (SOcket CAT)
 EAPI=5
 HOMEPAGE=http://www.dest-unreach.org/socat/
 IUSE=ssl readline ipv6 tcpd
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.dest-unreach.org/socat/download/socat-1.7.2.4.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	9836bc51856bcaffac53c9cd4b59a8be	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=0428497dee0a70b4accc75e515a573bf
+_md5_=3a5c1a15438633198736f2bce0d869c2
diff --git a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2 b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
index 70d206683f4b..fdae052c09f6 100644
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
+++ b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A great client/server software package allowing remote network acces
 EAPI=5
 HOMEPAGE=http://www.tightvnc.com/
 IUSE=java tcpd server elibc_FreeBSD java
-KEYWORDS=alpha ~amd64 arm ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~mips ~ppc ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=14c31f7442615d536507d065549bc6f2
+_md5_=a4110a1564eb5d1b1aa47dd529984609
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1459 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1459
deleted file mode 100644
index 25d0316d1a4d..000000000000
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1459
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.6 dev-java/bcprov:1.49 dev-java/commons-compress:0 dev-db/db-je:3.3 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/db4o-jdk11:0 dev-java/db4o-jdk12:0 dev-java/db4o-jdk5:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An encrypted network without censorship
-EAPI=3
-HOMEPAGE=https://freenetproject.org/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
-PDEPEND=net-libs/NativeThread:0
-RDEPEND=>=virtual/jre-1.6 net-libs/nativebiginteger:0 dev-java/bcprov:1.49 dev-java/commons-compress:0 dev-db/db-je:3.3 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/db4o-jdk11:0 dev-java/db4o-jdk12:0 dev-java/db4o-jdk5:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/freenet/fred-official/archive/build01459.zip -> freenet-0.7.5_p1459.zip mirror://gentoo/seednodes-20130915.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=08e8aefcb99e0c2d8718dc1522d98aaf
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1459-r1 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1464
similarity index 94%
rename from metadata/md5-cache/net-p2p/freenet-0.7.5_p1459-r1
rename to metadata/md5-cache/net-p2p/freenet-0.7.5_p1464
index 1e1f196f70fd..4fe4c53563aa 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1459-r1
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1464
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=app-arch/unzip >=virtual/jdk-1.6 dev-java/bcprov:1.49 dev-java/commons-compress:0 dev-db/db-je:3.3 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/db4o-jdk11:0 dev-java/db4o-jdk12:0 dev-java/db4o-jdk5:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
 DESCRIPTION=An encrypted network without censorship
-EAPI=3
+EAPI=5
 HOMEPAGE=https://freenetproject.org/
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
@@ -9,6 +9,6 @@ LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
 PDEPEND=net-libs/NativeThread:0
 RDEPEND=>=virtual/jre-1.6 net-libs/nativebiginteger:0 dev-java/bcprov:1.49 dev-java/commons-compress:0 dev-db/db-je:3.3 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/db4o-jdk11:0 dev-java/db4o-jdk12:0 dev-java/db4o-jdk5:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=https://github.com/freenet/fred-official/archive/build01459.zip -> freenet-0.7.5_p1459.zip mirror://gentoo/seednodes-20130915.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
+SRC_URI=https://github.com/freenet/fred-official/archive/build01464.zip -> freenet-0.7.5_p1464.zip mirror://gentoo/seednodes-20130915.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cd435071e6fd101a690d92d0c52567e6
+_md5_=205bffdcbc82761a2a87a75ce34ed47b
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.100 b/metadata/md5-cache/perl-core/File-Temp-0.230.100
deleted file mode 100644
index 430c3fea0177..000000000000
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.100
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way.
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/File-Temp/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-Temp-0.2301.tar.gz
-_eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=0700f1c8bb0652e44cf3d3aa4a670501
diff --git a/metadata/md5-cache/sci-calculators/units-2.11 b/metadata/md5-cache/sci-calculators/units-2.11
index d11442a7bb80..5fbd2d5cdc17 100644
--- a/metadata/md5-cache/sci-calculators/units-2.11
+++ b/metadata/md5-cache/sci-calculators/units-2.11
@@ -4,10 +4,10 @@ DESCRIPTION=Unit conversion program
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/units/units.html
 IUSE=+units_cur python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
 RDEPEND=>=sys-libs/readline-4.1-r2 units_cur? ( dev-lang/python-exec:2 ) units_cur? ( dev-python/unidecode[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) dev-lang/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(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.11.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=cb8dbb6b5983c9ad32dccdfa8deb1289
+_md5_=23f566641aea811a42e96d28274b330a
diff --git a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-4 b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-4
index 38df0112adf2..d2860467bbcd 100644
--- a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-4
+++ b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-4
@@ -3,10 +3,10 @@ DEPEND=!sys-fs/udev virtual/pkgconfig
 DESCRIPTION=systemd integration files for Gentoo
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mgorny/gentoo-systemd-integration
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=!sys-fs/udev >=sys-apps/systemd-207
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/gentoo-systemd-integration/downloads/gentoo-systemd-integration-4.tar.bz2
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=0de2cb04e096fe17f0dbd8992a02a743
+_md5_=55bcaa4606df5c77e0fe3c1e248e346c
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.2.9 b/metadata/md5-cache/sys-cluster/keepalived-1.2.9
index 7ded3f37b1bf..d1cd83747cf3 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.2.9
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.2.9
@@ -4,10 +4,10 @@ DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server pro
 EAPI=4
 HOMEPAGE=http://www.keepalived.org/
 IUSE=debug ipv6 snmp
-KEYWORDS=~alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl snmp? ( net-analyzer/net-snmp )
 SLOT=0
 SRC_URI=http://www.keepalived.org/software/keepalived-1.2.9.tar.gz
 _eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c332dd6531c998ddd1c87b8e6f4d1103
+_md5_=6e259241da5a0915a26c5177f119389f
diff --git a/metadata/md5-cache/sys-devel/autogen-5.18.1 b/metadata/md5-cache/sys-devel/autogen-5.18.1
index ebb3822daa19..39b8d3cc629b 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.1
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Program and text file generation
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/autogen/
 IUSE=libopts static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.1/autogen-5.18.1.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=6126a4a42f6a6cca971ec3d8bde5cec7
+_md5_=97ac1131f8694c45ec3578cf44d48bc3
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11
new file mode 100644
index 000000000000..687811b448a1
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=~sys-libs/e2fsprogs-libs-1.42.11 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
+EAPI=4
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=nls static-libs elibc_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+LICENSE=GPL-2 BSD
+RDEPEND=~sys-libs/e2fsprogs-libs-1.42.11 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.11.tar.gz elibc_mintlib? ( https://498412.bugs.gentoo.org/attachment.cgi?id=368058 -> e2fsprogs-1.42.9-mint-r1.patch )
+_eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	9836bc51856bcaffac53c9cd4b59a8be	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=d9985eafa7a3342ec0fdf79f57fc6cb9
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.9 b/metadata/md5-cache/sys-fs/e2fsprogs-1.42.9
deleted file mode 100644
index 6cc1e9c4942d..000000000000
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.42.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=~sys-libs/e2fsprogs-libs-1.42.9 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-apps/texinfo
-DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
-EAPI=3
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=nls static-libs elibc_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
-LICENSE=GPL-2 BSD
-RDEPEND=~sys-libs/e2fsprogs-libs-1.42.9 >=sys-apps/util-linux-2.16 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.9.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	9836bc51856bcaffac53c9cd4b59a8be	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=49e86c7b4c48f771b08b4077a2c91fdb
diff --git a/metadata/md5-cache/sys-kernel/genkernel-next-58 b/metadata/md5-cache/sys-kernel/genkernel-next-58
index a475b43792a2..28a3d4f18dbe 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-next-58
+++ b/metadata/md5-cache/sys-kernel/genkernel-next-58
@@ -4,10 +4,10 @@ DESCRIPTION=Gentoo automatic kernel building scripts, reloaded
 EAPI=5
 HOMEPAGE=http://www.gentoo.org
 IUSE=cryptsetup dmraid gpg iscsi plymouth selinux
-KEYWORDS=~amd64 ~arm ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/asciidoc sys-fs/e2fsprogs !sys-fs/eudev[-kmod,modutils] selinux? ( sys-libs/libselinux ) !sys-kernel/genkernel cryptsetup? ( sys-fs/cryptsetup ) dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 ) gpg? ( app-crypt/gnupg ) iscsi? ( sys-block/open-iscsi ) plymouth? ( sys-boot/plymouth ) app-portage/portage-utils app-arch/cpio >=app-misc/pax-utils-0.6 !<sys-apps/openrc-0.9.9 sys-apps/util-linux sys-block/thin-provisioning-tools sys-fs/lvm2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~lxnay/genkernel-next/genkernel-next-58.tar.xz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=662ceea0eaffed21f9a3690d9bdb76a1
+_md5_=d3699dd3ee454b77e5f53fbafcfdfe16
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.11 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.11
new file mode 100644
index 000000000000..073569281a8f
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=e2fsprogs libraries (common error and subsystem)
+EAPI=4
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.11.tar.gz
+_eclasses_=autotools	82621aada74cb2a492bd8e73d49e9f54	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=af3c78d3c0458a36501a3075fd13a456
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.9 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.9
deleted file mode 100644
index bc82114915b0..000000000000
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=e2fsprogs libraries (common error and subsystem)
-EAPI=4
-HOMEPAGE=http://e2fsprogs.sourceforge.net/
-IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.9.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7113cd1d2518a530eadbd3053462e2e2
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.400.0-r1 b/metadata/md5-cache/virtual/perl-File-Spec-3.400.0-r2
similarity index 80%
rename from metadata/md5-cache/virtual/perl-File-Spec-3.400.0-r1
rename to metadata/md5-cache/virtual/perl-File-Spec-3.400.0-r2
index 7cca17e41107..ee576b0e4d70 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.400.0-r1
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.400.0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=5
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~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* ~perl-core/File-Spec-3.400.0 ) !<perl-core/File-Spec-3.400.0
+RDEPEND=|| ( =dev-lang/perl-5.18* ~perl-core/File-Spec-3.400.0 ) !<perl-core/File-Spec-3.400.0 !>perl-core/File-Spec-3.400.0-r999
 SLOT=0
-_md5_=e0d1f9fa9a7dfce0bfc72c3cb6dcc07b
+_md5_=f11f663660aa050be6a65903546eefe6
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.470.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.470.0
index 8ab078280067..9a73751a5d97 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.470.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.470.0
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=5
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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.20* ~perl-core/File-Spec-3.470.0 ) !<perl-core/File-Spec-3.470.0
+RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/File-Spec-3.470.0 ) !<perl-core/File-Spec-3.470.0 !>perl-core/File-Spec-3.470.0-r999
 SLOT=0
-_md5_=61829cbd45638fb0b696cd09f275930b
+_md5_=d9f1401523fea6bfaf73a3478333e29d
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.230.100-r1 b/metadata/md5-cache/virtual/perl-File-Temp-0.230.100-r1
deleted file mode 100644
index e827dc76e82e..000000000000
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.230.100-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for File-Temp
-EAPI=5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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=~perl-core/File-Temp-0.230.100
-SLOT=0
-_md5_=7c09651fbe50c1318d8d9fa7a0ebd953
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10
index ba90baaa9cd8..6abae0773b81 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10
@@ -3,10 +3,10 @@ DEPEND=>=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3 dev-util/intltool v
 DESCRIPTION=xdg-user-dirs-gtk integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/xdg-user-dirs
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f9468742d9b75ceadc9dcd12e6371bbd
+_md5_=e3973b3af18b4806a9e16d0a3d25dc87
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.9.1-r2 b/metadata/md5-cache/x11-wm/sawfish-1.9.1-r2
index f5f71c91aabe..f85dc3de7715 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.9.1-r2
+++ b/metadata/md5-cache/x11-wm/sawfish-1.9.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible window manager using a Lisp-based scripting language
 EAPI=5
 HOMEPAGE=http://sawfish.wikia.com/
 IUSE=emacs nls xinerama
-KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2 Artistic-2
 RDEPEND=emacs? ( virtual/emacs !app-emacs/sawfish ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/sawfish/sawfish-1.9.1.tar.xz
 _eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1c1af7e3ba17e8f4e6d5790b256a102e
+_md5_=97a170fc4cea3633af8dc6afe8abd8da
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2f7132610e18..104cb0bed4df 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Jul 2014 07:07:06 +0000
+Sun, 20 Jul 2014 12:37:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e88c86e4469c..159ae3c53c1d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul 20 07:07:03 UTC 2014
+Sun Jul 20 12:37:02 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a833017a9c2d..e8169fd1d425 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Jul 2014 07:30:01 +0000
+Sun, 20 Jul 2014 13:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index a351857ca39d..dd7fec06c853 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1405839901 Sun 20 Jul 2014 07:05:01 AM UTC UTC
+1405859701 Sun 20 Jul 2014 12:35:01 PM UTC UTC
diff --git a/net-analyzer/munin/munin-2.0.19-r1.ebuild b/net-analyzer/munin/munin-2.0.19-r1.ebuild
index 644c572fed76..4ee629f60b8c 100644
--- a/net-analyzer/munin/munin-2.0.19-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.19-r1.ebuild,v 1.2 2014/07/15 16:45:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.19-r1.ebuild,v 1.4 2014/07/20 09:32:58 pacho Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc x86"
 IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
 REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
 
diff --git a/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild b/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild
index 68ec3816b84e..0f29e635f54c 100644
--- a/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild
+++ b/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild,v 1.3 2014/03/29 13:04:30 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gtkterm/gtkterm-0.99.7_rc1.ebuild,v 1.4 2014/07/20 09:16:59 pacho Exp $
 
 EAPI=5
 inherit eutils
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/released/gtkterm/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="nls"
 
 inherit eutils autotools
diff --git a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild b/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
index 80f2513aa1ab..3b7ca3b56a76 100644
--- a/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild,v 1.3 2014/07/19 18:23:33 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.37-r1.ebuild,v 1.5 2014/07/20 09:10:01 pacho Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs user
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc +fax fidonet"
 
 pkg_setup() {
diff --git a/net-libs/libmbim/libmbim-1.6.0.ebuild b/net-libs/libmbim/libmbim-1.6.0.ebuild
index 1391effe3629..23142ee53876 100644
--- a/net-libs/libmbim/libmbim-1.6.0.ebuild
+++ b/net-libs/libmbim/libmbim-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-1.6.0.ebuild,v 1.3 2014/05/04 12:13:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-1.6.0.ebuild,v 1.5 2014/07/20 12:11:31 alexxy Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
 else
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="~alpha amd64 ~arm x86"
 	SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 fi
 
@@ -22,6 +22,7 @@ IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.32"
 DEPEND="${RDEPEND}
+	virtual/libgudev
 	doc? ( dev-util/gtk-doc )
 	virtual/pkgconfig"
 [[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
diff --git a/net-libs/libmbim/libmbim-9999.ebuild b/net-libs/libmbim/libmbim-9999.ebuild
index 5f1e8eecdd97..a0b9ae51e2eb 100644
--- a/net-libs/libmbim/libmbim-9999.ebuild
+++ b/net-libs/libmbim/libmbim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-9999.ebuild,v 1.1 2014/01/20 05:06:40 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmbim/libmbim-9999.ebuild,v 1.2 2014/07/20 12:11:31 alexxy Exp $
 
 EAPI="5"
 
@@ -22,6 +22,7 @@ IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.32"
 DEPEND="${RDEPEND}
+	virtual/libgudev
 	doc? ( dev-util/gtk-doc )
 	virtual/pkgconfig"
 [[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
diff --git a/net-libs/openslp/openslp-1.2.1-r3.ebuild b/net-libs/openslp/openslp-1.2.1-r3.ebuild
index dc8b85d80a6a..5208b3c1047f 100644
--- a/net-libs/openslp/openslp-1.2.1-r3.ebuild
+++ b/net-libs/openslp/openslp-1.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1-r3.ebuild,v 1.7 2014/07/13 10:03:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1-r3.ebuild,v 1.9 2014/07/20 12:04:36 pacho Exp $
 
 inherit eutils autotools systemd
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
index 3e3a9846b0dd..208611d65db2 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.8-r5.ebuild,v 1.6 2014/07/13 10:04:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/oidentd/oidentd-2.0.8-r5.ebuild,v 1.7 2014/07/20 11:52:31 klausman Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug ipv6 masquerade"
 
 src_prepare() {
diff --git a/net-misc/openntpd/openntpd-20080406-r8.ebuild b/net-misc/openntpd/openntpd-20080406-r8.ebuild
index 0ed3b0385e7e..edc3e316f742 100644
--- a/net-misc/openntpd/openntpd-20080406-r8.ebuild
+++ b/net-misc/openntpd/openntpd-20080406-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r8.ebuild,v 1.7 2014/07/13 10:00:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r8.ebuild,v 1.8 2014/07/20 09:06:12 klausman Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="ssl selinux"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index fe0dbb17ddec..2a458f638654 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,3 +1,2 @@
-DIST socat-1.7.2.3.tar.bz2 424461 SHA256 0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0 SHA512 d34dea6d8fb29d25871b881c1aaf9d02ab69c95e90f6eba54dd3626987b7a19595ba06306abffb735b2ee014052a2ef37803166b6108c4edc57e1c8f511aef9f WHIRLPOOL ce1ec2886ed897e2db15946edcf7ad1026b965d097963f8dec9fff767958b640e7bf3b72de67c094d25c4857c40bbdbd15abf01b940367a994176c04792aa4f3
 DIST socat-1.7.2.4.tar.bz2 446644 SHA256 4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09 SHA512 256a3fba171544733cbfd6efde884cb9f5ff52e2b5300cebbe712cbb79d3e3bc7142e2e8a93fe4faf944db8326ab2c3673ef37ef76b724f33bf65cc0f9fbf27b WHIRLPOOL 1fdbda03430d4ec7d41f06e71ff5b2dd92ff3ea93eb1a272e05a8691897492679eed2d1974951857e8d674608ecfa657e6496130de9440a9c829c18f9e4118b7
 DIST socat-2.0.0-b7.tar.bz2 466584 SHA256 f3f964e69db2dc9957757185cfed498c6d245af6f5b808e4003c7e9b194bd340 SHA512 1f1e18a901842d98fcc63888ee126bd5d2cc6f2c239589a3b940a10886bc3ec97fef83a1ad3c3436b986e79e2e16e3cc28fd9ba6ac342866a20560b238274b62 WHIRLPOOL 439196b5a560fb859c41d8b2b8881f480168709895fab73b7637c9964c18cf2a1ec4e0dc6273732d783c557a3b0e433356a5c1d37278570aee011f694eec88b2
diff --git a/net-misc/socat/socat-1.7.2.3.ebuild b/net-misc/socat/socat-1.7.2.3.ebuild
deleted file mode 100644
index 0b4b5c527b62..000000000000
--- a/net-misc/socat/socat-1.7.2.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.3.ebuild,v 1.11 2014/03/17 16:07:50 bicatali Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
-IUSE="ssl readline ipv6 tcpd"
-
-DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.2.1-long-long.patch #436164
-	sed -i test.sh -e "s|/sbin/ifconfig|$(type -P ifconfig)|g" || die
-}
-
-src_configure() {
-	filter-flags '-Wno-error*' #293324
-	tc-export AR
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable readline) \
-		$(use_enable ipv6 ip6) \
-		$(use_enable tcpd libwrap)
-}
-
-src_test() {
-	TMPDIR="${T}" emake test
-}
-
-src_install() {
-	default
-
-	dodoc BUGREPORTS CHANGES DEVELOPMENT \
-		FAQ FILES PORTING README SECURITY VERSION
-	docinto examples
-	dodoc EXAMPLES *.sh
-	dohtml doc/*.html doc/*.css
-}
diff --git a/net-misc/socat/socat-1.7.2.4-r1.ebuild b/net-misc/socat/socat-1.7.2.4-r1.ebuild
index c9c6e4b742c0..6d874a71f3cd 100644
--- a/net-misc/socat/socat-1.7.2.4-r1.ebuild
+++ b/net-misc/socat/socat-1.7.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.4-r1.ebuild,v 1.8 2014/07/12 12:02:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.2.4-r1.ebuild,v 1.9 2014/07/20 09:16:05 klausman Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="
diff --git a/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild b/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild
index dc190e1dc960..e3d583ec1fc0 100644
--- a/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild,v 1.3 2014/07/19 18:47:37 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild,v 1.5 2014/07/20 09:15:40 pacho Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2
 	java? ( mirror://sourceforge/vnc-tight/${P}_javasrc.tar.gz )"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="alpha ~amd64 arm ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~mips ~ppc ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 7b64d2092ec0..f6f6f5e26fe6 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,4 +1,4 @@
-DIST freenet-0.7.5_p1459.zip 4738681 SHA256 36baaab901c1c7e9be3b018868b7a58d202590488839176332fc382c5362fef2 SHA512 84c01f015be4f74e0f89e4a265ae7cda1604dfc56c4153ed510995f3e01b76d2a2c7af700fb419a6496eebf7eefeebe875c40c885641a92fa55d0da659bfa9a6 WHIRLPOOL 3372bbfdd1f02af04f6c1c2256171e10be223fc9ef253e347a414497ffb551d9e5dbe23704602d199bc08dc815fa9c000ac773eba0376db254bb734ec115399a
 DIST freenet-0.7.5_p1462.zip 4718690 SHA256 9db76a289082582493b31dd0f3ada2a4dc9a0413a4327696120a0dba5eb4963b SHA512 7340519482d0152357251a7149fdac04ef6667b2bef68d6257ebaa938ff8b1f849c718e1ce6027c92816b72d5e78b9bd19e58025366eaf41752e73450b5b89f2 WHIRLPOOL 33e5a7cd4f85d855c6bdb6883aac2b0ba15e8a610a263d2ff634b884cd44f2a8e964efca90252be18efcf7c2a18dcad9667c7d1e26523ec5799810ffe5dfc81a
+DIST freenet-0.7.5_p1464.zip 4707038 SHA256 fa4ddaa9736292b6656e56643c6f80f03bb18c11c5fac26dc3e4329155d7c892 SHA512 b52646bfc1452055a288becde044784f689ba90f0fb625cf5e8fddd196366c8ea8851bef956d62c64413a49d3218c886677a977891374d77de89266a5611b7bb WHIRLPOOL 90e4dfb8fbd422a4fcf55f8ecd249338c78e9c1c1f4c26915c2f435a74e953b3eb9d2c4958958ba0dc58a16cca531545e3b7bd990756eaa254b9a5c9ae1bc084
 DIST freenet-ant-1.7.1.jar 1327167 SHA256 634e0b616d65d611419920e8b379b7b66399e44f520baa772147ed73743433b1 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408 WHIRLPOOL 667be2b1581c5fd847907b63522a0f83c595a6b8f1805d714e978a5cb0f05de4804153c89605618adf5c3b097a7019e7d7e9de0bf0987c7b1adb0dbc54e0f055
 DIST seednodes-20130915.fref.bz2 10046 SHA256 2008510e1c8730aa02674b1dd22f64bd0de86507b27052adcfa66d176f1351ef SHA512 e829ceab4851eaf912e840ec87bcd4458ba9cf7eb0e25d4f4ed059734054136b6c2889671e624999697a97d7b833c2e1a65b47f6e0116f8cb2f11b2e43df921d WHIRLPOOL fab300deed68030030bb99c5716a691b33ed6b89929c3eb506fd02928ad8914044370552c94c5178639ca2adb92cf6f58e3b4b62f6e1f565f65481ddcbb3802d
diff --git a/net-p2p/freenet/freenet-0.7.5_p1459.ebuild b/net-p2p/freenet/freenet-0.7.5_p1459.ebuild
deleted file mode 100644
index 0420ff84131a..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1459.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1459.ebuild,v 1.2 2014/03/02 14:47:05 tomwij Exp $
-
-EAPI="3"
-DATE=20130915
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 multilib user
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-SRC_URI="https://github.com/${PN}/fred-official/archive/build0${PV#*p}.zip -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref.bz2
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="dev-java/bcprov:1.49
-	dev-java/commons-compress:0
-	dev-db/db-je:3.3
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/db4o-jdk11:0
-	dev-java/db4o-jdk12:0
-	dev-java/db4o-jdk5:0
-	dev-java/jbitcollider-core:0
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0"
-DEPEND="app-arch/unzip
-	>=virtual/jdk-1.6
-	${CDEPEND}
-	test? ( dev-java/junit:0
-		dev-java/ant-junit:0 )
-	dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
-	net-libs/nativebiginteger:0
-	${CDEPEND}"
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov-1.49,commons-compress,db4o-jdk5,db4o-jdk12,db4o-jdk11,db-je-3.3,fec,java-service-wrapper,jbitcollider-core,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S=${WORKDIR}/fred-official-build0${PV#*p}
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-	enewgroup freenet
-	enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_unpack() {
-	unpack ${P}.zip seednodes-${DATE}.fref.bz2
-	mv "${WORKDIR}"/freenet-fred-* "${S}"
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/freenet-0.7.5_p1422-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	epatch "${FILESDIR}"/0.7.5_p1321-ext.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf
-
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-	dodoc AUTHORS || die
-	newdoc README.md README || die
-	insinto /etc
-	doins freenet-wrapper.conf || die
-	insinto /var/freenet
-	doins run.sh || die
-	newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref || die
-	fperms +x /var/freenet/run.sh
-	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1459-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1464.ebuild
similarity index 98%
rename from net-p2p/freenet/freenet-0.7.5_p1459-r1.ebuild
rename to net-p2p/freenet/freenet-0.7.5_p1464.ebuild
index f91391a585d4..f50299a71f1a 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1459-r1.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1464.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1459-r1.ebuild,v 1.1 2014/03/30 19:14:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.7.5_p1464.ebuild,v 1.1 2014/07/20 09:47:16 tommy Exp $
 
-EAPI="3"
+EAPI="5"
 DATE=20130915
 JAVA_PKG_IUSE="doc source"
 
diff --git a/perl-core/File-Temp/File-Temp-0.230.100.ebuild b/perl-core/File-Temp/File-Temp-0.230.100.ebuild
deleted file mode 100644
index 2db880e5dc4f..000000000000
--- a/perl-core/File-Temp/File-Temp-0.230.100.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.100.ebuild,v 1.5 2014/07/07 12:14:39 zlogene Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=DAGOLDEN
-MODULE_VERSION=0.2301
-inherit perl-module
-
-DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/perl-core/File-Temp/Manifest b/perl-core/File-Temp/Manifest
index 312bf614ebc2..5e7f85b17d18 100644
--- a/perl-core/File-Temp/Manifest
+++ b/perl-core/File-Temp/Manifest
@@ -1,3 +1,2 @@
 DIST File-Temp-0.22.tar.gz 38352 SHA256 989f9222497e6c056af3478018316cf634dba946e9a85d4d2b5a09c5351a4785 SHA512 26cd2dac046e43b534bd7c6df1c8e28bc39a093c8e3554127ff899d24ede9d42f71637c367d67d9b38162f9ce950f902115b63dce30eccfe30b6c8872cbffd4a WHIRLPOOL c303f8b3890166fe2881e8e32f6bef9d3da5acf0623971aa6477d702ab97ae9380f928879ce7b2c7f1da3da59bca793a4a480ffdda8dc2b9a267a6094c911a87
-DIST File-Temp-0.2301.tar.gz 58764 SHA256 c5c7706ddee2ccbdad083d6905ba9e1ab1fa34ad1733b91d46cd517510bb238c SHA512 7710258c2d8ebdb10671e59bf794a752fcbb6d7e42fe525922773ef33952dadd47b9234b83c8f66cebb3c35298251677a396ff541ee0421f06f884d6ab9d7954 WHIRLPOOL 6d2b3389f840aa3516fa3b669e1a3e923483146a395efb08040e78d2f608b22189ebdadf34ccb9955143e4c0a2b9956a3b387e0af119a023640fcb97bd869621
 DIST File-Temp-0.2304.tar.gz 59505 SHA256 13415323e48f7c9f34efdedf3d35141a7c3435e2beb8c6b922229dc317d321ac SHA512 823acf6ca42eb0548617feec4ce32e24da3fbbcb05d78dadea902e318797ed31bb16ef2b7fee50f79d52adb7dd561b8f97c1b9e11c56ba7d50735efbf639f1db WHIRLPOOL d00a486ac5d286808a59d915774b2489392d94aa3de5a73fc297533fbbd445c851105985924211fddd2c571b69113f04a39060c07a560576bd24dd88199dd0d8
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 8dfaf4f27c77..5f1e83215c75 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.154 2014/07/16 15:12:19 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.155 2014/07/20 08:59:25 klausman Exp $
 
 # Tobias Klausmann <klausman@gentoo.org (16 Jul 2014)
 # neither dietlibc nor klibc will likely ever build/work on alpha, bug #487672
@@ -14,10 +14,6 @@ media-video/mpv doc-pdf
 # Missing keywords, bug #508226
 media-video/mpv sdl
 
-# Pacho Ramos <pacho@gentoo.org> (12 Apr 2014)
-# Missing keywords, bug #507490
-net-misc/modemmanager mbim
-
 # Pacho Ramos <pacho@gentoo.org> (15 Mar 2014)
 # Missing keywords, bug #504672
 >=net-misc/vinagre-3.10 rdp
diff --git a/profiles/package.mask b/profiles/package.mask
index 11f4539ca88e..0704ac995d3f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15916 2014/07/19 16:18:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15918 2014/07/20 10:40:13 polynomial-c 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
@@ -30,6 +30,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Lars Wendler <polynomial-c@gentoo.org> (20 Jul 2014)
+# e2fsprogs-1.42.11 fails to build (no parallel build problem):
+# make[2]: *** No rule to make target '../../lib/libss.a', needed by
+# 'tst_libext2fs'.  Stop.
+=sys-fs/e2fsprogs-1.42.11
+=sys-libs/e2fsprogs-libs-1.42.11
+
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (19 Jul 2014)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
@@ -75,10 +82,6 @@ sys-block/afacli
 # Masked for removal in 30 days, bug #493114.
 app-emacs/sawfish
 
-# Markos Chandras <hwoarang@gentoo.org> (12 Jul 2014)
-# Masked for production testing
-=sys-auth/sssd-1.12.0
-
 # Sergei Trofimovich <slyfox@gentoo.org> (10 Jul 2014)
 # Masked as experimental major ghc release.
 =dev-lang/ghc-7.8.3*
diff --git a/sci-calculators/units/units-2.11.ebuild b/sci-calculators/units/units-2.11.ebuild
index 0520c8932f3c..f46e935f2d08 100644
--- a/sci-calculators/units/units-2.11.ebuild
+++ b/sci-calculators/units/units-2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.11.ebuild,v 1.4 2014/07/19 17:24:08 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/units/units-2.11.ebuild,v 1.5 2014/07/20 12:20:14 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm hppa ~x86 ~amd64-linux ~x86-linux"
 IUSE="+units_cur"
 
 DEPEND="
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild
index 3c955570ed7b..9c9919fe8e68 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild,v 1.7 2014/07/06 13:23:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild,v 1.8 2014/07/20 08:22:08 klausman Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="!sys-fs/udev"
diff --git a/sys-cluster/keepalived/keepalived-1.2.9.ebuild b/sys-cluster/keepalived/keepalived-1.2.9.ebuild
index 1ac6d9f1e47c..8139bda28a80 100644
--- a/sys-cluster/keepalived/keepalived-1.2.9.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.9.ebuild,v 1.3 2014/06/22 14:34:22 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.2.9.ebuild,v 1.4 2014/07/20 09:11:55 klausman Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="debug ipv6 snmp"
 
 RDEPEND="dev-libs/popt
diff --git a/sys-devel/autogen/autogen-5.18.1.ebuild b/sys-devel/autogen/autogen-5.18.1.ebuild
index 1e357a3fab8e..e93bbeead1c2 100644
--- a/sys-devel/autogen/autogen-5.18.1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.18.1.ebuild,v 1.9 2014/07/13 10:02:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autogen/autogen-5.18.1.ebuild,v 1.10 2014/07/20 11:27:45 klausman Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-1.8
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index c9c1426f38e4..8ef5982b9f63 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,5 +1,5 @@
 DIST e2fsprogs-1.41.7.tar.gz 4425159 SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c SHA512 c17c5f23feb7747941e7f019f197cca1cd4a84c067ad27d1a578ae213c7d7274aa79f3a64c7d69515f3f94db80df01ca71d4af83e9ea84c578a7257205395f7c WHIRLPOOL f760d7e658a1c78835ca470d077c7076a21f727f7d0a2411f5428363d12b7cd1676e2f221be9d9d1f5843c25320f7ef2f896ea47c9d4dc91190e0bc7df89ef36
 DIST e2fsprogs-1.42.10.tar.gz 6126111 SHA256 7b6e85c666d8fdd6062c75ba953de0e5481673bebef5f40f749a52a46476e29f SHA512 9ac99152722af3a9de03cdbb49a3095df59c488978da825527c99c86959a6ef8edd4953a03beba491fd281cb2fc3e917504682e36c3bc7208463812788807826 WHIRLPOOL ecebefeccbb8b68ca816d02a272a882c69daeec70e8ee8260e2c021ce307509225d91da11397627cfd28258a6dcc58dbd3a6e628eb3de3882bdeafb9c99a8e4a
+DIST e2fsprogs-1.42.11.tar.gz 6353078 SHA256 4bd8a770b6925c3f4ec5dce82c55774e4566cd6f3ffb5805177e3c92c8910b76 SHA512 633e686d5bc8d8d195c4522bfa206ef751ba6ab01117338523998caadfecba7fbc47ecb231d0d5518b0deef2fd587c021ad2d8fdb0eeede1ab6c90e28a709615 WHIRLPOOL 4aa1566bbba25e6d3bfb04333f2651ed199f20300a9ab34b6cfe12bdaf4db4a08df1ec95b631b6eda03cda33f87b9c489495a4f4f521daedd7bb1b2fdaf60aae
 DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c
 DIST e2fsprogs-1.42.9-mint-r1.patch 40220 SHA256 0b2701e44fbdb84215076afc7d884002d5d7bea03fc4db53dabe44dc2cd083d4 SHA512 3b4af37525712c5cd1f74c77b51bae2520a9e22b4f9822581d758aa8b5a7cbc87486ccc11a005967c1ba95bffe3cae0bed0b715b7250f1349f56c7fd2c83bcea WHIRLPOOL d5e4c1e76706b1ac8c9e963bb81f49f9e8876ac50f83f572a85ddda62037589d228659ac3b9d8b29b3b04796d40a4db2ebd282f1b3776f9ead0312ed053b5681
-DIST e2fsprogs-1.42.9.tar.gz 6069173 SHA256 2f92ac06e92fa00f2ada3ee67dad012d74d685537527ad1241d82f2d041f2802 SHA512 31041c45bc4e4a37fc4a1026424e15d4fc8fbf990c968fc9fba92861d9bec15f192dee8d5341cc2215af30a86b0bdb12d8a01f3c113b79a66c65f4a737136bb7 WHIRLPOOL 8fd7fb0ac22c41e9169902aba4cf0f3990897619f4709dd43c3a7153b710f6a869a123854fc9154b21b7088896737ae2e5283e56a8e15f8abd27f5f740e579f9
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
similarity index 78%
rename from sys-fs/e2fsprogs/e2fsprogs-1.42.9.ebuild
rename to sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
index e2c3abd93626..355f9bd55bf5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.9.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.9.ebuild,v 1.2 2014/01/18 05:15:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.1 2014/07/20 10:44:40 polynomial-c Exp $
 
-EAPI=3
+EAPI=4
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
 *)      UP_PV=${PV} ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit autotools eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+	elibc_mintlib? ( https://498412.bugs.gentoo.org/attachment.cgi?id=368058 -> ${PN}-1.42.9-mint-r1.patch )"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
@@ -41,11 +42,10 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
 	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
+		epatch "${DISTDIR}"/${PN}-1.42.9-mint-r1.patch
 	fi
+	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
 	sed -i -r \
@@ -59,6 +59,7 @@ src_prepare() {
 
 	# Avoid rebuild
 	touch lib/ss/ss_err.h
+	eautoreconf
 }
 
 src_configure() {
@@ -68,20 +69,11 @@ src_configure() {
 	# needs open64() prototypes and friends
 	append-cppflags -D_GNU_SOURCE
 
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
 	ac_cv_path_LDCONFIG=: \
 	econf \
 		--with-root-prefix="${EPREFIX}/" \
 		--enable-symlink-install \
-		${libtype} \
+		$(tc-is-static-only || echo --enable-elf-shlibs) \
 		$(tc-has-tls || echo --disable-tls) \
 		--without-included-gettext \
 		$(use_enable nls) \
@@ -99,12 +91,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
+	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
 
 	# Build the FreeBSD helper
 	if use elibc_FreeBSD ; then
 		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
+		emake V=1 fsck_ext2fs
 	fi
 }
 
@@ -123,11 +115,11 @@ src_install() {
 		STRIP=: \
 		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" \
-		install install-libs || die
+		install install-libs
 	dodoc README RELEASE-NOTES
 
 	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
+	doins "${FILESDIR}"/e2fsck.conf
 
 	# Move shared libraries to /lib/, install static libraries to
 	# /usr/lib/, and install linker scripts to /usr/lib/.
@@ -138,8 +130,8 @@ src_install() {
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
 		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
+		dosbin "${S}"/fsck_ext2fs
+		doman "${FILESDIR}"/fsck_ext2fs.8
 
 		# filefrag is linux only
 		rm \
diff --git a/sys-kernel/genkernel-next/genkernel-next-58.ebuild b/sys-kernel/genkernel-next/genkernel-next-58.ebuild
index 99879df813fe..954cc3693d36 100644
--- a/sys-kernel/genkernel-next/genkernel-next-58.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-58.ebuild,v 1.2 2014/07/06 12:59:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-58.ebuild,v 1.3 2014/07/20 08:35:44 klausman Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ inherit bash-completion-r1 eutils
 if [[ "${PV}" == "9999" ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts, reloaded"
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index fb0c627f3baa..76bffe4853fa 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,4 +1,4 @@
 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84 SHA512 01bf6571efc3b63b985bb45190553cbf0e486ddcf022715a2bdf36eb3e45ffada603ed52bf17d6920b9dc3e98ffc6758d2481a83b68bbf5d946c76173f7d14a8 WHIRLPOOL 058fc1278ff2427d956728ad2d132652e80b60570c20c904c6d6e2a15c4a9d00ec13340ad56114f82dd703ee87cd576c2f69eb3d40f1f16743430476c3e383b1
 DIST e2fsprogs-libs-1.42.10.tar.gz 575703 SHA256 236ea5124ae7c2a0d0bc4bc5927e614a52da2635fbc3b2187ca8bc415bb3644d SHA512 97be305df2debad3378f53ffa702e0719e76f9541c38468c78c32e77765fb0ae95b927dca4d5032268346792e759cf02ab9542c9e08c0b9f58ddd5276e2e0362 WHIRLPOOL 30b8df6b6fa29449d5ec90c435fc1f234d0e59d6012015a00c603139f400ad46708cd444c88e3693247703171d3e65275c3204d7d5f53305b7a412fc7d6cfbd5
+DIST e2fsprogs-libs-1.42.11.tar.gz 604886 SHA256 8b52d20c6571155d2adffafbbd5d215b08cc5b54a7f1a6d2ca7995d2a29dc518 SHA512 4b3201c6c7f5dd556ea8585065cacad9254c84f2428f88abeed7ef7586c941221086e4781de67721ec66d055c50a4c182b2a496326f7a7733397d0aabfe3c334 WHIRLPOOL 9243625785957e4b3f9ca0aa58132e24fb5c21018191d53398f937b59404f3413d053420d5abbbcde02b4ea31461798bb8b998b476468806cb57f8d21e98b027
 DIST e2fsprogs-libs-1.42.7.tar.gz 571544 SHA256 21ce9cd879c401d08b057a9abda2b56d70557239d1f5e42674fa2c20509c2145 SHA512 2ffd37edd156730d2cc5c685e0d082c171ada626ced40a86623d937522fd020c9215fa287de909968cab366ad8a1aa84a6de8e4eaf3fc1effb103000448bae0b WHIRLPOOL 12d4f309feadd957317f97f44c9c8cf5552ed27e0f22e2061d39e8abd2732fd512f38127a0806bc913ba92c64894218efcebda1316d74b6a814bf7f6f94152df
-DIST e2fsprogs-libs-1.42.9.tar.gz 574130 SHA256 87778c5816bfab40cd5b1c64725b4f4c94c9cca42e74b6937211fbf6f3509667 SHA512 e68f9aef3415e95db85980c1677fb6c71338b69858a386e5eabab208121b0c26b37a2ceb9b60368492d365ab4161522dff0ba74cc69030d9bc5b4819762a9aed WHIRLPOOL da5ed2b45e01dbb836c9b7fafed0105329e883fdcd5915419886173be66956a240a2581c0517fc9dd1c5513be668ae9e416d46c5bde00b447c4624980872ce78
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
similarity index 81%
rename from sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild
rename to sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
index d572186a4ef0..ba77a94ea881 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.9.ebuild,v 1.3 2014/01/18 02:37:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.1 2014/07/20 10:42:56 polynomial-c Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit toolchain-funcs eutils multilib-minimal
+inherit autotools toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -35,6 +35,8 @@ S=${WORKDIR}/${P%_pre*}
 src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
+	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -43,6 +45,9 @@ multilib_src_configure() {
 	ac_cv_lib_blkid_blkid_get_cache=yes \
 	ac_cv_path_LDCONFIG=: \
 	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
 	econf \
 		--disable-lib{blkid,uuid} \
 		--disable-quota \
@@ -51,8 +56,12 @@ multilib_src_configure() {
 		$(use_enable nls)
 }
 
+multilib_src_compile() {
+	emake V=1
+}
+
 multilib_src_install() {
-	emake STRIP=: DESTDIR="${D}" install || die
+	emake V=1 STRIP=: DESTDIR="${D}" install || die
 	multilib_is_native_abi && gen_usr_ldscript -a com_err ss
 	# configure doesn't have an option to disable static libs :/
 	use static-libs || find "${ED}" -name '*.a' -delete
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.400.0-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.400.0-r2.ebuild
similarity index 87%
rename from virtual/perl-File-Spec/perl-File-Spec-3.400.0-r1.ebuild
rename to virtual/perl-File-Spec/perl-File-Spec-3.400.0-r2.ebuild
index 71a026eae842..1c140b5e0dbf 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.400.0-r1.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.400.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.400.0-r1.ebuild,v 1.1 2014/07/06 15:43:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.400.0-r2.ebuild,v 1.1 2014/07/20 12:14:09 dilfridge Exp $
 
 EAPI=5
 
@@ -16,4 +16,5 @@ IUSE=""
 RDEPEND="
 	|| ( =dev-lang/perl-5.18* ~perl-core/${PN#perl-}-${PV} )
 	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
 "
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.470.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.470.0.ebuild
index 0683e99b08de..44c8e187e887 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.470.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.470.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.470.0.ebuild,v 1.1 2014/07/06 15:43:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Spec/perl-File-Spec-3.470.0.ebuild,v 1.2 2014/07/20 12:14:09 dilfridge Exp $
 
 EAPI=5
 
@@ -16,4 +16,5 @@ IUSE=""
 RDEPEND="
 	|| ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
 	!<perl-core/${PN#perl-}-${PV}
+	!>perl-core/${PN#perl-}-${PV}-r999
 "
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.100-r1.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.100-r1.ebuild
deleted file mode 100644
index 568bfa178829..000000000000
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.100-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.100-r1.ebuild,v 1.2 2014/07/07 12:15:58 zlogene Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for ${PN#perl-}"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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="~perl-core/${PN#perl-}-${PV}"
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
index df029ba29c5a..20b0f298a9ee 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild,v 1.7 2014/06/22 14:32:45 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild,v 1.8 2014/07/20 08:39:35 klausman Exp $
 
 EAPI=5
 inherit gnome.org readme.gentoo
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild b/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
index a590ffb7ddfb..f3cffecb197f 100644
--- a/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
+++ b/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild,v 1.5 2014/07/13 09:59:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.9.1-r2.ebuild,v 1.6 2014/07/20 10:23:52 klausman Exp $
 
 EAPI=5
 inherit eutils elisp-common
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/sawfish/${P}.tar.xz"
 
 LICENSE="GPL-2 Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="emacs nls xinerama"
 
 RDEPEND="emacs? ( virtual/emacs !app-emacs/sawfish )