diff --git a/app-accessibility/brltty/brltty-5.2.ebuild b/app-accessibility/brltty/brltty-5.2.ebuild
index a36abb09a577..d113f38b407c 100644
--- a/app-accessibility/brltty/brltty-5.2.ebuild
+++ b/app-accessibility/brltty/brltty-5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.2.ebuild,v 1.5 2015/01/18 08:47:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.2.ebuild,v 1.6 2015/01/26 10:37:18 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://brltty.com/archive/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86"
 IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 		java +midi ncurses nls ocaml +pcm python usb +speech
 		tcl X"
diff --git a/app-admin/eselect-ctags/eselect-ctags-1.18.ebuild b/app-admin/eselect-ctags/eselect-ctags-1.18.ebuild
index 23758d1773de..69ed4400bed3 100644
--- a/app-admin/eselect-ctags/eselect-ctags-1.18.ebuild
+++ b/app-admin/eselect-ctags/eselect-ctags-1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ctags/eselect-ctags-1.18.ebuild,v 1.4 2015/01/25 21:17:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-ctags/eselect-ctags-1.18.ebuild,v 1.5 2015/01/26 09:45:59 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="!<app-admin/eselect-emacs-1.18
 	>=app-admin/eselect-1.2.3"
diff --git a/app-admin/eselect-emacs/eselect-emacs-1.18.ebuild b/app-admin/eselect-emacs/eselect-emacs-1.18.ebuild
index a5b36ff1172a..46e2b6d74a3d 100644
--- a/app-admin/eselect-emacs/eselect-emacs-1.18.ebuild
+++ b/app-admin/eselect-emacs/eselect-emacs-1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-emacs/eselect-emacs-1.18.ebuild,v 1.4 2015/01/25 21:18:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-emacs/eselect-emacs-1.18.ebuild,v 1.5 2015/01/26 09:46:03 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.2.6
 	~app-admin/eselect-ctags-${PV}"
diff --git a/app-admin/hardening-check/hardening-check-2.6.ebuild b/app-admin/hardening-check/hardening-check-2.6.ebuild
index 606cfd4bb2f7..8249d5093246 100644
--- a/app-admin/hardening-check/hardening-check-2.6.ebuild
+++ b/app-admin/hardening-check/hardening-check-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hardening-check/hardening-check-2.6.ebuild,v 1.2 2015/01/09 13:44:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hardening-check/hardening-check-2.6.ebuild,v 1.3 2015/01/26 09:37:58 ago Exp $
 
 EAPI="5"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Report the hardening characterists of a set of binaries"
 HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
 SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.xz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
index 143305085189..bb64685a1b4d 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild,v 1.3 2015/01/09 13:44:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild,v 1.4 2015/01/26 09:59:16 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 hppa ~x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304.ebuild
deleted file mode 100644
index e09d1897f377..000000000000
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo-ng/procinfo-ng-2.0.304.ebuild,v 1.6 2014/08/10 01:37:39 patrick Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
-HOMEPAGE="http://sourceforge.net/projects/procinfo-ng/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	!app-admin/procinfo"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	# removing -s flag as portage does the stripping part and add support
-	# for custom LDFLAGS. Plus correct for --as-needed
-	sed -e 's:-s -lncurses:${LDFLAGS}:' \
-		-i configure.in || die "sed configure.in failed"
-	eautoreconf
-}
-
-src_compile() {
-	emake LIBS="-lncurses" || die "compile failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-}
diff --git a/app-admin/ulogd/ulogd-2.0.4.ebuild b/app-admin/ulogd/ulogd-2.0.4.ebuild
index f750e47bef15..7f2e1889f32b 100644
--- a/app-admin/ulogd/ulogd-2.0.4.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4.ebuild,v 1.7 2015/01/22 08:41:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4.ebuild,v 1.8 2015/01/26 09:57:47 ago Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc x86"
 IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite"
 
 RDEPEND="net-firewall/iptables
diff --git a/app-arch/gzip/gzip-1.6.ebuild b/app-arch/gzip/gzip-1.6.ebuild
index 5701b33da686..60aefb1c543e 100644
--- a/app-arch/gzip/gzip-1.6.ebuild
+++ b/app-arch/gzip/gzip-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.8 2015/01/18 08:48:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.6.ebuild,v 1.9 2015/01/26 10:38:30 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 src_prepare() {
diff --git a/app-arch/lzip/lzip-1.16.ebuild b/app-arch/lzip/lzip-1.16.ebuild
index 4106aaea638c..8545f3689b85 100644
--- a/app-arch/lzip/lzip-1.16.ebuild
+++ b/app-arch/lzip/lzip-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.16.ebuild,v 1.6 2015/01/18 08:48:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.16.ebuild,v 1.7 2015/01/26 10:38:47 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 src_configure() {
 	# not autotools-based
diff --git a/app-arch/lziprecover/lziprecover-1.16.ebuild b/app-arch/lziprecover/lziprecover-1.16.ebuild
index 6f484fe09d02..9dbecbb15254 100644
--- a/app-arch/lziprecover/lziprecover-1.16.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lziprecover/lziprecover-1.16.ebuild,v 1.2 2015/01/09 13:44:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lziprecover/lziprecover-1.16.ebuild,v 1.3 2015/01/26 10:41:15 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.nongnu.org/lzip/lziprecover.html"
 SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-benchmarks/spew/spew-1.0.8-r1.ebuild b/app-benchmarks/spew/spew-1.0.8-r1.ebuild
index 94a4e4bf822d..13be028ae34f 100644
--- a/app-benchmarks/spew/spew-1.0.8-r1.ebuild
+++ b/app-benchmarks/spew/spew-1.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/spew-1.0.8-r1.ebuild,v 1.3 2015/01/09 13:44:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/spew/spew-1.0.8-r1.ebuild,v 1.4 2015/01/26 09:41:34 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="static"
 
 DEPEND="static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] )
diff --git a/app-crypt/ckpass/ckpass-0.2.ebuild b/app-crypt/ckpass/ckpass-0.2.ebuild
index 81d3ae4a93bf..69844c7af856 100644
--- a/app-crypt/ckpass/ckpass-0.2.ebuild
+++ b/app-crypt/ckpass/ckpass-0.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ckpass/ckpass-0.2.ebuild,v 1.1 2013/10/23 13:17:39 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ckpass/ckpass-0.2.ebuild,v 1.2 2015/01/26 09:46:13 jer Exp $
 
 EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="An ncurses based password database client that is compatible with KeePass 1.x format databases"
 HOMEPAGE="http://ckpass.sourceforge.net/"
@@ -11,12 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND=">=dev-libs/libkpass-6"
 RDEPEND="${DEPEND}"
 
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
 }
+
+DOCS=( AUTHORS )
diff --git a/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
new file mode 100644
index 000000000000..8d99bc93ad8f
--- /dev/null
+++ b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,7 @@
+ 
+ AC_CHECK_LIB([c], [main], [], AC_MSG_ERROR(requires libc))
+ AC_CHECK_LIB([ncurses], [main], [], AC_MSG_ERROR(requires libncurses))
++AC_SEARCH_LIBS([acs_map],[tinfo], [], AC_MSG_ERROR(requires a library providing acs_map))
+ AC_CHECK_LIB([form], [main], [], AC_MSG_ERROR(requires libform))
+ AC_CHECK_LIB([kpass], [main], [], AC_MSG_ERROR(requires libkpass))
+ 
diff --git a/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild b/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
index b080dee1f1a0..6bdca5889db5 100644
--- a/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
+++ b/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild,v 1.5 2015/01/18 08:36:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/dirmngr/dirmngr-1.1.1-r1.ebuild,v 1.6 2015/01/26 09:43:16 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 RDEPEND=">=net-nds/openldap-2.1.26
diff --git a/app-crypt/md6sum/md6sum-1.0-r1.ebuild b/app-crypt/md6sum/md6sum-1.0-r1.ebuild
deleted file mode 100644
index 85c9f848415d..000000000000
--- a/app-crypt/md6sum/md6sum-1.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md6sum/md6sum-1.0-r1.ebuild,v 1.3 2012/11/19 22:43:39 tomka Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A C implementation of MD6"
-HOMEPAGE="http://groups.csail.mit.edu/cis/md6"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newdoc README_Reference.txt README
-}
diff --git a/app-crypt/md6sum/md6sum-1.0-r2.ebuild b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
index ba0a62694282..f55afbf4a81f 100644
--- a/app-crypt/md6sum/md6sum-1.0-r2.ebuild
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md6sum/md6sum-1.0-r2.ebuild,v 1.2 2015/01/09 13:44:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md6sum/md6sum-1.0-r2.ebuild,v 1.3 2015/01/26 09:43:34 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-crypt/pgpdump/pgpdump-0.29.ebuild b/app-crypt/pgpdump/pgpdump-0.29.ebuild
index 89b418682259..976b67b6d9c3 100644
--- a/app-crypt/pgpdump/pgpdump-0.29.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.29.ebuild,v 1.3 2015/01/17 13:47:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.29.ebuild,v 1.4 2015/01/26 10:11:44 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/app-crypt/tinyca/tinyca-2.0.7.5-r1.ebuild b/app-crypt/tinyca/tinyca-2.0.7.5-r1.ebuild
deleted file mode 100644
index e6076e2bf0b2..000000000000
--- a/app-crypt/tinyca/tinyca-2.0.7.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tinyca/tinyca-2.0.7.5-r1.ebuild,v 1.4 2013/07/04 12:18:41 ago Exp $
-
-inherit eutils
-
-MY_P="${PN}${PV/./-}"
-DESCRIPTION="Simple Perl/Tk GUI to manage a small certification authority"
-HOMEPAGE="http://tinyca.sm-zone.net/"
-SRC_URI="http://tinyca.sm-zone.net/${MY_P}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-LANGS="en de cs es sv"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-libs/openssl-0.9.7e
-	dev-perl/Locale-gettext
-	>=virtual/perl-MIME-Base64-2.12
-	>=dev-perl/gtk2-perl-1.072"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.0.7.3-compositefix.patch"
-	epatch "${FILESDIR}/${P}-openssl-1.patch"
-	sed -i -e 's:./lib:/usr/share/tinyca/lib:g' \
-		-e 's:./templates:/usr/share/tinyca/templates:g' \
-		-e 's:./locale:/usr/share/locale:g' "${S}/tinyca2"
-}
-
-src_compile() {
-	emake -C po || die
-}
-
-locale_install() {
-	dodir /usr/share/locale/$@/LC_MESSAGES/
-	insinto /usr/share/locale/$@/LC_MESSAGES/
-	doins locale/$@/LC_MESSAGES/tinyca2.mo
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe tinyca2 tinyca
-	insinto /usr/share/tinyca/lib
-	doins lib/*.pm
-	insinto /usr/share/tinyca/lib/GUI
-	doins lib/GUI/*.pm
-	insinto /usr/share/tinyca/templates
-	doins templates/*
-	insinto /usr/share/
-	strip-linguas ${LANGS}
-	local l
-	for l in ${LANGS}; do
-		if [ "$l" != "en" ]; then
-			use linguas_$l && locale_install $l
-		fi
-	done
-}
diff --git a/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild b/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild
index 99a9eeb14651..8fa4957d0c08 100644
--- a/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild
+++ b/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild,v 1.2 2015/01/09 13:45:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild,v 1.3 2015/01/26 09:43:52 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://tinyca.sm-zone.net/${MY_P}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 LANGS="en de cs es sv"
 
diff --git a/app-dicts/dictd-vera/dictd-vera-1.22.ebuild b/app-dicts/dictd-vera/dictd-vera-1.22.ebuild
index 01521d2d5e42..aad2a5b1269f 100644
--- a/app-dicts/dictd-vera/dictd-vera-1.22.ebuild
+++ b/app-dicts/dictd-vera/dictd-vera-1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/dictd-vera/dictd-vera-1.22.ebuild,v 1.4 2015/01/18 08:38:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/dictd-vera/dictd-vera-1.22.ebuild,v 1.5 2015/01/26 10:04:22 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="FDL-1.3"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 DEPEND=">=app-text/dictd-1.5.5"
 RDEPEND="${DEPEND}"
diff --git a/app-dicts/myspell-id/myspell-id-2.0.ebuild b/app-dicts/myspell-id/myspell-id-2.0.ebuild
index b67cf08cd1d1..a51399dc5121 100644
--- a/app-dicts/myspell-id/myspell-id-2.0.ebuild
+++ b/app-dicts/myspell-id/myspell-id-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-id/myspell-id-2.0.ebuild,v 1.6 2015/01/18 08:38:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-id/myspell-id-2.0.ebuild,v 1.7 2015/01/26 10:04:40 ago Exp $
 
 EAPI=4
 
@@ -24,5 +24,5 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/indonesian-dictionar
 
 LICENSE="GPL-2"
 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"
 IUSE=""
diff --git a/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild b/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild
index 34e17338328c..09b29d677622 100644
--- a/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild
+++ b/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild,v 1.6 2015/01/18 08:41:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-lv/myspell-lv-1.0.0.ebuild,v 1.7 2015/01/26 10:09:18 ago Exp $
 
 EAPI=5
 
@@ -24,5 +24,5 @@ SRC_URI="http://dict.dv.lv/download/lv_LV-${PV}.zip"
 
 LICENSE="LGPL-2.1"
 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"
 IUSE=""
diff --git a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild b/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
index aa76e92400a9..e3a3c378dbb4 100644
--- a/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
+++ b/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild,v 1.6 2015/01/18 08:39:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-ro/myspell-ro-3.3.10.ebuild,v 1.7 2015/01/26 10:04:57 ago Exp $
 
 EAPI=5
 
@@ -30,5 +30,5 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 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"
 IUSE=""
diff --git a/app-emacs/css-mode/css-mode-0.11-r1.ebuild b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
index a433d93bc6de..23671ebf4f1b 100644
--- a/app-emacs/css-mode/css-mode-0.11-r1.ebuild
+++ b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/css-mode/css-mode-0.11-r1.ebuild,v 1.2 2015/01/22 08:42:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/css-mode/css-mode-0.11-r1.ebuild,v 1.3 2015/01/26 09:45:37 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 ELISP_PATCHES="${P}-no-compat-kbd.patch"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/folding/folding-2013.0613.1821.ebuild b/app-emacs/folding/folding-2013.0613.1821.ebuild
index 7dcae8f08ea5..7813c722aef2 100644
--- a/app-emacs/folding/folding-2013.0613.1821.ebuild
+++ b/app-emacs/folding/folding-2013.0613.1821.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/folding/folding-2013.0613.1821.ebuild,v 1.2 2015/01/09 13:45:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/folding/folding-2013.0613.1821.ebuild,v 1.3 2015/01/26 09:45:03 ago Exp $
 
 EAPI=5
 
@@ -13,6 +13,6 @@ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~x86"
+KEYWORDS="~alpha amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/po-mode/po-mode-0.19.3.ebuild b/app-emacs/po-mode/po-mode-0.19.3.ebuild
index 15ba6a8b6ce4..ed60050c90f7 100644
--- a/app-emacs/po-mode/po-mode-0.19.3.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/po-mode/po-mode-0.19.3.ebuild,v 1.4 2015/01/22 08:44:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/po-mode/po-mode-0.19.3.ebuild,v 1.5 2015/01/26 09:45:20 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emulation/free42/free42-1.5.5.ebuild b/app-emulation/free42/free42-1.5.5.ebuild
index d5c1d1aea132..c787504e07d3 100644
--- a/app-emulation/free42/free42-1.5.5.ebuild
+++ b/app-emulation/free42/free42-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.5.5.ebuild,v 1.2 2015/01/22 08:45:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.5.5.ebuild,v 1.3 2015/01/26 10:16:41 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa"
 
 DEPEND="dev-libs/atk
diff --git a/app-forensics/foremost/foremost-1.5.7-r2.ebuild b/app-forensics/foremost/foremost-1.5.7-r2.ebuild
index 8aa4a82cecb2..060a8583516a 100644
--- a/app-forensics/foremost/foremost-1.5.7-r2.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/foremost-1.5.7-r2.ebuild,v 1.3 2015/01/17 13:41:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/foremost-1.5.7-r2.ebuild,v 1.4 2015/01/26 09:57:28 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://foremost.sourceforge.net/"
 # starting to hate sf.net ...
 SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-laptop/hdapsd/hdapsd-20141203.ebuild b/app-laptop/hdapsd/hdapsd-20141203.ebuild
index fefad50a7356..5431d8ac79ef 100644
--- a/app-laptop/hdapsd/hdapsd-20141203.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20141203.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20141203.ebuild,v 1.2 2015/01/22 08:42:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20141203.ebuild,v 1.3 2015/01/26 10:11:27 ago Exp $
 
 EAPI=5
 inherit linux-info readme.gentoo systemd
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libconfig"
 
 DEPEND="libconfig? ( dev-libs/libconfig )"
diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
index 3daca5997871..a01d0bc5be1b 100644
--- a/app-misc/beanstalkd/beanstalkd-1.10.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/beanstalkd-1.10.ebuild,v 1.2 2015/01/09 13:45:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/beanstalkd-1.10.ebuild,v 1.3 2015/01/26 10:17:27 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~mips x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos"
 
 RDEPEND=""
 DEPEND=""
diff --git a/app-misc/colordiff/colordiff-1.0.13-r1.ebuild b/app-misc/colordiff/colordiff-1.0.13-r1.ebuild
index 2d659636ffd1..e9c221d7341c 100644
--- a/app-misc/colordiff/colordiff-1.0.13-r1.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13-r1.ebuild,v 1.6 2015/01/18 08:46:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13-r1.ebuild,v 1.7 2015/01/26 10:35:51 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
index ce1eeae495bd..520523887691 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.20-r3.ebuild,v 1.6 2015/01/18 08:47:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.20-r3.ebuild,v 1.7 2015/01/26 10:36:08 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index d3bd5255c938..02834c7038bf 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,2 +1 @@
-DIST gcal-3.6.2.tar.xz 1638776 SHA256 1c3f20e81b7a0ceb3b80668704dfeb7b0e7fe309aa3d6bccb5743f23cff12cda SHA512 fd5954eeef82e5683115e8fde220c949ac87702c77bd7bec321337bd508dcd867b3c4f86c288c5c8e69240cb656d21eed47930a572aca1595d22521ed03cd458 WHIRLPOOL 4e3ec708c9cf22bbcf79011af0bc4b47ab61db0fc716ff3e6113f7d9bfdf2563ed8e9f2afbc2ba8c6d3e7cadb69c14a65292b38ce64aea6edd9b37325546537c
 DIST gcal-3.6.3.tar.xz 1640172 SHA256 6742913a1d011ac109ad713ef4a8263eaf4c5cfd315471626a92f094e3e4b31b SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963 WHIRLPOOL 8dc5c99af8b76d58f751f28d687bf1bf5ba62864df38570de7d8a11fbf09e5d5d93688f6ab7d26ecc5b9676c4f5f0a2b8572c5271fb0c82a64e82ca30d77a071
diff --git a/app-misc/gcal/gcal-3.6.2.ebuild b/app-misc/gcal/gcal-3.6.2.ebuild
deleted file mode 100644
index 3a008fd204cb..000000000000
--- a/app-misc/gcal/gcal-3.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.6.2.ebuild,v 1.4 2014/08/27 12:23:54 ago Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Calendar - a replacement for cal"
-HOMEPAGE="http://www.gnu.org/software/gcal/"
-SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ncurses nls unicode"
-
-DEPEND="
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.17 )"
-RDEPEND="nls? ( virtual/libintl )"
-
-DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
-
-src_configure() {
-	tc-export CC
-	append-flags -D_GNU_SOURCE
-	econf \
-		--disable-rpath \
-		$(use_enable nls) \
-		$(use_enable ncurses term) \
-		$(use_enable unicode)
-}
diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild
index 8f76e82979ad..d8d863118bd2 100644
--- a/app-misc/gcal/gcal-3.6.3.ebuild
+++ b/app-misc/gcal/gcal-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.6.3.ebuild,v 1.3 2015/01/17 14:00:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.6.3.ebuild,v 1.4 2015/01/26 10:36:25 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ncurses nls unicode"
 
 DEPEND="
diff --git a/app-misc/gourmet/gourmet-0.17.4.ebuild b/app-misc/gourmet/gourmet-0.17.4.ebuild
index a4b6111b2824..9a0be59c1d41 100644
--- a/app-misc/gourmet/gourmet-0.17.4.ebuild
+++ b/app-misc/gourmet/gourmet-0.17.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.17.4.ebuild,v 1.3 2015/01/09 13:46:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gourmet/gourmet-0.17.4.ebuild,v 1.4 2015/01/26 10:17:09 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="-i18n -ipython pdf print spell sound web"
 
 RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
diff --git a/app-misc/gtypist/gtypist-2.9.5.ebuild b/app-misc/gtypist/gtypist-2.9.5.ebuild
index 3cb45b268f78..8b56cdbfd233 100644
--- a/app-misc/gtypist/gtypist-2.9.5.ebuild
+++ b/app-misc/gtypist/gtypist-2.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.9.5.ebuild,v 1.3 2015/01/17 13:38:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.9.5.ebuild,v 1.4 2015/01/26 09:44:09 ago Exp $
 
 EAPI=5
 inherit eutils elisp-common
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gtypist/${P}.tar.xz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
 IUSE="nls emacs xemacs"
 
 DEPEND="
diff --git a/app-misc/nut/nut-20.1.ebuild b/app-misc/nut/nut-20.1.ebuild
index 3b3c52144170..ea109622c6cd 100644
--- a/app-misc/nut/nut-20.1.ebuild
+++ b/app-misc/nut/nut-20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-20.1.ebuild,v 1.2 2015/01/22 08:44:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-20.1.ebuild,v 1.3 2015/01/26 10:05:14 ago Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc x86"
 
 src_compile() {
 	emake \
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index fe64a59f76ac..8265bb447ec4 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,3 +1,2 @@
 DIST wcd-5.2.4-src.tar.gz 192124 SHA256 e0e99e8300bb32163a89eafebe75f3f66658113ea4e50391c5f5c16ac5b945b5 SHA512 b4beba3c285fbc0cafe8a145da1e42bf4764e6b5c8e153f34453a1d31578b06ce3db1bb2461c003538999b6b089cca587013d82a30be78a6a5cd1c49b59a9bb4 WHIRLPOOL bf2a7d27db56db6fedfe7f715512ca6a9e5a12e24a2d8df90db688740477c3d9854d912301a0c9b7874610f695fd96ead0121ac486c160a89aa4cd50b485568b
-DIST wcd-5.2.5.tar.gz 622544 SHA256 e2b32766c100355b6b31c61a1ebf480b7d5785928cf4bc915b626b0f9a611648 SHA512 c77955a6e6cc04b4cadb063c99c49023884dc046717ffd0b2873622731bd2acb6381b0ce24a9980221030215cab2eb2f9ab7cb28e4e768c0675d9782930834c6 WHIRLPOOL 5384890d51c7547c42260b45ad70e621ebd35f6fb3447edd1373d0941515b0dbb60631b2776b68a11d0ec95c270c78b8ec355783fa7feebdb77424252fdea80a
 DIST wcd-5.2.6.tar.gz 624904 SHA256 e23939e9d8aa7ad98d74bc6def1d6eaf405dd442b498984ab0c35b83efb9cfc7 SHA512 f223130a9878d9d62767a2a86dd3ec227f8349eecd149d5a86ff7c5b5cd8a2cf14e3752186ec4617ac25b9c3df6662ccb309cf96dcb9d4ede291dc4a12a33a82 WHIRLPOOL 0d63dbe663fef83c84cc3ca3c284f76d84913986533155a6cb4a1765ed4291886c4a1885b89dc9660d8f0102c74369a97e41ef4375627f843dfef99d3ba72f35
diff --git a/app-misc/wcd/wcd-5.2.5.ebuild b/app-misc/wcd/wcd-5.2.5.ebuild
deleted file mode 100644
index aad5aab2bf2b..000000000000
--- a/app-misc/wcd/wcd-5.2.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/wcd-5.2.5.ebuild,v 1.2 2015/01/09 13:46:41 ago Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Wherever Change Directory"
-HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
-SRC_URI="http://waterlan.home.xs4all.nl/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
-	sys-libs/ncurses[unicode?]
-	unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
-	app-text/ghostscript-gpl"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	tc-export CC
-}
-
-src_compile() {
-	local mycompile="LFS=1"
-	use nls || mycompile="${mycompile} ENABLE_NLS="
-	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
-	emake \
-		${mycompile}
-}
-
-src_install() {
-	local DOCS="../README.txt"
-	default
-	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 4945c9dd01d9..1334d2722380 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1,2 +1 @@
 DIST when-1.1.31.tar.gz 47113 SHA256 5b76a660bc234e53d19a1ba6024364394ee57e8b843acc5e43d73be091a8e49b SHA512 55a8a5bc22e04f3ea830de76ac3cc1ef3e4d1a2c496b6138f8aab90c86fb4dec20478723e6351463a834dde1d10d937715f3c0df874da4f6192bd90ea9674690 WHIRLPOOL e843d4baed349027ada660f539453ad599a0ade43b2125cd8f1a70e18ad62f36c2fae1a5141e0c294ece7c5b1e7213b55adef343a9ea425b77a8ed2412b9e87c
-DIST when-1.1.33.tar.gz 49740 SHA256 568a49e999363a018186e03c38d116c587b332f7fcf60820f9cfc34779050ab0 SHA512 5c0934257133f75a7de984499f99f68dde5343d51051acf1b454f04dae82254c733e946a6c5ead546dc3c07cd113d938a48c95af39b80cbfc04ee6d748223c83 WHIRLPOOL 9bcbe73a4034b817fc34d302689a0b404563081163c692ee23e484fbb9ab993a90a5d468f2586e7f5327abad98f4033ebd7546255f682898e899a9fdd7629c97
diff --git a/app-misc/when/when-1.1.33.ebuild b/app-misc/when/when-1.1.33.ebuild
deleted file mode 100644
index 1ea3c3b6b195..000000000000
--- a/app-misc/when/when-1.1.33.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/when/when-1.1.33.ebuild,v 1.3 2015/01/17 14:00:57 ago Exp $
-
-EAPI=5
-
-DESCRIPTION="Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic"
-HOMEPAGE="http://www.lightandmatter.com/when/when.html"
-SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/when_dist
-
-src_prepare() {
-	# Fix path for tests
-	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
-}
-
-src_compile() { :; }
-
-src_test() {
-	# The when command requires these files, or attempts to run setup function.
-	mkdir "${HOME}"/.when || die 'mkdir failed'
-	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
-	emake test
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README
-}
diff --git a/app-mobilephone/anyremote/anyremote-6.4.ebuild b/app-mobilephone/anyremote/anyremote-6.4.ebuild
index 3c70c9710c38..50a065943bd2 100644
--- a/app-mobilephone/anyremote/anyremote-6.4.ebuild
+++ b/app-mobilephone/anyremote/anyremote-6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/anyremote/anyremote-6.4.ebuild,v 1.2 2015/01/09 13:46:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/anyremote/anyremote-6.4.ebuild,v 1.3 2015/01/26 10:05:31 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bluetooth dbus"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 9705a3c059c9..a3bab3169f24 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,2 +1,2 @@
-DIST gnumeric-1.12.17.tar.xz 18023276 SHA256 ec5cb6cc02b3de7f86619e258deb68a3dcfd4c85e83a4048b924c307ef607ba1 SHA512 58cc77b5783c12ef774a0781e3cfbc842df630eb49041708cc441054be29d9055317245ab06730de642d2041bc2a2b9465bca5cd648deef7f60804d525de4269 WHIRLPOOL 3ccee65c1ae41d129064d176687c78cbe278e134e65c393ff3f8f7dd679608b7e687a1a28072db986e1f2d1db046cfcbbc1352892a9728504bb7f654eb15ce41
 DIST gnumeric-1.12.18.tar.xz 18064824 SHA256 402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9 SHA512 241a80d79d1d20f484b2e262b86c6dd12192842b5baf7f11c3402b63810f1e67080b6ec44f05a1de88ae3f0cd476cd9ffb2ecbebe2cdf9104bb45287c8e5b8b9 WHIRLPOOL 8b646780e493d3bbb1ee357876481c2a19115bfed3909db0fddf212fc6ba808493e2c7c477efc13d23240aa36ba6957b3041d96c260fe155a5157530fdefcdbf
+DIST gnumeric-1.12.19.tar.xz 18432584 SHA256 2dc6b2203887e5a28b52da7493219c8acf7f131b44c214c5b00522aa5bc8e9d3 SHA512 845546c7c3ddde4bf332de0552d1960a5f4714d986f6caa3a6b4cf1d515d6cc08ec5b243211e26c5c11c4384007468ea2c12cc70bd65093b5f5db687d0ae1d63 WHIRLPOOL 4ef80e3894d5923e1bbb0810a6b11d917fa5e08c178c123b7a178405446e2d79367a4f3b3ee953fa8c32f6e4ba0005f122a40aef83b25021dd323d6bd3b83fb8
diff --git a/app-office/gnumeric/gnumeric-1.12.17.ebuild b/app-office/gnumeric/gnumeric-1.12.19.ebuild
similarity index 89%
rename from app-office/gnumeric/gnumeric-1.12.17.ebuild
rename to app-office/gnumeric/gnumeric-1.12.19.ebuild
index b8dab94d426d..ec7ec2e1c20c 100644
--- a/app-office/gnumeric/gnumeric-1.12.17.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.17.ebuild,v 1.3 2014/07/23 15:13:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.19.ebuild,v 1.1 2015/01/26 14:33:07 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index b93507169d90..9fe738f6c962 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1 @@
-DIST skrooge-1.8.0.tar.bz2 12286047 SHA256 98c0ed6cfefd4c6c92a010a1ab9afc1ef230eacc391a45aa200901ba6fb3bf08 SHA512 cc64c47af430c52f5e341c6af8630704f33f2b1973b8f4275bf4522cc2c2925c71ced3f68557ba652c3f37b3119c1132489f55e0ec2bab551eb4eb1f7a02fb44 WHIRLPOOL 9e3bffea2651b86440ae55e03660db0f9386f259e5e470a5b6a9eede21a6dc777b4992cb7df167de7328be99ce4e5ac53b721b5ba657384b7be9acb7a0c82a33
 DIST skrooge-1.9.0.tar.bz2 12368789 SHA256 1127c404be1213b88e11ecb5c85ce27d7af87c231a8e281224545fae87644ff8 SHA512 33f49c97bdd55d5ec256a3a2084c6e0437177e9f0d3400fdadb1f056bbf7327ac0dcd42bdc111b43ed2b8fe7d68de93ebb36ca1af3ccef3045d1833fb2f044c1 WHIRLPOOL 4d999dd4a8bac67dc41b2a667714ae539b0efee6896ef4fbf8446cfe8b329eb7330522c700262b315f00baff00e78a9f0da3a416f3076584a3c94bf558f0d267
diff --git a/app-office/skrooge/skrooge-1.8.0.ebuild b/app-office/skrooge/skrooge-1.8.0.ebuild
deleted file mode 100644
index f80a67ef51ff..000000000000
--- a/app-office/skrooge/skrooge-1.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.8.0.ebuild,v 1.5 2014/12/26 10:25:40 kensington Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu it
-ja ko lt mr ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)')
-	app-crypt/qca:2
-	dev-db/sqlite:3
-	dev-libs/grantlee:0
-	>=dev-libs/libofx-0.9.1
-	dev-qt/qtsql:4[sqlite]
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kde-dev-scripts)
-"
-
-# upstream does not ship tests in releases
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	RESTRICT="test"
-fi
-
-DOCS=( AUTHORS CHANGELOG README TODO )
-
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		# KDE_LINGUAS is also used to install appropriate handbooks
-		# since there is no en_US 'translation', it cannot be added
-		# hence making this impossible to install
-		mv doc/en_US doc/en || die "doc move failed"
-		sed -i -e 's/en_US/en/' doc/CMakeLists.txt || die "sed failed"
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde4-base_src_test
-}
diff --git a/app-office/skrooge/skrooge-1.9.0.ebuild b/app-office/skrooge/skrooge-1.9.0.ebuild
index 9314a6ca6c40..cbf2791bfdfa 100644
--- a/app-office/skrooge/skrooge-1.9.0.ebuild
+++ b/app-office/skrooge/skrooge-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.9.0.ebuild,v 1.4 2015/01/22 08:40:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.9.0.ebuild,v 1.5 2015/01/26 10:00:47 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index b8943320f0ff..a23657b0d169 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,4 +1 @@
-DIST eix-0.25.5.tar.xz 487608 SHA256 bc0ff803063e7a20ad6cd24763808f5a2b95600bf2b6525fff402e4e430606c6 SHA512 3a7898c5f320bfd52e606eb732701301c96bd63fb143c4a195343efdf4abb354fd6b20cdfa6d0a72fcb39b60bfe6f7a4fe7135c908b5464952f01f965820a7a0 WHIRLPOOL dd9d5a996506b2575754969117fce09539ecba41e925f17c330aa5ff22dd6e12d1908104000d9ce109151d8caf214c9eec46b85292456d7526ecbc4d98b91db4
-DIST eix-0.29.3.tar.xz 549636 SHA256 23b0aa7b8a4ed576318ab418b86eb85fa7858744ab61fb900aed83d2499b04d0 SHA512 ab865de8a960ad3c8745b9c6d871dfe29f378740a46919fa4521414c2444ccf9585aae8426db2a44967b5f987a2e7a9a0a09a6a8c82c071c30b520ef18e425bd WHIRLPOOL 5f1c898d359b6f4c10c9f43d278fc68be2ea26465e2eae9672e9e7dce14ce1703733873fad53f356879990ebcf69c8d1e7639bc2ef375b68a8e7d339349deb17
-DIST eix-0.30.3.tar.xz 556804 SHA256 50f7227a1ec2993ed7f72934ad55e81b6a9c518e749a8631b34203dc205c2eca SHA512 9e42f12dc29ff6bc919ebf48c3882f057cfa95f976b1d100ca849e5ffda4057718301279b366f0b07abf1fb849eb934328b36b7e4f55640b81253d8212f1c077 WHIRLPOOL e003de58a930ccdfedda76c8383b3d177765e39a474234dfdb21c21658b286b31c366f2869bae15800a926a68402bc1782d5e376d107b69450a17647b04e2dd2
 DIST eix-0.30.4.tar.xz 556632 SHA256 4c753a82e15ce0f8bbdd74edcebb7bc23bd3de8dfca501f86733c335b55d9f4f SHA512 33e62765a9790d18256fcbcb4370b2e63f0b927e3088e0685cbc23dad47e0afa488bb84e5268b4da0d70b5a93b080a866e56257e3df21714ef5fd867f3de182e WHIRLPOOL 5731b6c36f8212fdb4e6b599224699cfc258a1026ef9f8ed8e95618e86df02b5872e7b1f170a3f0698bd348a5084161463d71e6fa14dff859ca92c9b3072dfc2
diff --git a/app-portage/eix/eix-0.25.5.ebuild b/app-portage/eix/eix-0.25.5.ebuild
deleted file mode 100644
index 155733c473c0..000000000000
--- a/app-portage/eix/eix-0.25.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.25.5.ebuild,v 1.9 2013/12/27 13:54:27 pinkbyte Exp $
-
-EAPI=4
-
-inherit multilib bash-completion-r1
-
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
-HOMEPAGE="http://eix.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
-
-RDEPEND="app-shells/push
-	sqlite? ( >=dev-db/sqlite-3 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if has_version "<${CATEGORY}/${PN}-0.25.3"; then
-	    local eixcache="${EROOT}"/var/cache/${PN}
-	    [[ -f ${eixcache} ]] && rm -f "${eixcache}"
-	fi
-}
-
-src_configure() {
-	econf $(use_with sqlite) $(use_with doc extra-doc) \
-		$(use_with zsh-completion) \
-		$(use_enable nls) $(use_enable tools separate-tools) \
-		$(use_enable security) $(use_enable optimization) \
-		$(use_enable strong-optimization) $(use_enable debug debugging) \
-		$(use_with prefix always-accept-keywords) \
-		$(use_with dep dep-default) \
-		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
-		--with-portage-rootpath="${ROOTPATH}" \
-		--with-eprefix-default="${EPREFIX}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	keepdir "/var/cache/${PN}"
-	fowners portage:portage "/var/cache/${PN}"
-	fperms 775 "/var/cache/${PN}"
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for owner/group portage:
-	# merging changes this owner/group back to root.
-	use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
-	local obs="${EROOT}var/cache/eix.previous"
-	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
-}
diff --git a/app-portage/eix/eix-0.29.3.ebuild b/app-portage/eix/eix-0.29.3.ebuild
deleted file mode 100644
index bc2232e82fe9..000000000000
--- a/app-portage/eix/eix-0.29.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.29.3.ebuild,v 1.10 2013/09/07 20:16:44 ago Exp $
-
-EAPI=5
-
-PLOCALES="de ru"
-inherit bash-completion-r1 eutils multilib l10n
-
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
-HOMEPAGE="http://eix.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="clang debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools zsh-completion"
-
-BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${BOTHDEPEND}
-	app-shells/push"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	clang? ( sys-devel/clang )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	case " ${REPLACING_VERSIONS}" in
-	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
-		local eixcache="${EROOT}/var/cache/${PN}"
-		test -f "${eixcache}" && rm -f -- "${eixcache}";;
-	esac
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	econf $(use_with sqlite) $(use_with doc extra-doc) \
-		$(use_with zsh-completion) \
-		$(use_enable nls) $(use_enable tools separate-tools) \
-		$(use_enable security) $(use_enable optimization) \
-		$(use_enable strong-security) \
-		$(use_enable strong-optimization) $(use_enable debug debugging) \
-		$(use_enable swap-remote) \
-		$(use_with prefix always-accept-keywords) \
-		$(use_with dep dep-default) \
-		$(use_with clang nongnu-cxx clang++) \
-		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
-		--with-portage-rootpath="${ROOTPATH}" \
-		--with-eprefix-default="${EPREFIX}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	keepdir "/var/cache/${PN}"
-	fowners portage:portage "/var/cache/${PN}"
-	fperms 775 "/var/cache/${PN}"
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for owner/group portage:
-	# merging changes this owner/group back to root.
-	use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
-	local obs="${EROOT}var/cache/eix.previous"
-	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
-}
diff --git a/app-portage/eix/eix-0.30.3.ebuild b/app-portage/eix/eix-0.30.3.ebuild
deleted file mode 100644
index bc19acb28bf6..000000000000
--- a/app-portage/eix/eix-0.30.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.30.3.ebuild,v 1.1 2014/08/23 18:58:21 axs Exp $
-
-EAPI=5
-
-PLOCALES="de ru"
-inherit bash-completion-r1 eutils l10n
-
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
-HOMEPAGE="http://github.com/vaeth/eix/"
-SRC_URI="http://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-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 ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
-
-BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${BOTHDEPEND}
-	app-shells/push"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	case " ${REPLACING_VERSIONS}" in
-	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
-		local eixcache="${EROOT}/var/cache/${PN}"
-		test -f "${eixcache}" && rm -f -- "${eixcache}";;
-	esac
-}
-
-src_prepare() {
-	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf
-	epatch_user
-}
-
-src_configure() {
-	econf $(use_with sqlite) $(use_with doc extra-doc) \
-		$(use_enable nls) $(use_enable tools separate-tools) \
-		$(use_enable security) $(use_enable optimization) \
-		$(use_enable strong-security) \
-		$(use_enable strong-optimization) $(use_enable debug debugging) \
-		$(use_enable swap-remote) \
-		$(use_with prefix always-accept-keywords) \
-		$(use_with dep dep-default) \
-		--with-zsh-completion \
-		--with-portage-rootpath="${ROOTPATH}" \
-		--with-eprefix-default="${EPREFIX}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	insinto "/usr/lib/tmpfiles.d"
-	doins tmpfiles.d/eix.conf
-}
-
-pkg_postinst() {
-	test -d "${EROOT}var/cache/${PN}" || {
-		mkdir "${EROOT}var/cache/${PN}"
-		use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
-	}
-	local obs="${EROOT}var/cache/eix.previous"
-	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
-}
-
-pkg_postrm() {
-	[ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
-}
diff --git a/app-portage/epm/epm-1.40.ebuild b/app-portage/epm/epm-1.40.ebuild
index b546bd2a30d5..1a224d05baf0 100644
--- a/app-portage/epm/epm-1.40.ebuild
+++ b/app-portage/epm/epm-1.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-1.40.ebuild,v 1.4 2015/01/25 21:19:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/epm/epm-1.40.ebuild,v 1.5 2015/01/26 09:52:32 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5"
diff --git a/app-portage/overlint/overlint-0.5.3.ebuild b/app-portage/overlint/overlint-0.5.3.ebuild
index 12e0f28f424d..4ca1b999526f 100644
--- a/app-portage/overlint/overlint-0.5.3.ebuild
+++ b/app-portage/overlint/overlint-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/overlint/overlint-0.5.3.ebuild,v 1.4 2015/01/11 21:11:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/overlint/overlint-0.5.3.ebuild,v 1.5 2015/01/26 10:41:55 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.hartwork.org/public/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-apps/portage"
diff --git a/app-text/diction/diction-1.13.ebuild b/app-text/diction/diction-1.13.ebuild
index baff4547d670..813aba85ad9c 100644
--- a/app-text/diction/diction-1.13.ebuild
+++ b/app-text/diction/diction-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.13.ebuild,v 1.4 2015/01/17 13:41:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/diction/diction-1.13.ebuild,v 1.5 2015/01/26 09:58:04 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 hppa ~mips ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild
index a79b4e6832f1..0fa611b49e5b 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild,v 1.7 2015/01/18 08:39:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0-r1.ebuild,v 1.8 2015/01/26 10:05:48 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild b/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild
index d81268abc37f..6da67ed9c6c4 100644
--- a/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild
+++ b/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild,v 1.6 2015/01/18 08:36:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild,v 1.7 2015/01/26 09:42:46 ago Exp $
 
 EAPI=3
 inherit autotools eutils texlive-common
@@ -11,7 +11,7 @@ SRC_URI="http://project.ktug.or.kr/${PN}/snapshot/latest/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND="app-text/libpaper
diff --git a/app-text/html-xml-utils/html-xml-utils-6.8.ebuild b/app-text/html-xml-utils/html-xml-utils-6.8.ebuild
index 7e335534faf7..906fa44dc3f2 100644
--- a/app-text/html-xml-utils/html-xml-utils-6.8.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-6.8.ebuild,v 1.3 2015/01/17 13:44:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-6.8.ebuild,v 1.4 2015/01/26 10:06:05 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/app-text/hunspell/hunspell-1.3.3.ebuild b/app-text/hunspell/hunspell-1.3.3.ebuild
index 4d563fe4044f..688c6619802f 100644
--- a/app-text/hunspell/hunspell-1.3.3.ebuild
+++ b/app-text/hunspell/hunspell-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.3.ebuild,v 1.8 2015/01/02 12:23:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.3.ebuild,v 1.9 2015/01/26 10:03:47 ago Exp $
 
 EAPI=5
 inherit eutils multilib autotools flag-o-matic versionator
@@ -14,7 +14,7 @@ HOMEPAGE="http://hunspell.sourceforge.net/"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses )
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 409b88f3f083..027bf396e583 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,3 +1 @@
-DIST pdftk-1.44-src.zip 1137086 SHA256 d70cb3faf2af849c2bee6c35e4e829277a5090cbb595321f04b59c94d784aa24 SHA512 b19392cb3e28ba6bb8e550df6fbffd05743bb95ffa4e1ac4b3935ef5456f7def275f1177b50e6e6aae45a16d6639ea3b731adee684a37f0445f2a64a9d1cebdf WHIRLPOOL bead1b44b2415aca57d0e35daecee1dab2c0ef2b8c30a651647ace09e82b1f91c26b70df4924662b1d134688a13032653a6d55098803b8a5e67c2b0de08e5ffe
-DIST pdftk-1.45-src.zip 1159411 SHA256 f4e1a50a9ae748dc71883182b797c80c497884fb3071e564361af57354378fcf SHA512 c14b0d411ec26e59bb54b21e10615b4d8e78c0e300f78e46e84ee634b122ded08b3fb45c2b534e60fb45fe3994b782d3b3dbea759da61cef470de89e29689e5c WHIRLPOOL cdfa25cda0167cf4920515689c56813efed821fdcf1599c754fbefacc7968518bc18d7756dc3432cf7f4a23f75c8bbc1dfcf540d93f242082c96cbe1abac3510
 DIST pdftk-2.02-src.zip 2239008 SHA256 118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54 WHIRLPOOL 910ee5f755e7ea46043cece0bd9a6645dc8a503280fd7d86eb2f77d303af0031b5e428cc7222cee23995e6fe5aefd142a610c77ec9969142e841e0f18153e082
diff --git a/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch b/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch
deleted file mode 100644
index f06f9cd677d2..000000000000
--- a/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdftk-1.44-dist/pdftk/Makefile.Base
-+++ pdftk-1.44-dist/pdftk/Makefile.Base
-@@ -44,7 +44,7 @@
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
- 
- pdftk : pdftk.o attachments.o report.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL)
--	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) -o pdftk
-+	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) $(LDFLAGS) -o pdftk
- 
- install:
- 	/usr/bin/install pdftk /usr/local/bin 
diff --git a/app-text/pdftk/files/pdftk-1.44-Makefile.patch b/app-text/pdftk/files/pdftk-1.44-Makefile.patch
deleted file mode 100644
index e551af834eb7..000000000000
--- a/app-text/pdftk/files/pdftk-1.44-Makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- pdftk-1.44-dist/pdftk/Makefile.Debian
-+++ pdftk-1.44-dist/pdftk/Makefile.Debian
-@@ -29,12 +29,11 @@
- # tools
- # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME)
- TOOLPATH=
--export VERSUFF=-4.4
--export CXX= $(TOOLPATH)g++$(VERSUFF)
--export GCJ= $(TOOLPATH)gcj$(VERSUFF)
--export GCJH= $(TOOLPATH)gcjh$(VERSUFF)
--export GJAR= $(TOOLPATH)gjar$(VERSUFF)
--export LIBGCJ= /usr/share/java/libgcj$(VERSUFF).jar
-+export VERSUFF=
-+export CXX= $(TOOLPATH)g++
-+export GCJ= $(TOOLPATH)gcj
-+export GCJH= $(TOOLPATH)gcjh
-+export GJAR= $(TOOLPATH)gjar
- export AR= ar
- export RM= rm
- export ARFLAGS= rs
-@@ -73,7 +72,7 @@
- #  
- export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
- export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
--export GCJFLAGS= -Wall -Wextra -fsource=1.3 -O2
-+export GCJFLAGS= -Wall -fsource=1.3 -O2
- export GCJHFLAGS= -force
- export LDLIBS= -lgcj
- 
diff --git a/app-text/pdftk/files/pdftk-1.45-flags.patch b/app-text/pdftk/files/pdftk-1.45-flags.patch
deleted file mode 100644
index 83bab9ae099e..000000000000
--- a/app-text/pdftk/files/pdftk-1.45-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Based on Debian patch, see http://patch-tracker.debian.org/patch/series/view/pdftk/1.45-1/customise_build_parameters
-
-diff -ruN pdftk-1.45-dist.orig/pdftk/Makefile.Base pdftk-1.45-dist/pdftk/Makefile.Base
---- pdftk-1.45-dist.orig/pdftk/Makefile.Base	2012-12-06 19:57:36.000000000 +0100
-+++ pdftk-1.45-dist/pdftk/Makefile.Base	2013-03-24 18:32:52.669492230 +0100
-@@ -44,7 +44,7 @@
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
- 
- pdftk : pdftk.o attachments.o report.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL)
--	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) -o pdftk
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) -o pdftk
- 
- install:
- 	/usr/bin/install pdftk /usr/local/bin 
-diff -ruN pdftk-1.45-dist.orig/pdftk/Makefile.Debian pdftk-1.45-dist/pdftk/Makefile.Debian
---- pdftk-1.45-dist.orig/pdftk/Makefile.Debian	2012-12-06 19:58:44.000000000 +0100
-+++ pdftk-1.45-dist/pdftk/Makefile.Debian	2013-03-24 18:34:39.034540850 +0100
-@@ -29,7 +29,7 @@
- # tools
- # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME)
- TOOLPATH=
--export VERSUFF=-4.6
-+export VERSUFF=
- export CXX= $(TOOLPATH)g++$(VERSUFF)
- export GCJ= $(TOOLPATH)gcj$(VERSUFF)
- export GCJH= $(TOOLPATH)gcjh$(VERSUFF)
-@@ -71,13 +71,13 @@
- # only effects libraries following option on the command line
- #
- #  
--export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
--export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
--export GCJFLAGS= -Wall -Wextra -fsource=1.3 -O2
--export GCJHFLAGS= -force
-+export CPPFLAGS+= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
-+export CXXFLAGS+= -Wall -Wextra -Weffc++
-+export GCJFLAGS+= -fsource=1.3
-+export GCJHFLAGS+= -force
- export LDLIBS= -lgcj
- 
- include Makefile.Base
- 
- # required packages (xubuntu 12.04)
--# gcj-jdk, g++
-\ Kein Zeilenumbruch am Dateiende.
-+# gcj-jdk, g++
diff --git a/app-text/pdftk/pdftk-1.44.ebuild b/app-text/pdftk/pdftk-1.44.ebuild
deleted file mode 100644
index a184df2d7c78..000000000000
--- a/app-text/pdftk/pdftk-1.44.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.44.ebuild,v 1.5 2012/09/16 20:39:01 chithanh Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A tool for manipulating PDF documents"
-HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
-SRC_URI="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
-DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-dist/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
-}
-
-src_compile() {
-	# java-config settings break compilation by gcj.
-	unset CLASSPATH
-	unset JAVA_HOME
-	# parallel make fails
-	emake -j1 -f "${S}"/Makefile.Debian || die "Compilation failed."
-}
-
-src_install() {
-	dobin pdftk || die
-	doman ../pdftk.1 || die
-	dohtml ../pdftk.1.html || die
-}
diff --git a/app-text/pdftk/pdftk-1.45.ebuild b/app-text/pdftk/pdftk-1.45.ebuild
deleted file mode 100644
index 856c1ff7a3c3..000000000000
--- a/app-text/pdftk/pdftk-1.45.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.45.ebuild,v 1.2 2013/07/03 16:32:31 ottxor Exp $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A tool for manipulating PDF documents"
-HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
-SRC_URI="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux"
-IUSE=""
-DEPEND="sys-devel/gcc[gcj]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-dist/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch"
-}
-
-src_compile() {
-	# java-config settings break compilation by gcj.
-	unset CLASSPATH
-	unset JAVA_HOME
-	# parallel make fails
-	emake -j1 -f "${S}"/Makefile.Debian || die "Compilation failed."
-}
-
-src_install() {
-	dobin pdftk || die
-	doman ../pdftk.1 || die
-	dohtml ../pdftk.1.html || die
-}
diff --git a/app-text/pdftk/pdftk-2.02.ebuild b/app-text/pdftk/pdftk-2.02.ebuild
index 933b1054beee..1a3add91c9a6 100644
--- a/app-text/pdftk/pdftk-2.02.ebuild
+++ b/app-text/pdftk/pdftk-2.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-2.02.ebuild,v 1.3 2014/12/31 15:53:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-2.02.ebuild,v 1.4 2015/01/26 10:19:34 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux"
 
 DEPEND="sys-devel/gcc[gcj]"
 RDEPEND="${DEPEND}"
diff --git a/app-text/t1utils/t1utils-1.38.ebuild b/app-text/t1utils/t1utils-1.38.ebuild
index d95b910e3767..921b31c32ba6 100644
--- a/app-text/t1utils/t1utils-1.38.ebuild
+++ b/app-text/t1utils/t1utils-1.38.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.38.ebuild,v 1.4 2015/01/22 08:45:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.38.ebuild,v 1.5 2015/01/26 09:37:41 ago Exp $
 
 IUSE=""
 
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
index 7d1c9f6ade4d..20b013b4af9f 100644
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.2.2.ebuild,v 1.6 2015/01/18 08:47:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.2.2.ebuild,v 1.7 2015/01/26 10:36:59 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 
 RDEPEND="
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index b0e08e9e8d7b..04c7ee21712a 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild,v 1.3 2015/01/17 14:04:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild,v 1.4 2015/01/26 10:42:12 ago Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.6.27
diff --git a/app-text/xmlto/xmlto-0.0.26.ebuild b/app-text/xmlto/xmlto-0.0.26.ebuild
index 57e0d11a3865..1f8998742b2a 100644
--- a/app-text/xmlto/xmlto-0.0.26.ebuild
+++ b/app-text/xmlto/xmlto-0.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.26.ebuild,v 1.6 2015/01/18 08:39:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.26.ebuild,v 1.7 2015/01/26 10:06:23 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/dev-db/ctdb/ctdb-1.13-r1.ebuild b/dev-db/ctdb/ctdb-1.13-r1.ebuild
index 15901582bf5c..5a34e0e551b6 100644
--- a/dev-db/ctdb/ctdb-1.13-r1.ebuild
+++ b/dev-db/ctdb/ctdb-1.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13-r1.ebuild,v 1.6 2014/12/27 19:26:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13-r1.ebuild,v 1.7 2015/01/26 10:31:56 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/popt-1.16-r2[${MULTILIB_USEDEP}]"
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
index 743b9b6b1f09..9ff750e5ca07 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild,v 1.2 2015/01/09 13:47:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild,v 1.3 2015/01/26 10:17:44 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="debug doc examples static-libs"
 
 DEPEND="sys-libs/zlib
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.76.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.76.ebuild
deleted file mode 100644
index 118514efeb9f..000000000000
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.76.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.76.ebuild,v 1.4 2014/05/15 13:27:56 jer Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A straightforward implementation of DBM"
-HOMEPAGE="http://fallabs.com/kyotocabinet/"
-SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="debug doc examples static-libs"
-
-DEPEND="sys-libs/zlib
-	app-arch/xz-utils"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_configure-1.2.62.patch"
-	sed -ie "/ldconfig/d" Makefile.in
-	sed -ie "/DOCDIR/d" Makefile.in
-}
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable !static-libs shared) \
-		--enable-lzma --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
-
-	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die "Install failed"
-	fi
-}
-
-src_test() {
-	emake -j1 check || die "Tests failed"
-}
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
deleted file mode 100644
index 07010aee7bde..000000000000
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r2.ebuild,v 1.10 2015/01/06 19:45:14 grknight Exp $
-
-EAPI=2
-WANT_AUTOMAKE="1.4"
-
-inherit eutils autotools
-
-MY_PN="super-smack"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL"
-HOMEPAGE="http://vegan.net/tony/supersmack/"
-SRC_URI="http://vegan.net/tony/supersmack/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql[server] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use !mysql && use !postgres && die "You need to use at least one of USE=mysql or USE=postgres for benchmarking!"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.destdir.patch
-	epatch "${FILESDIR}"/${PN}-1.3.amd64.patch
-	epatch "${FILESDIR}"/${PN}-1.3.gcc4.3.patch
-	epatch "${FILESDIR}"/${PN}-1.3-gen-data.patch
-	eautomake || die "automake failed"
-}
-
-src_configure() {
-	local myconf=""
-	use mysql && myconf="${myconf} --with-mysql"
-	use postgres && myconf="${myconf} --with-pgsql"
-	myconf="${myconf} --with-datadir=/var/tmp/${MY_PN}"
-	myconf="${myconf} --with-smacks-dir=/usr/share/${MY_PN}"
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGES INSTALL MANUAL README TUTORIAL
-}
-
-pkg_postinst() {
-	elog "The gen-data binary is now installed as super-smack-gen-data"
-}
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
index e65ebad7db62..12f789fa211b 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild,v 1.6 2015/01/09 13:43:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.3-r3.ebuild,v 1.7 2015/01/26 10:30:05 ago Exp $
 
 EAPI=5
 WANT_AUTOMAKE="1.13"
@@ -17,7 +17,7 @@ SRC_URI="http://vegan.net/tony/supersmack/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+mysql postgres"
 REQUIRED_USE="|| ( mysql postgres )"
 
diff --git a/dev-db/pgagent/pgagent-3.4.0.ebuild b/dev-db/pgagent/pgagent-3.4.0.ebuild
index 72c0da0472e2..7ec11542c93b 100644
--- a/dev-db/pgagent/pgagent-3.4.0.ebuild
+++ b/dev-db/pgagent/pgagent-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgagent/pgagent-3.4.0.ebuild,v 1.4 2015/01/09 13:48:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgagent/pgagent-3.4.0.ebuild,v 1.5 2015/01/26 10:18:58 ago Exp $
 
 EAPI="5"
 CMAKE_IN_SOURCE_BUILD=1
@@ -8,7 +8,7 @@ inherit cmake-utils eutils wxwidgets
 
 MY_PN=${PN/a/A}
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
 HOMEPAGE="http://www.pgadmin.org/download/pgagent.php"
diff --git a/dev-db/pygresql/pygresql-4.1.1-r1.ebuild b/dev-db/pygresql/pygresql-4.1.1-r1.ebuild
index 964aa5acbd3a..bd74b335cf52 100644
--- a/dev-db/pygresql/pygresql-4.1.1-r1.ebuild
+++ b/dev-db/pygresql/pygresql-4.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.1.1-r1.ebuild,v 1.6 2015/01/13 16:51:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.1.1-r1.ebuild,v 1.7 2015/01/26 10:19:16 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tgz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND="|| (
diff --git a/dev-haskell/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
index 73054737e8d3..c6c685cd7dd6 100644
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ b/dev-haskell/ansi-wl-pprint/Manifest
@@ -1,3 +1,2 @@
-DIST ansi-wl-pprint-0.6.4.tar.gz 13702 SHA256 608ea9c866198c7214b0493e74a4cae227e72da426d0c254c226cec2eafc307f SHA512 32014b5e59e3d5002e30080fc1354fb81183c329e1d0a49016de94c1c59d1dc56002919f3da84d653d4fc9440646bbb8ac9673cf07aea4a02af877fe856e3efd WHIRLPOOL 81781e4433606da9190089aa09651fa91f326a7e6896a754d5e9cc5de18d9906f701b55d185c2365687f86cfd8d22e85a41cebe710df300f58f0ec48ec9b5d4b
 DIST ansi-wl-pprint-0.6.6.tar.gz 13775 SHA256 1eff90ac153f66c42aa6ee10639e3c541194935030672bac8ff2b5cbca8e6bfe SHA512 5bc47ab71a88c0579d4ff06f54616f6418951215db7d42692c55be6855dc7e190eb71b86331319a80ac1a2ad6762294549cf0629cbf2ec2f46c25047d29c9469 WHIRLPOOL ad357f1e77620d554055aad212cb340d76859fdb371bfb0def99f8623fd9123820afef7d3b3dbec11100f2dcaf00dd2631eff2f8b0034bd4f7323f4588819081
 DIST ansi-wl-pprint-0.6.7.1.tar.gz 14862 SHA256 d980c265cacf6d6aa37a24d056e730b678680e07d3ab87210affb415de0ac1af SHA512 e0524f7ba0e6ba3eefc2c04d0186579c70687c65d672e11b09a6b4352ae51f2b30e9c4a4753ca30840d24c82be8f6faa1183c29a2ee154b8c2485e1c01cad546 WHIRLPOOL 570181028a05370b12042b14df869dd8218aa8c6ec17a1a7b13f5e7074128007bc02120193598c7d8338ece8c78b726483746f664a520cc40e4ad2444fe110af
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild
deleted file mode 100644
index e48b77fa9031..000000000000
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild,v 1.7 2012/09/12 15:27:09 qnikst Exp $
-
-# ebuild generated by hackport 0.2.14
-
-EAPI="4"
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
-HOMEPAGE="http://github.com/batterseapower/ansi-wl-pprint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="<dev-haskell/ansi-terminal-0.6[profile?]
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
index 93e291c12488..a389a5aa55f6 100644
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild,v 1.1 2014/02/21 19:37:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild,v 1.2 2015/01/26 13:06:49 qnikst Exp $
 
 EAPI=5
 
@@ -19,10 +19,10 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="example"
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
+	>=dev-haskell/cabal-1.2
 "
 
 src_configure() {
diff --git a/dev-haskell/boxes/Manifest b/dev-haskell/boxes/Manifest
index 24f3b1ccd99b..951c977f0ec8 100644
--- a/dev-haskell/boxes/Manifest
+++ b/dev-haskell/boxes/Manifest
@@ -1 +1 @@
-DIST boxes-0.1.3.tar.gz 5347 SHA256 78fe880778f3ee427b0ab4a4d6e7ddd194e7030d711d9ba491c8d4d3811c2aea SHA512 2a4edbe640c1bca4ebf5af5d029da4b546481e6f8452723d356880f933e3981a2dcfeaf5d2666077f1c582faea5a7f2ada84752b6491fe8f767fe2632da28811 WHIRLPOOL d18272432e56d17f131e547388beae8b9d6d50f78f7b4b8bc42ef8b13bd65d55699aca5022e6586c82ee3684e2f171ebfc478b37a76a9dc850938ddd7b678ba8
+DIST boxes-0.1.4.tar.gz 6481 SHA256 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8 SHA512 b8afb3216208269883f173f57fc0b53be919e5fd171bf2b7d8d5ed2b0af9c3ca4f9005fc4df43ba8ba4ade694d59a83ff0d419cfbd32e54e80ba6fbe748e9524 WHIRLPOOL e6502328e35c84b4d6c7111c1b7437d83b7e887bb7fcb394764c295f4bf490e67728bcc831fb5a9e2f7bb5f7d9ad5d5bf38815ed8dd812f6b998990bae252bf0
diff --git a/dev-haskell/boxes/boxes-0.1.3.ebuild b/dev-haskell/boxes/boxes-0.1.3.ebuild
deleted file mode 100644
index 5f9a02eb8436..000000000000
--- a/dev-haskell/boxes/boxes-0.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/boxes/boxes-0.1.3.ebuild,v 1.1 2014/07/02 03:57:42 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="2D text pretty-printing library"
-HOMEPAGE="http://hackage.haskell.org/package/boxes"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/split-0.2*:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/boxes/boxes-0.1.4.ebuild b/dev-haskell/boxes/boxes-0.1.4.ebuild
new file mode 100644
index 000000000000..923079c04db6
--- /dev/null
+++ b/dev-haskell/boxes/boxes-0.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/boxes/boxes-0.1.4.ebuild,v 1.1 2015/01/26 13:12:23 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="2D text pretty-printing library"
+HOMEPAGE="http://hackage.haskell.org/package/boxes"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.9.2
+	test? ( dev-haskell/quickcheck )
+"
diff --git a/dev-haskell/cabal-install/cabal-install-1.18.0.3-r1.ebuild b/dev-haskell/cabal-install/cabal-install-1.18.0.3-r1.ebuild
index 471bdb19becc..8664260657ba 100644
--- a/dev-haskell/cabal-install/cabal-install-1.18.0.3-r1.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.18.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-1.18.0.3-r1.ebuild,v 1.3 2015/01/22 08:43:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-1.18.0.3-r1.ebuild,v 1.4 2015/01/26 09:56:35 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+noprefs"
 
 RDEPEND=""
diff --git a/dev-haskell/css-text/css-text-0.1.2.1.ebuild b/dev-haskell/css-text/css-text-0.1.2.1.ebuild
index 77a5018d9c5d..7c9fc482f12d 100644
--- a/dev-haskell/css-text/css-text-0.1.2.1.ebuild
+++ b/dev-haskell/css-text/css-text-0.1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/css-text/css-text-0.1.2.1.ebuild,v 1.3 2015/01/22 08:38:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/css-text/css-text-0.1.2.1.ebuild,v 1.4 2015/01/26 09:53:07 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.2.0:=[profile?]
diff --git a/dev-haskell/email-validate/email-validate-2.0.1.ebuild b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
index 611bc41ba221..e9640cfb29cf 100644
--- a/dev-haskell/email-validate/email-validate-2.0.1.ebuild
+++ b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/email-validate/email-validate-2.0.1.ebuild,v 1.2 2015/01/22 08:39:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/email-validate/email-validate-2.0.1.ebuild,v 1.3 2015/01/26 09:53:24 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
index efa4c95c9a5e..ee9c6fd82cd5 100644
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
+++ b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild,v 1.3 2015/01/22 08:46:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild,v 1.4 2015/01/26 09:53:42 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7:=[profile?]
diff --git a/dev-haskell/nats/nats-0.2.ebuild b/dev-haskell/nats/nats-0.2.ebuild
index 9329cb0f2292..ebca12c658d8 100644
--- a/dev-haskell/nats/nats-0.2.ebuild
+++ b/dev-haskell/nats/nats-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/nats/nats-0.2.ebuild,v 1.2 2015/01/22 08:46:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/nats/nats-0.2.ebuild,v 1.3 2015/01/26 09:54:00 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+hashable"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/pem/pem-0.2.2.ebuild b/dev-haskell/pem/pem-0.2.2.ebuild
index c630c69d8954..a1fa6404f137 100644
--- a/dev-haskell/pem/pem-0.2.2.ebuild
+++ b/dev-haskell/pem/pem-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pem/pem-0.2.2.ebuild,v 1.3 2015/01/22 08:46:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pem/pem-0.2.2.ebuild,v 1.4 2015/01/26 09:54:17 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base64-bytestring-1.0.0:=[profile?]
diff --git a/dev-haskell/setenv/setenv-0.1.1.1.ebuild b/dev-haskell/setenv/setenv-0.1.1.1.ebuild
index 9b3d1cbb6dcf..3f213e6bf71e 100644
--- a/dev-haskell/setenv/setenv-0.1.1.1.ebuild
+++ b/dev-haskell/setenv/setenv-0.1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/setenv/setenv-0.1.1.1.ebuild,v 1.2 2015/01/22 08:46:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/setenv/setenv-0.1.1.1.ebuild,v 1.3 2015/01/26 09:54:34 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RESTRICT=test # missing files
diff --git a/dev-haskell/stringable/stringable-0.1.3.ebuild b/dev-haskell/stringable/stringable-0.1.3.ebuild
index 861e3775cba7..b9c514b959c0 100644
--- a/dev-haskell/stringable/stringable-0.1.3.ebuild
+++ b/dev-haskell/stringable/stringable-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/stringable/stringable-0.1.3.ebuild,v 1.2 2015/01/22 08:46:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/stringable/stringable-0.1.3.ebuild,v 1.3 2015/01/26 09:54:51 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?]
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
index 3e78d5de1042..78f2fbe4465b 100644
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
+++ b/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild,v 1.2 2015/01/22 08:46:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild,v 1.3 2015/01/26 09:55:08 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
index 5739bf48f3ef..65f8b084c3f5 100644
--- a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild,v 1.3 2015/01/22 08:46:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild,v 1.4 2015/01/26 09:55:26 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="old-time"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
index 1dcc8e7e9adb..5ab1141cbf4c 100644
--- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild,v 1.4 2015/01/18 08:37:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild,v 1.5 2015/01/26 09:55:43 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/uulib/uulib-0.9.16.ebuild b/dev-haskell/uulib/uulib-0.9.16.ebuild
index 84722b7ba272..1f2b2c186828 100644
--- a/dev-haskell/uulib/uulib-0.9.16.ebuild
+++ b/dev-haskell/uulib/uulib-0.9.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.16.ebuild,v 1.4 2015/01/18 08:37:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.16.ebuild,v 1.5 2015/01/26 09:56:00 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
index ae3d9a950dbc..af4282fb0899 100644
--- a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
+++ b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild,v 1.2 2015/01/09 13:49:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild,v 1.3 2015/01/26 09:56:18 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/zlib-0.5.2.0:=[profile?]
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 8973b64f0ed9..fa857fe2ff98 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -1,4 +1 @@
-DIST ding-libs-0.1.3.tar.gz 526095 SHA256 97c9c02fee77c8467d759dc4fe3a9136cd1349aa7abb29c9af1d36c6fb25e33e SHA512 5bab16cfffcb70162cf9034a8639c59eae0a9b454fa85670eb19b2ec490410534c8119d7c5400095b04c791d4bbc37a20d407473416d8073de0f087a7317d8e2 WHIRLPOOL a60794d781b359c06d4609d34fb259882b166793d30e721dfff14762a30860a8ec03f7874d2e2293b69c69c7472cf8d7d0bce160850efd5accdcb6693e48e2bb
-DIST ding-libs-0.2.91.tar.gz 584390 SHA256 25b186688d62ef6ad1374bb9c71f91e8a13745d7ab52241c5ccdc2d37e286e41 SHA512 e65a7a46927ab07cc9848d61a33888ba204d3b1ba772004e124c3e6f9745ef6a23982729ee6b5c303194759ec4a45f02467d37324ae0023fc97cc47ba9e1f83e WHIRLPOOL c1171609d8f83e5e021b4b0e6c14479a6f2c93084515e69dbe3bdb6a28fb85a5d18983056539b30108b87d82e24e863bdec723b9e29502e462bc507dde3d23be
-DIST ding-libs-0.3.0.1.tar.gz 612258 SHA256 7b3b57b8de9c84ffccc93c452697f445de3d57585df77bba01d26509f811fc26 SHA512 7895870dcb49f605fb872365d7e664790f3d18de5391210dbf31fb87592dc125291a8e95f3e01c7ba2e7f0acc7b4d5c2f01b3e2582a1e588aa51f78a231795b4 WHIRLPOOL 5a3c1138662777d10c8ad57ba429d22a91f3e7dc9d313a1ab7c6b808f1202d01628e9a159d9b50dc8916e3d35805312bb24d884981febe7f475102c11f438885
 DIST ding-libs-0.4.0.tar.gz 827058 SHA256 bdeb90b07ceaa9145e6784ce40a71b69a37fffc7373c51fee258ffffd5390457 SHA512 e062e104f4ad75eea0b59bb113b7a6a4044a42230d96b9b9dda611535835cd0809635b1da1408ae58e97f9ff9a9f4fd48f751365901f9b066b465df3523730a0 WHIRLPOOL 41733ac92c3c7fcaa19f19843a2464a0644632cc345b77fc033910974fa449f91780725302fafadd233c6ef4379174261bbab45e49830e8673a46d9ee3d6f652
diff --git a/dev-libs/ding-libs/ding-libs-0.1.3.ebuild b/dev-libs/ding-libs/ding-libs-0.1.3.ebuild
deleted file mode 100644
index 92d98d6ed929..000000000000
--- a/dev-libs/ding-libs/ding-libs-0.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ding-libs/ding-libs-0.1.3.ebuild,v 1.4 2013/12/01 16:33:22 hwoarang Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Library set needed for build sssd"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="test static-libs"
-
-#Obsolete blocks on old packages, to be removed soon
-RDEPEND="!!dev-libs/libcollection
-	!!dev-libs/libdhash
-	!!dev-libs/libini_config
-	!!dev-libs/libpath_utils
-	!!dev-libs/libref_array"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
diff --git a/dev-libs/ding-libs/ding-libs-0.2.91.ebuild b/dev-libs/ding-libs/ding-libs-0.2.91.ebuild
deleted file mode 100644
index 59533c11118c..000000000000
--- a/dev-libs/ding-libs/ding-libs-0.2.91.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ding-libs/ding-libs-0.2.91.ebuild,v 1.2 2013/12/01 16:33:22 hwoarang Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Library set needed for build sssd"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="test static-libs"
-
-#Obsolete blocks on old packages, to be removed soon
-RDEPEND="!!dev-libs/libcollection
-	!!dev-libs/libdhash
-	!!dev-libs/libini_config
-	!!dev-libs/libpath_utils
-	!!dev-libs/libref_array"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
diff --git a/dev-libs/ding-libs/ding-libs-0.3.0.1.ebuild b/dev-libs/ding-libs/ding-libs-0.3.0.1.ebuild
deleted file mode 100644
index 862862cc4f23..000000000000
--- a/dev-libs/ding-libs/ding-libs-0.3.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ding-libs/ding-libs-0.3.0.1.ebuild,v 1.4 2013/12/01 16:33:22 hwoarang Exp $
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Library set needed for build sssd"
-HOMEPAGE="https://fedorahosted.org/sssd"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="test static-libs"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
diff --git a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
index ba06325ada5f..3e773dfebff0 100644
--- a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ding-libs/ding-libs-0.4.0.ebuild,v 1.2 2015/01/09 13:39:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ding-libs/ding-libs-0.4.0.ebuild,v 1.3 2015/01/26 09:38:54 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
 
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="test static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/grantlee/grantlee-0.4.0.ebuild b/dev-libs/grantlee/grantlee-0.4.0.ebuild
index 6d207fac8647..7a430e316794 100644
--- a/dev-libs/grantlee/grantlee-0.4.0.ebuild
+++ b/dev-libs/grantlee/grantlee-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.4.0.ebuild,v 1.3 2015/01/22 08:39:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.4.0.ebuild,v 1.4 2015/01/26 10:01:04 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/dev-libs/libcgroup/libcgroup-0.41.ebuild b/dev-libs/libcgroup/libcgroup-0.41.ebuild
index d9e62f1b27bf..ea1df020a096 100644
--- a/dev-libs/libcgroup/libcgroup-0.41.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcgroup/libcgroup-0.41.ebuild,v 1.4 2015/01/17 13:45:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcgroup/libcgroup-0.41.ebuild,v 1.5 2015/01/26 10:06:41 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="+daemon debug pam static-libs +tools debug"
 
 RDEPEND="pam? ( virtual/pam )"
diff --git a/dev-libs/liblinear/liblinear-196-r1.ebuild b/dev-libs/liblinear/liblinear-196-r1.ebuild
index b036695e3e0b..d0808a1cbb96 100644
--- a/dev-libs/liblinear/liblinear-196-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-196-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblinear/liblinear-196-r1.ebuild,v 1.6 2015/01/22 18:33:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblinear/liblinear-196-r1.ebuild,v 1.7 2015/01/26 09:58:21 ago Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 src_prepare() {
 	sed -i \
diff --git a/dev-libs/libltdl/libltdl-2.4.4.ebuild b/dev-libs/libltdl/libltdl-2.4.4.ebuild
index 4d388f2bc826..1b9a5f01f392 100644
--- a/dev-libs/libltdl/libltdl-2.4.4.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libltdl/libltdl-2.4.4.ebuild,v 1.5 2015/01/22 18:35:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libltdl/libltdl-2.4.4.ebuild,v 1.6 2015/01/26 09:40:30 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/libtool/${MY_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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
index 88ea2f3c298c..28a4eef1b607 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/libmemcached-1.0.18.ebuild,v 1.7 2015/01/01 11:23:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmemcached/libmemcached-1.0.18.ebuild,v 1.8 2015/01/26 10:29:47 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 5bf0f59b47f8..26d725bd5a6e 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r7.ebuild,v 1.6 2015/01/18 08:40:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r7.ebuild,v 1.7 2015/01/26 10:06:59 ago Exp $
 
 EAPI=5
 inherit autotools base multilib toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://mixter.void.ru/${P/.}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 S=${WORKDIR}/${PN}-v${PV}
diff --git a/dev-libs/libpipeline/libpipeline-1.4.0.ebuild b/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
index f5a78ab95860..03005e39903a 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpipeline/libpipeline-1.4.0.ebuild,v 1.6 2015/01/18 08:48:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpipeline/libpipeline-1.4.0.ebuild,v 1.7 2015/01/26 10:39:06 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild b/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
index b1e8a896fae3..bdb4dd722972 100644
--- a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
+++ b/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.11.2.ebuild,v 1.3 2015/01/17 13:46:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.11.2.ebuild,v 1.4 2015/01/26 10:07:17 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/libwbxml/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index 860de991e660..8024621df76d 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild,v 1.6 2015/01/18 08:40:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild,v 1.7 2015/01/26 10:07:34 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://github.com/devnev/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/maloc/Manifest b/dev-libs/maloc/Manifest
index 7a5b749f3367..1f18fd0e99fb 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -1,2 +1 @@
-DIST maloc-0.2-1.tar.gz 739622 SHA256 9b29c4b6401adf20ce1ab3c47fe71066ca7952eb10db4b1e6b1440973f616cda SHA512 ffe7d3eb70a87521614da469d61300413d1f86010a369505065dadd9431fc74a9366223f60bf1461444e8c68ede5adebc60167cad4ca54a9860d987de6def5c4 WHIRLPOOL 3a1a36428bfc925caedaf14442e713fb6ba84bb7bf12c67312b57b217833bacc4804c303d6a56a31863eb0fd851d340070f114910543d59c970250bc5a13a461
 DIST maloc-1.5.tar.gz 794138 SHA256 58e1197fcd4c74d3cbb1d39d712eb0a3c5886a1e6629f22c5c78ce2bac983fc0 SHA512 9b50ffc0dd2a9c74808783fdc3bcad9dd6fb4ba0edcdad099eb7ab5e9a1f7d5c708db4b6e2a5373adfabd2a013b1cc4f92281905ef108df3fa6376726ca7a62c WHIRLPOOL 5b25dfc1db28712cb1bb4dbcefcfd5e462d1baa8029db462a8be5fa13baf08756804416c6d32231e5e2d42e5a31184f2a6ca255b860744a8a10a31915900781a
diff --git a/dev-libs/maloc/maloc-0.2.1-r3.ebuild b/dev-libs/maloc/maloc-0.2.1-r3.ebuild
deleted file mode 100644
index f6bef1239953..000000000000
--- a/dev-libs/maloc/maloc-0.2.1-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-0.2.1-r3.ebuild,v 1.4 2010/10/31 14:23:12 jlec Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-MY_PV="0.2-1"
-
-DESCRIPTION="Minimal Abstraction Layer for Object-oriented C/C++ programs"
-HOMEPAGE="http://www.fetk.org/codes/maloc/index.html"
-SRC_URI=" http://cam.ucsd.edu/~mholst/codes/${PN}/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="mpi static-libs"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/readline
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-mpi.patch \
-		"${FILESDIR}"/${PV}-asneeded.patch
-	eautoreconf
-}
-
-src_configure() {
-	use mpi && export CC="mpicc"
-	# fix install location of libs in Makefile
-	sed -e "s|libdir = \${prefix}/lib/\${fetk_cpu_vendor_os}|libdir = \${prefix}/$(get_libdir)/|" \
-		-i src/aaa_lib/Makefile.in || \
-		die "failed to patch lib Makefile"
-
-	econf \
-		$(use_enable mpi) \
-		$(use_enable static-libs static) \
-		--enable-shared
-}
-
-src_install() {
-	# install libs and headers
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# install doc
-	dohtml doc/index.html || die "failed to install html docs"
-}
diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild
index bd03ce7447d9..c8207510680a 100644
--- a/dev-libs/maloc/maloc-1.5-r1.ebuild
+++ b/dev-libs/maloc/maloc-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-1.5-r1.ebuild,v 1.4 2015/01/17 13:57:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/maloc/maloc-1.5-r1.ebuild,v 1.5 2015/01/26 10:32:14 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="doc mpi static-libs"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-libs/readline
diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
index 0248ef54650a..fbaae3632356 100644
--- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
+++ b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.6 2015/01/22 18:34:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.7 2015/01/26 09:37:24 ago Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -17,7 +17,7 @@ SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0/8" # subslot = soname major version
-KEYWORDS="amd64 arm -hppa ~ia64 ~mips -ppc -ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm -hppa ~ia64 ~mips -ppc -ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples java python static-libs vim-syntax"
 
 CDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/pugixml/pugixml-1.4.ebuild b/dev-libs/pugixml/pugixml-1.4.ebuild
index 970888e98e91..49c9691eeaa6 100644
--- a/dev-libs/pugixml/pugixml-1.4.ebuild
+++ b/dev-libs/pugixml/pugixml-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pugixml/pugixml-1.4.ebuild,v 1.4 2015/01/01 11:22:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pugixml/pugixml-1.4.ebuild,v 1.5 2015/01/26 10:29:26 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 S=${WORKDIR}/${P}/scripts
 
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 6b8609acfe5c..95ac116194f6 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1 +1,2 @@
 DIST dose3-3.3-beta2.tar.gz 257564 SHA256 ec73f6ad8da999a90b4c20633c55dac78755018c0128592501f3931396d85abf SHA512 7540b2390f8ef49acdf4ac5c7598e25137b380f4d0b862d75a144a2e12d3f7e24633e8f0e3597f74cd48491f9fa7559dc1664692eb3a840eca26e0f077550db8 WHIRLPOOL 6ad1e502ac85c9e873703f5f11f8291fe24a2bd79f6c659ff7f22d001f37114e8568db915ef6e2b2dd245eaceb3eaa00797d47626577cf33df057762eb727af2
+DIST dose3-3.3.tar.gz 257658 SHA256 8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e SHA512 0decf753f6f4a9fc73ac2cf8eb4b6b464f16cba2fa7f97d8e7c6f37cb63749ee171c3273019a9a9a42141fdb7843a730e5a5dfc0ebba68d4a8d50261165d71be WHIRLPOOL bd2f863a7ffa9fc34c1f4595950441d05984b9d26c3b54067ed24ca4e1e05795f7b1f1c213e8c20a089360c8a50c324f9472f22cb9cbfe4f59fe8e919f370de9
diff --git a/dev-ml/dose3/dose3-3.3.ebuild b/dev-ml/dose3/dose3-3.3.ebuild
new file mode 100644
index 000000000000..aad1ebc6a12a
--- /dev/null
+++ b/dev-ml/dose3/dose3-3.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/dose3/dose3-3.3.ebuild,v 1.1 2015/01/26 13:51:24 aballier Exp $
+
+EAPI=5
+
+MY_P="${P/_beta/-beta}"
+DESCRIPTION="Library and a collection of tools to perform la large spectrum of analysis on package repositories"
+HOMEPAGE="http://dose.gforge.inria.fr/public_html/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/34277/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt +parmap zip bzip2 xml curl rpm4 test"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/cudf:=
+	dev-ml/extlib:=
+	dev-ml/ocaml-re:=
+	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+	parmap? ( dev-ml/parmap:= )
+	zip? ( dev-ml/camlzip:= )
+	bzip2? ( dev-ml/camlbz2:= )
+	>=dev-ml/ocamlgraph-1.8.5:=
+	xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
+	curl? ( dev-ml/ocurl:= )
+	rpm4? ( app-arch/rpm )
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	test? ( dev-python/pyyaml[libyaml] )
+"
+# missing test data
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
+}
+
+src_configure() {
+	econf \
+		$(use ocamlopt || echo "--with-bytecodeonly") \
+		$(use parmap && echo "--with-parmap") \
+		$(use zip && echo "--with-zip") \
+		$(use bzip2 && echo "--with-bz2") \
+		--with-ocamlgraph \
+		$(use xml && echo "--with-xml") \
+		$(use curl && echo "--with-curl") \
+		$(use rpm4 && echo "--with-rpm4")
+}
+
+src_compile() {
+	emake -j1
+}
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 2dcd17e93e8d..9cb89f6803f9 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1 +1,2 @@
 DIST uutf-0.9.3.tbz 31734 SHA256 1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877 SHA512 6fa3592bcb401eb96ffe7d4112ae89a72f0088a3909e087ba04d22544bab0521fadee536b4c01efac040435ffc5f2681567d2291beb90db5c2e56deb4b22c2d6 WHIRLPOOL fbb3500f8a58d6a5f4f8b43e6545b53317995b6de2aee51f688fd6d42b5eaab0d56426e567024a625ec2774603559182e7e54bbd6f1da5c2a69f80cf8f2a5f7e
+DIST uutf-0.9.4.tbz 36987 SHA256 13706722a0037b167eef359bac68d5426d05f64aa308f44c1784aace9577e1b8 SHA512 95203b06e7506f33822f10607315920b849efde3ed2e032bf8dd805f99ce4851b375bc92a1f95403673c97c6176c5a6974af2be611f530db0a7f36296948edf4 WHIRLPOOL a3446da14f665c06dbc9b245baf530c4650fb657baec02de7773cbb5addb2fdb5ddf9a98822a3af3b72b4800affcf2af39e44a6f37f17d221c55bd02b39c4cce
diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml
index 2193d772e351..959de7257d5d 100644
--- a/dev-ml/uutf/metadata.xml
+++ b/dev-ml/uutf/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>ml</herd>
+<use>
+<flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-ml/uutf/uutf-0.9.4.ebuild b/dev-ml/uutf/uutf-0.9.4.ebuild
new file mode 100644
index 000000000000..abce284199ad
--- /dev/null
+++ b/dev-ml/uutf/uutf-0.9.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/uutf/uutf-0.9.4.ebuild,v 1.2 2015/01/26 14:01:18 aballier Exp $
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Non-blocking streaming Unicode codec for OCaml"
+HOMEPAGE="http://erratique.ch/software/uutf"
+SRC_URI="http://erratique.ch/software/uutf/releases/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="utftrip +ocamlopt doc"
+
+RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	utftrip? ( dev-ml/cmdliner:= )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	ocaml pkg/build.ml \
+		native=$(usex ocamlopt true false) \
+		native-dynlink=$(usex ocamlopt true false) \
+		cmdliner=$(usex utftrip true false) \
+		|| die
+}
+
+src_test() {
+	if use ocamlopt ; then
+		ocamlbuild -use-ocamlfind tests.otarget || die
+		cd _build/test || die
+		./test.native || die
+	else
+		ewarn "Sorry, ${PN} tests require native support (ocamlopt)"
+	fi
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+	local nativelibs=""
+	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
+	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
+	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
+	dodoc CHANGES.md README.md
+	use doc && dohtml -r doc/*
+}
diff --git a/dev-ml/xml-light/xml-light-2.2-r3.ebuild b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
index 57addb0bb8de..456ee3f94d78 100644
--- a/dev-ml/xml-light/xml-light-2.2-r3.ebuild
+++ b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/xml-light/xml-light-2.2-r3.ebuild,v 1.2 2015/01/09 13:40:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/xml-light/xml-light-2.2-r3.ebuild,v 1.3 2015/01/26 09:39:12 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
index 5ef2a13f6f32..09c4f58457fe 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild,v 1.5 2015/01/17 13:47:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.450.0.ebuild,v 1.6 2015/01/26 10:13:04 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module multilib
 DESCRIPTION="Look up country by IP Address"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/geoip"
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.967.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.967.0.ebuild
index f37147b6b13f..546c55f1917c 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.967.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.967.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.967.0.ebuild,v 1.6 2015/01/18 08:42:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Socket-SSL/IO-Socket-SSL-1.967.0.ebuild,v 1.7 2015/01/26 10:18:21 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
 
 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"
+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="idn"
 
 DEPEND="
diff --git a/dev-perl/Net-DNS/Net-DNS-0.740.0.ebuild b/dev-perl/Net-DNS/Net-DNS-0.740.0.ebuild
index a31d94c362de..563789c16300 100644
--- a/dev-perl/Net-DNS/Net-DNS-0.740.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-0.740.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-DNS/Net-DNS-0.740.0.ebuild,v 1.6 2015/01/18 08:42:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-DNS/Net-DNS-0.740.0.ebuild,v 1.7 2015/01/26 10:18:39 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module
 DESCRIPTION="Perl Net::DNS - Perl DNS Resolver Module"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="ipv6 test"
 
 RDEPEND="
diff --git a/dev-php/pecl-event/pecl-event-1.11.1.ebuild b/dev-php/pecl-event/pecl-event-1.11.1.ebuild
index acd6eac09efd..43bb7fe731ca 100644
--- a/dev-php/pecl-event/pecl-event-1.11.1.ebuild
+++ b/dev-php/pecl-event/pecl-event-1.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-event/pecl-event-1.11.1.ebuild,v 1.2 2015/01/09 13:43:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-event/pecl-event-1.11.1.ebuild,v 1.3 2015/01/26 10:30:58 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ USE_PHP="php5-4 php5-5 php5-6"
 
 inherit php-ext-pecl-r2 confutils eutils
 
-KEYWORDS="amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
diff --git a/dev-python/apsw/apsw-3.8.5_p1.ebuild b/dev-python/apsw/apsw-3.8.5_p1.ebuild
index c9fe1ca8b7b6..9cc212f4777d 100644
--- a/dev-python/apsw/apsw-3.8.5_p1.ebuild
+++ b/dev-python/apsw/apsw-3.8.5_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.8.5_p1.ebuild,v 1.3 2014/12/27 19:35:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.8.5_p1.ebuild,v 1.4 2015/01/26 10:22:11 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND=">=dev-db/sqlite-${PV%_p*}"
diff --git a/dev-python/argh/argh-0.26.1.ebuild b/dev-python/argh/argh-0.26.1.ebuild
index 1ae9771eccb3..7379770fcf26 100644
--- a/dev-python/argh/argh-0.26.1.ebuild
+++ b/dev-python/argh/argh-0.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.26.1.ebuild,v 1.2 2015/01/22 08:42:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.26.1.ebuild,v 1.3 2015/01/26 10:23:07 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://packages.python.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="LGPL-3"
 IUSE="test"
 
diff --git a/dev-python/authres/authres-0.701.ebuild b/dev-python/authres/authres-0.701.ebuild
index 0da0a38ef82f..8735fb994aba 100644
--- a/dev-python/authres/authres-0.701.ebuild
+++ b/dev-python/authres/authres-0.701.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.701.ebuild,v 1.2 2015/01/22 08:43:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/authres/authres-0.701.ebuild,v 1.3 2015/01/26 10:23:25 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -12,7 +12,7 @@ HOMEPAGE="https://launchpad.net/authentication-results-python http://pypi.python
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/beanstalkc/Manifest b/dev-python/beanstalkc/Manifest
index 462ee9956c88..3bf9c0088d11 100644
--- a/dev-python/beanstalkc/Manifest
+++ b/dev-python/beanstalkc/Manifest
@@ -1,2 +1 @@
-DIST beanstalkc-0.3.0.tar.gz 3849 SHA256 45c3915ed876f80712fcafadee0feaaf0628e5c297e33aaea7f7b229deb80467 SHA512 9b0204d2bb0f43e9db77bf13e230df25ae02032aa228e5a3cdc8cedcf89bbd09b23b88a194a0b9e6370b6e528e5f28dcb613a9cae8851fbdb57bad5a3936cfc4 WHIRLPOOL 4151836b56b7f905946539d8eca3dc7d411fbfc1aa823b2b91e00aa8e9713a42a8d075e2981287d22f823d9eab287fe5f44c4ce068b521a97612f7208bf2a1cc
 DIST beanstalkc-0.4.0.tar.gz 13921 SHA256 98978e57797320146f4b233286d9a02f65d20bad0168424118839fc608085280 SHA512 30485aed4036549c524982bbabe5a27af5fe6f0547175622019b4469fc1fef32d013cbef5e38a1928ab92a3acf6aba9bc7607c3e8e9f2f3c6f65631d39471a7b WHIRLPOOL ca43ca379ed87046f926185d43caeab8f29ffb4388bdc0e6184cf59f98016537e68f8f63188199c895b45d9da39df59cdf34b39372faffbc5499300c5f919a2d
diff --git a/dev-python/beanstalkc/beanstalkc-0.3.0.ebuild b/dev-python/beanstalkc/beanstalkc-0.3.0.ebuild
deleted file mode 100644
index 4ba4eda45bd8..000000000000
--- a/dev-python/beanstalkc/beanstalkc-0.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beanstalkc/beanstalkc-0.3.0.ebuild,v 1.3 2014/03/02 08:05:17 ago Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="A simple beanstalkd client library"
-HOMEPAGE="http://github.com/earl/beanstalkc http://pypi.python.org/pypi/beanstalkc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pyyaml"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="beanstalkc.py"
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
index fd5aa290009f..e2d459ce1536 100644
--- a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
+++ b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild,v 1.3 2015/01/22 08:39:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild,v 1.4 2015/01/26 10:23:42 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index d357bc3b8a19..bfa4e77930a0 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1 @@
-DIST bpython-0.12.tar.gz 130968 SHA256 74a9074c5d5448e09ea9efe6b5305a4f580617d73c38f21eab5fe983312a8ec6 SHA512 001deb068dbc31e592b1c9c524cfbb5061cc9f1abb30d7597472920032285d20632f4ca75a10d4444be947413f9d2d65f476b64a66717956bca7d52b6b7ce948 WHIRLPOOL 15c7b6821af6893a88f91bc25b624af99423324a29bfc97eae5861a83e722cb1e3da478ef1838bb650e836e2b3e51dc90a5cca130bd95e64c3e0d8799af082b2
 DIST bpython-0.13.1.tar.gz 156558 SHA256 ee208a60a54f902a8c827f4a80fda8a6235790d59cc1fc089943df50936accae SHA512 cb3f1e8d8df5eb9978956b3503ef98b1c39e80704792281be7e560ec0d648aefa6d979ab45a642ec369fc252e7fde399013aa1a4154ceb73465bc3d95bea4b19 WHIRLPOOL a5d00b92507d1970de95f20ee54723774432687b1f11637f3aa75f9e8979e93015034f37253bd947100436f8400cdbe2ba523b6517a7ba265950b3f20dc6f9db
-DIST bpython-0.13.tar.gz 153843 SHA256 151cadfa376341c04728c9f1cf54c28528ffa2f9f7e420bcdf517169eb55260a SHA512 72eaa6a5fc9275381e64a96d7bdc72faff5b1bfbe598ee3a7afbd0a149d94084e4d70329b479d8581a3b110cc8031276be0a3bf64a92a4cdf1cde4b8dd606268 WHIRLPOOL 82b920100084443a57d400b8791155cfe01978c62ee5556379e1fd563c2094adeb24473da0eb282ae0b20666d9ca7760a8fa97bb4d4b94f1be646f22a24ccb3b
diff --git a/dev-python/bpython/bpython-0.12.ebuild b/dev-python/bpython/bpython-0.12.ebuild
deleted file mode 100644
index 84b7437332a8..000000000000
--- a/dev-python/bpython/bpython-0.12.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.12.ebuild,v 1.2 2013/04/10 17:18:00 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] *-jython"
-PYTHON_USE_WITH="ncurses"
-
-inherit distutils eutils
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython"
-SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk urwid"
-
-RDEPEND="dev-python/pygments
-	dev-python/setuptools
-	gtk? ( dev-python/pygobject:2 dev-python/pygtk )
-	urwid? ( dev-python/urwid )"
-DEPEND="${RDEPEND}"
-
-DOCS="sample-config sample.theme light.theme"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/${PN}-desktop.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	if use gtk; then
-		# pygobject and pygtk currently don't support Python 3.
-		rm -f "${ED}"usr/bin/bpython-gtk-3.*
-	else
-		rm -f "${ED}"usr/bin/bpython-gtk*
-
-		delete_unneeded_modules() {
-			rm -f "${ED}$(python_get_sitedir)/bpython/gtk_.py"
-		}
-		python_execute_function -q delete_unneeded_modules
-	fi
-	if ! use urwid; then
-		rm -f "${ED}"usr/bin/bpython-urwid*
-
-		delete_urwid() {
-			rm -f "${ED}$(python_get_sitedir)/bpython/urwid.py"
-		}
-		python_execute_function -q delete_urwid
-	fi
-}
diff --git a/dev-python/bpython/bpython-0.13.ebuild b/dev-python/bpython/bpython-0.13.ebuild
deleted file mode 100644
index 8d0d619ca8c5..000000000000
--- a/dev-python/bpython/bpython-0.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.13.ebuild,v 1.4 2014/07/18 13:25:23 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython"
-SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	gtk? ( dev-python/pygobject:2[$(python_gen_usedep python2_7)]
-		dev-python/pygtk[$(python_gen_usedep python2_7)] )
-	dev-python/urwid[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( AUTHORS  CHANGELOG  TODO sample-config sample.theme light.theme )
-
-PATCHES=( "${FILESDIR}"/${PN}-desktop.patch
-		"${FILESDIR}"/${P}-test_repl.patch )
-
-# Req'd for clean build by each impl
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build -b html -c doc/sphinx/source/ \
-			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use gtk; then
-		rm -f "${D}"usr/bin/bpython-gtk*
-		# delete_unneeded_modules() {
-		rm -f "${D}$(python_get_sitedir)/bpython/gtk_.py"
-	fi
-}
-
-python_test() {
-	pushd build/lib > /dev/null
-	# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
-	sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
-
-	"${PYTHON}" -m unittest discover ||
-	popd > /dev/null
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bpython/metadata.xml b/dev-python/bpython/metadata.xml
index 9cfb8bc9a07a..60e38ca23306 100644
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@@ -9,7 +9,4 @@
 	<longdescription>Syntax highlighting and autocompletion
 	  for the python interpreter
 	</longdescription>
-	<use>
-	  <flag name='urwid'>Backend based on <pkg>dev-python/urwid</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 3f7d509bb47a..56dcbb9871d6 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,3 +1 @@
 DIST chardet-2.2.1.tar.gz 180319 SHA256 f1964f73f5ee9b7e0309098b9512d587fbba6dd5d1f3797b1c95529e5241bf09 SHA512 87059b77b14c39fded7f1287f8eeab6a880e21f4b49a3aa103daf537bbb1e237069347e1953ebaa9a393bd4dee01993873c84aad3c00536ae34784686aecfe68 WHIRLPOOL 1cd6838823f8effd502c3049d13966ac0888bdb91b34489caea8666f9802967fe6f86565ed827e609cb614c920cc9f983bdecc27c30bb2abcf4420731a0a620e
-DIST python2-chardet-2.0.1.tgz 177793 SHA256 56fa0c37189b0a5f082d064dec59d69a044aaa3eeb7acb9b3081e2ba306deaa4 SHA512 6f220c10d30457654ceb95ee1c0efdeeadb9bf13d8202f4e578cbd67c4c1ecaf4c8714cce8da1c76c40ce283b66a1e0e8b2a9a0b732df167e53072fce6a1a488 WHIRLPOOL fc3d36ad96405bb658939e2627858c274f8c6bbfcdd10b189b5134118677f99f74ba0a59da8aba1d3b3e2c7bb9d245c18b53ed627a302af04d7a7b4cf436709d
-DIST python3-chardet-2.0.1.tgz 178439 SHA256 2b9a1e6a4e719ae3a3e19ccfe0b88cf2c74f3083c36ecac7451a64428a60a1af SHA512 a5e29b1148f963e791106570427430056e90ce15d7a1ad17fef09d3fbc72bcb0a3ba2fb081b798b19c440a561844d53e3e14dc043b3b2553e1b8e7136d8a25d2 WHIRLPOOL 363fe905378a21f7bf6cb1ce38fc7911956562101c55c291d0093997bf83d117d5f3c1b7cf8e761a6cfce78749d83724c170a3c0fe5ff2130468561624efb7f7
diff --git a/dev-python/chardet/chardet-2.0.1-r1.ebuild b/dev-python/chardet/chardet-2.0.1-r1.ebuild
deleted file mode 100644
index 221d67522e9c..000000000000
--- a/dev-python/chardet/chardet-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chardet/chardet-2.0.1-r1.ebuild,v 1.9 2014/08/10 21:08:18 slyfox Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Character encoding auto-detection in Python"
-HOMEPAGE="http://chardet.feedparser.org/ http://code.google.com/p/chardet/"
-SRC_URI="http://chardet.feedparser.org/download/python2-${P}.tgz
-	http://chardet.feedparser.org/download/python3-${P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-HTML_DOCS=( docs/ )
-
-src_unpack() {
-	# Workaround for bug 459096.
-	mkdir ${P} || die
-	cd ${P} || die
-	unpack ${A}
-}
-
-select_source() {
-	if [[ ${EPYTHON} == python3* ]]; then
-		cd "${S}/python3-${P}" || die
-	else
-		cd "${S}/python2-${P}" || die
-	fi
-}
-
-python_compile() {
-	select_source
-	distutils-r1_python_compile
-}
-
-python_install() {
-	select_source
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	select_source
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chardet/chardet-2.0.1.ebuild b/dev-python/chardet/chardet-2.0.1.ebuild
deleted file mode 100644
index 2d2fa794f692..000000000000
--- a/dev-python/chardet/chardet-2.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/chardet/chardet-2.0.1.ebuild,v 1.10 2014/08/10 21:08:18 slyfox Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-inherit distutils
-
-DESCRIPTION="Character encoding auto-detection in Python"
-HOMEPAGE="http://chardet.feedparser.org/ http://code.google.com/p/chardet/"
-SRC_URI="http://chardet.feedparser.org/download/python2-${P}.tgz
-	http://chardet.feedparser.org/download/python3-${P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	default
-	cp -pr "python3-${P}" "${P}"
-
-	unpacking() {
-		cp -pr "python${PYTHON_ABI:0:1}-${P}" "${S}-${PYTHON_ABI}"
-	}
-	python_execute_function -q unpacking
-}
-
-src_install() {
-	distutils_src_install
-	dohtml -r "${S}/docs/"*
-}
diff --git a/dev-python/colorama/colorama-0.3.2.ebuild b/dev-python/colorama/colorama-0.3.2.ebuild
index a6bc9d9393d9..6ed8378466d1 100644
--- a/dev-python/colorama/colorama-0.3.2.ebuild
+++ b/dev-python/colorama/colorama-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colorama/colorama-0.3.2.ebuild,v 1.2 2015/01/09 13:44:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colorama/colorama-0.3.2.ebuild,v 1.3 2015/01/26 10:20:39 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_install_all() {
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index aa00d4dc4e38..b350def02db6 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,4 +1,3 @@
-DIST decorator-3.3.1.tar.gz 28421 SHA256 2cf1b977a3728cfaf69ce976f3f41c93a01c148c4dd692e6917197ae1211bc1c SHA512 edd24d41d1b626856cea29f2b5fcab402453b4f02bb80707c280cedd41605554c794f6763b35a8ab4144a54bd4a2262051426726fe04e2e0b9bb5e3d45878795 WHIRLPOOL e849b18e3227486e12987ed578cafc8e541937ee63e9938daefabf98ccc779fa8559759e193db8b37041c5e090dcef4c9c293961b0444bbadd5db70fe0a45310
 DIST decorator-3.3.2.tar.gz 28506 SHA256 c878e3c9a4015893fddcc7a145017bd54bd51cda0eb234cab6a20fa02540cb1f SHA512 de1832741cd22ce652bf05df0b4903ce0e17ebbe4ee9539aaf95ae5624c47651f2982d4e351e92775486c50cd25e0b98ba6436bab93accb22f4d100a56e08401 WHIRLPOOL c989a646ab1963a8233a8a3f7fec3dea07ef20f27eb51e13de1e2513144607dd251112d037b091a03232a866dbf75ea81d6855b84f7666f388a7f9320fe208eb
 DIST decorator-3.3.3.tar.gz 28542 SHA256 1c14b2257e860958bc0e95a48d1946d90d5dfbed3e3353d7e1c65aa4cb2a0da2 SHA512 a803df8f3852868838cb17a234f0a5bbfb952f1c3ec65a3ef93f927d325f1366f165327475f9cf9866b0789778fc89078c249638eefbba3202230bb7c33ed5c8 WHIRLPOOL cb7d1def88148ed36b0e6288105f40e957d0f27ca54865804a7d4dfff62d51b416b82d938a4ad19e82e7b8902dcd86d959fee6642462b37c69ca7725bc65a117
 DIST decorator-3.4.0.tar.gz 30333 SHA256 c20b404cbb7ee5cebd506688e0114e3cd76f5ce233805a51f36e1a7988d9d783 SHA512 94ae8ff3bf694b72ad85a04d02ed9b58c42d50341fbc7307a12fc5abcb8042d8f67df80b53e63afd4b692c52fbefec83b80b591cba036deee21e281a5e8ff249 WHIRLPOOL 05b1c59e23ca3ca38cf06a08ae7ef253779c18050445f37a7f926e69456979ab539966e1821a0bd97b63aeef343a89a681a01d0da54182992cdc769c1cdda5b4
diff --git a/dev-python/decorator/decorator-3.3.1.ebuild b/dev-python/decorator/decorator-3.3.1.ebuild
deleted file mode 100644
index 9289b4d29afe..000000000000
--- a/dev-python/decorator/decorator-3.3.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/decorator-3.3.1.ebuild,v 1.8 2012/09/30 17:03:47 armin76 Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_TESTS_RESTRICTED_ABIS="2.4 2.5"
-
-inherit distutils
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="http://pypi.python.org/pypi/decorator http://code.google.com/p/micheles/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-DOCS="README.txt"
-PYTHON_MODNAME="decorator.py"
-
-src_test() {
-	testing() {
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" documentation3.py
-		else
-			PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" documentation.py
-		fi
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 8ef717b99727..034c43437ea0 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,4 +1,2 @@
-DIST dnspython-1.10.0.tar.gz 124416 SHA256 4dc21450ec6ac94dd105b4e5f39a75b404ad45a30869ff73acb6fd4d9974f857 SHA512 17c525f4e31e6759bb14ce3f5a5cba57e075222e291e67fc946d6a80b6ba1a01e72978f70f39d93b13fea83c99658a8bdb5e63c291eae6ff0b64b2b65f7060da WHIRLPOOL 82af503fd716cb53fce8d6b7a3ec641df59f915f450472f5560a26aa7359e9fcb17e3887f9672f84431b679d552d7df9dab4f41224b0d4d40a5f3daaf6902deb
 DIST dnspython-1.11.1.tar.gz 129573 SHA256 c0c6fcf3ff52939e7eadd931282d083271f65cf0a174555a703563a400289768 SHA512 03b2d35ae638a05d1af5458e88ab3450c1bf835a4e704b630474f32b8f93844b625ab2fc0000fdf2490bc90e3ec01f56175be130b5de996546c8bcebe57dfc05 WHIRLPOOL d2ad625278ed519c98d2c5612d1384ac06e65a9e9ab01c646e41a8377306a97cacd88c5e090f14a41f161c6fe3e52222314e8bed638316c07f80d5b035062d1e
 DIST dnspython-1.12.0.tar.gz 135164 SHA256 03fb82af866001c4afa58c48027bcc4b80bbf0a7f27e1d861cf06393eea4724f SHA512 583d069ed7ee9b20f16a964023fa0300f15032c27de6d084205f73394f19a2d5bb1641ef95b08a8ddf1f622eeb5fa8cbfa62b8a2ee478a49b0dff0995e4ae42e WHIRLPOOL abf515aad901b0c752a0f133c293654f60750522cee69985126547602f321f6577e135077cbfa330a30fbc838b125af30b75cbb4f8fdd60d1444b0bd2446bb39
-DIST dnspython-1.9.4.tar.gz 120126 SHA256 ab23f93b8ea33c7b2780d6093344a13c95a371e1d2c22f74ba5d076cc15d1918 SHA512 60b97e612eb567afcf80e7d6995bf28481908f92e53919f77ea56475783eef49997690b4801d8e67a197bf3dcb4c38239db1403640aec7c2a4551e4325b345d0 WHIRLPOOL cfd3c2f2fcd936704d9a6ba5807ee1c7ff47de1c8883e78e6ba4bd294d308e8ea30e5484c43e177b0172c1f59d87e9174891ab62a2cbdc74510a56ecbb505a17
diff --git a/dev-python/dnspython/dnspython-1.10.0-r1.ebuild b/dev-python/dnspython/dnspython-1.10.0-r1.ebuild
deleted file mode 100644
index 56c76652b607..000000000000
--- a/dev-python/dnspython/dnspython-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.10.0-r1.ebuild,v 1.2 2013/09/05 18:46:35 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ http://pypi.python.org/pypi/dnspython"
-SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog README )
-
-python_prepare_all() {
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/../tests &> /dev/null
-	local test
-	for test in *.py; do
-		if ! "${PYTHON}" ${test}; then
-			die "test $test failed under ${EPYTHON}"
-		else
-			einfo "test $test"
-		fi
-	done
-	# make some order out of the output salad
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dnspython/dnspython-1.10.0.ebuild b/dev-python/dnspython/dnspython-1.10.0.ebuild
deleted file mode 100644
index b689e9c9fbda..000000000000
--- a/dev-python/dnspython/dnspython-1.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.10.0.ebuild,v 1.2 2012/12/01 01:59:06 radhermit Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ http://pypi.python.org/pypi/dnspython"
-SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples"
-
-DEPEND="dev-python/pycrypto"
-RDEPEND="${DEPEND}"
-
-DOCS="ChangeLog README"
-PYTHON_MODNAME="dns"
-
-src_test() {
-	cd tests
-
-	testing() {
-		local exit_status="0" test
-		for test in *.py; do
-			echo "Running ${test}..."
-			PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" "${test}" || exit_status="1"
-		done
-		return "${exit_status}"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-1.9.4.ebuild b/dev-python/dnspython/dnspython-1.9.4.ebuild
deleted file mode 100644
index 123acec6863b..000000000000
--- a/dev-python/dnspython/dnspython-1.9.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.9.4.ebuild,v 1.7 2012/12/01 01:59:06 radhermit Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ http://pypi.python.org/pypi/dnspython"
-SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples"
-
-DEPEND="dev-python/pycrypto"
-RDEPEND="${DEPEND}"
-
-DOCS="ChangeLog README TODO"
-PYTHON_MODNAME="dns"
-
-src_test() {
-	cd tests
-
-	testing() {
-		local exit_status="0" test
-		for test in *.py; do
-			echo "Running ${test}..."
-			PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" "${test}" || exit_status="1"
-		done
-		return "${exit_status}"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest
index 566095771060..8b128f381605 100644
--- a/dev-python/drpython/Manifest
+++ b/dev-python/drpython/Manifest
@@ -1,2 +1 @@
-DIST DrPython_3.11.3.zip 636799 SHA256 62672a0a25a60f8efa976b2329108e129c7b1977b1e4975b46607dd61cf80f48 SHA512 92317f2e39738490200980e9a8aff00fa1181b5e5eb042b656ce604db713a240d0e6de72714b5f84dd12a18ca9d7afd246f4f1a2fa38e299a95cf763ae67bb04 WHIRLPOOL 6b95ebff4ade2dce1e4f96543416af6facb669d346f6e4a87daeef15da8abf67017fe7a75fffe542c9b8de366094550814a7a71f3bb29617b59bbfca67644569
 DIST DrPython_3.11.4.zip 824982 SHA256 37a2e4873fb6accd1145f89518db101458c2f43fbc3ea7cf3e2de446bf353f42 SHA512 13943eb28d7155e99e0ffb57903ddde25c964c908ac848f14041c456bc6aa71bab7cad1101e489c09ba5efb5af35e33895a518021bb607f5047844927bcebf2b WHIRLPOOL 56fd68e4abda8f39bbd86060eb397d4bd9360547e26cbca875f8256cadc19efd5de4bedb6d61f116cf63b3cd5167bf0dec9e21bddbbd0d75fdb6c246350ba483
diff --git a/dev-python/drpython/drpython-3.11.3.ebuild b/dev-python/drpython/drpython-3.11.3.ebuild
deleted file mode 100644
index c534a5d82a63..000000000000
--- a/dev-python/drpython/drpython-3.11.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-3.11.3.ebuild,v 1.3 2012/02/24 08:16:19 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
-
-inherit distutils eutils
-
-MY_PN="DrPython"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="A powerful cross-platform IDE for Python"
-HOMEPAGE="http://drpython.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/wxpython-2.6"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${PN}-165-wxversion.patch"
-
-	sed \
-		-e "/'drpython.pyw', 'drpython.lin'/d" \
-		-e "/scripts=\['postinst.py'\],/d" \
-		-i setup.py || die "sed failed"
-	sed -e "s/arguments)c/arguments)/" -i examples/DrScript/SetTerminalArgs.py || die "sed failed"
-}
-
-src_install() {
-	distutils_src_install
-
-	install_drpython_wrapper() {
-		make_wrapper drpython-${PYTHON_ABI} "$(PYTHON -a) $(python_get_sitedir)/${PN}/drpython.py"
-	}
-	python_execute_function -q install_drpython_wrapper
-	python_generate_wrapper_scripts "${ED}usr/bin/drpython"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "DrPython plugins are available on DrPython homepage:"
-	elog "http://sourceforge.net/projects/drpython/files/DrPython%20Plugins/"
-}
diff --git a/dev-python/elementtree/elementtree-1.2.6-r2.ebuild b/dev-python/elementtree/elementtree-1.2.6-r2.ebuild
deleted file mode 100644
index 76f1f889153e..000000000000
--- a/dev-python/elementtree/elementtree-1.2.6-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/elementtree-1.2.6-r2.ebuild,v 1.15 2010/07/08 15:46:20 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_P="${P}-20050316"
-
-DESCRIPTION="A light-weight XML object model for Python"
-HOMEPAGE="http://effbot.org/zone/element-index.htm http://pypi.python.org/pypi/elementtree"
-SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="ElementTree"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="CHANGES"
-
-src_prepare() {
-	distutils_src_prepare
-	sed -e "s/distutils.core/setuptools/" -i setup.py || die "sed failed"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" selftest.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	dohtml docs/*
-}
diff --git a/dev-python/empy/empy-3.3.ebuild b/dev-python/empy/empy-3.3.ebuild
deleted file mode 100644
index a003efe795bc..000000000000
--- a/dev-python/empy/empy-3.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3.ebuild,v 1.13 2010/03/28 17:31:31 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/software/empy/"
-SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="em.py"
-
-src_prepare() {
-	distutils_src_prepare
-	sed -e "s:/usr/local/bin/python:/usr/bin/python:g" -i em.py || die "sed failed"
-}
-
-src_test() {
-	testing() {
-		./test.sh "$(PYTHON)"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	dodir /usr/bin
-
-	create_symlink() {
-		python_convert_shebangs $(python_get_version) "${ED}$(python_get_sitedir)/em.py"
-		fperms 755 "$(python_get_sitedir)/em.py"
-		dosym "$(python_get_sitedir)/em.py" "/usr/bin/em.py-${PYTHON_ABI}"
-	}
-	python_execute_function -q create_symlink
-
-	python_generate_wrapper_scripts "${ED}usr/bin/em.py"
-
-	if use doc; then
-		dodir /usr/share/doc/"${PF}"/examples
-		insinto /usr/share/doc/"${PF}"/examples
-		doins sample.em sample.bench
-		#3.3 has the html in this funny place. Fix in later version:
-		dohtml doc/home/max/projects/empy/doc/em/*
-		dohtml doc/home/max/projects/empy/doc/em.html
-		dohtml doc/index.html
-	fi
-}
diff --git a/dev-python/envoy/Manifest b/dev-python/envoy/Manifest
index 4253f034a9db..867df2629364 100644
--- a/dev-python/envoy/Manifest
+++ b/dev-python/envoy/Manifest
@@ -1,2 +1 @@
-DIST envoy-0.0.2.tar.gz 3347 SHA256 e10aeed89078bb214ff817a189aaf85ab5024025b2e555286872307c9e79b799 SHA512 b13b5499848659322988feb6297e41f3a680f1986f20d741e219319b17b538cd3bdc2c9f060833bf756b4d206b745361a869562d21c9365362f82cd3e14e6901 WHIRLPOOL a240629636fa8906c7b4c1b3c12742922e5ce882644d0dd3d5c7353211ebf7a94ddc386890f0530f96be3fbc4c79a53ebc6c34ed914bdbf267f42d32fb9a3df0
 DIST envoy-0.0.3.tar.gz 4190 SHA256 22b02009cfda2cf2cdb94a75a15ac3fd910aea8685c53e8e03715c7e9d8e8bde SHA512 3af97b95d61f12ef0d8dc71234023a69123667ef26feec9342bda4c3307629728be589be3ac7d118f6cf17aeb6b5ee91c23f37f84c411f117f5e76a5b024a967 WHIRLPOOL fca1eb6de99d90c8c94598bf5524f8ff5e41ab96f5b351e8bcd20cfc729fc8a4f360d744d25f5af4d80dd6b5ad3624a5fb041041268c4ebcf7d5154ccf62db56
diff --git a/dev-python/envoy/envoy-0.0.2-r1.ebuild b/dev-python/envoy/envoy-0.0.2-r1.ebuild
deleted file mode 100644
index 849c8e0b7e7b..000000000000
--- a/dev-python/envoy/envoy-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/envoy/envoy-0.0.2-r1.ebuild,v 1.3 2014/03/31 20:29:46 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy http://pypi.python.org/pypi/envoy"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-# Upstream forgot test_envoy.py in manifest. https://github.com/kennethreitz/envoy/pull/11
-# that was a year ago
-python_prepare_all() {
-	cp -r "${FILESDIR}"/test_envoy.py . || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# and it fails almost all;https://github.com/kennethreitz/envoy/issues/58
-	"${PYTHON}" test_envoy.py
-}
diff --git a/dev-python/envoy/envoy-0.0.2.ebuild b/dev-python/envoy/envoy-0.0.2.ebuild
deleted file mode 100644
index 7a25b5ffe57e..000000000000
--- a/dev-python/envoy/envoy-0.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/envoy/envoy-0.0.2.ebuild,v 1.3 2012/01/15 19:14:25 tove Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy http://pypi.python.org/pypi/envoy"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-# Upstream forgot test_envoy.py in manifest. https://github.com/kennethreitz/envoy/pull/11
-RESTRICT="test"
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test_envoy.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/eunuchs/eunuchs-20050320.1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1.ebuild
deleted file mode 100644
index c11323df22d7..000000000000
--- a/dev-python/eunuchs/eunuchs-20050320.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eunuchs/eunuchs-20050320.1.ebuild,v 1.4 2012/01/06 21:25:55 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Missing manly parts of UNIX API for Python"
-HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs http://pypi.python.org/pypi/python-eunuchs"
-SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}-python-2.5.patch"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" examples/test-socketpair.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index bf42af7b17f0..0ac1127adb9e 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,4 +1,2 @@
-DIST feedgenerator-1.2.1.tar.gz 5555 SHA256 e099309847086ac6092ac498cf0bcc0abf9cdaa037fc3a6d245a03429cbb78e7 SHA512 990bfaa709ce6e78ba338ad0689f263a582a81dc981b3bc4c0334804d5330bac1e0fde2b31d81aca03dbf1b8487ab4a07cb96cca36ca31046c3c5e8d7d282e76 WHIRLPOOL ccf261e72ea725036cf87eee887f4ae489c107b62c4b7854fc1607c92bac67c94122c479611b010e41fc0d3860e98afcc5c70dec83a85e625cdc4fbb5bacbbe1
-DIST feedgenerator-1.5.tar.gz 909738 SHA256 7bc7dae02d5ca37f305311ca1696f2945625b08db70056b35f18727894bc5a3e SHA512 53a4f572135b238d040b245de8d5cb0095277f4c199a5b22cf40d22641f5c3eed7a8bc3a00072bbd71b3914e66a0c6eb842700ed67a737d2e4aeb2b43439c7c5 WHIRLPOOL 8430c331c203a8a89bde4c6c0792428e80faaf0ae2cb1114e7ba67e05a055853eda65efa99ebde8f34c53f6c1308b428b3506723dec5bdb2949420bd22f20368
 DIST feedgenerator-1.6.tar.gz 21517 SHA256 ec66b671a946381e02ee97b5f4746959c4bda960be4994ce39be5a7f5eb445fe SHA512 6b96094209ae206be75909f2ad9a9420a06e1fa47b8a5e28db4da16c5b157014f9f8d1677edc8a7347384fe0f0a91aa4f664257adfa994a46b6dc49d9349472b WHIRLPOOL f334860efbce23b2ab9c3217f035d5f1263cc59ac7434b6be68f62b683d3b765f88f0c1566a1ef34634e167b3746720b6718577e54c47afcadd0676e115e74d5
 DIST feedgenerator-1.7.tar.gz 22155 SHA256 5d6b0b10134ac392be0c0c3a39c0e1d7e9c17cc7894590f75981e3f497a4a60f SHA512 359e584af7766b1a67c752df88ad67f06f9b2a6677d2e858484286b079e33b47192a5cf141fc86eb5590d86175e24d3fa1e87506773c28f6a35b2dc545520044 WHIRLPOOL 0d9d2b22ac0c6b31ae3b53d48e07d9707d83d895ce6b16f59ecf6d03269435d7bd88b9309673de688b09b68a120bd316b6ad51efc7d9cdc3b73882217f2fecb2
diff --git a/dev-python/feedgenerator/feedgenerator-1.2.1.ebuild b/dev-python/feedgenerator/feedgenerator-1.2.1.ebuild
deleted file mode 100644
index f8790d257e17..000000000000
--- a/dev-python/feedgenerator/feedgenerator-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.2.1.ebuild,v 1.1 2012/07/19 07:44:06 djc Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="http://pypi.python.org/pypi/feedgenerator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/feedgenerator/feedgenerator-1.5.ebuild b/dev-python/feedgenerator/feedgenerator-1.5.ebuild
deleted file mode 100644
index 105936b1477e..000000000000
--- a/dev-python/feedgenerator/feedgenerator-1.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedgenerator/feedgenerator-1.5.ebuild,v 1.4 2014/03/31 20:40:25 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-inherit distutils-r1
-
-DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="http://pypi.python.org/pypi/feedgenerator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# Allow pypy to read MANIFEST.in
-	ln -s tests_feedgenerator tests || die
-}
-
-python_test() {
-	"${PYTHON}" setup.py test
-}
diff --git a/dev-python/flup/flup-1.0.2.ebuild b/dev-python/flup/flup-1.0.2.ebuild
deleted file mode 100644
index 945801d1d76a..000000000000
--- a/dev-python/flup/flup-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flup/flup-1.0.2.ebuild,v 1.10 2012/09/22 02:08:12 blueness Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Random assortment of WSGI servers"
-HOMEPAGE="http://trac.saddi.com/flup http://pypi.python.org/pypi/flup"
-SRC_URI="http://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
diff --git a/dev-python/fpconst/fpconst-0.7.3.ebuild b/dev-python/fpconst/fpconst-0.7.3.ebuild
deleted file mode 100644
index 2089e63a6795..000000000000
--- a/dev-python/fpconst/fpconst-0.7.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.7.3.ebuild,v 1.18 2012/05/13 20:17:37 aballier Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
-HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ http://pypi.python.org/pypi/fpconst http://sourceforge.net/projects/rsoap/files/"
-SRC_URI="mirror://sourceforge/rsoap/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="pep-0754.txt"
-PYTHON_MODNAME="fpconst.py"
diff --git a/dev-python/fudge/fudge-0.9.6.ebuild b/dev-python/fudge/fudge-0.9.6.ebuild
deleted file mode 100644
index 9143a61dfa43..000000000000
--- a/dev-python/fudge/fudge-0.9.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fudge/fudge-0.9.6.ebuild,v 1.4 2014/08/10 21:11:27 slyfox Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ http://pypi.python.org/pypi/fudge"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/sphinx )"
-RDEPEND=""
-
-src_prepare() {
-	distutils_src_prepare
-	find -name "._*" -print0 | xargs -0 rm -f
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	testing() {
-		nosetests build-${PYTHON_ABI}/lib
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/fudge/tests"
-	}
-	python_execute_function -q delete_tests
-
-	if use doc; then
-		pushd docs/_build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-}
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 6d071a30c263..01aa62c85bb3 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,2 +1 @@
-DIST Genshi-0.6.tar.gz 433946 SHA256 32aaf76a03f88efa04143bf80700399e6d84eead818fdd19d763fd76af972a4b SHA512 5e19e8cb9078ea587ce1a888bc02108a680a5d30b6b0e36a9280d10bc89142bacaa02532b432ce1c72504fc56d3fca72c5c0537bc98602572cd0f4a90b5f45d7 WHIRLPOOL 263bf8b3a19f3966b504fce200050b56be0b1d816d59f870dead740fb50a06758529ab7140573811201df9d0b56481f2d83a8f1b4bb6b186bc6c15110d905824
 DIST Genshi-0.7.tar.gz 491579 SHA256 1d154402e68bc444a55bcac101f96cb4e59373100cc7a2da07fbf3e5cc5d7352 SHA512 2d0042d4da4566725ddd80b73c5b7be09f479f5529e4aa69903edc2a98905ff6de42a0d5a6f02986d7962deb7740c4a3acf6955a8b77fdb42d3cf4ca037de6bf WHIRLPOOL 5e1a7af061d28a581c8a028ae7343a2b80697eb8bca01c8609345a3f2146db190a596d3488c0bde5aa132ac930d591ff1babd033ccb532c7cac7d2931751f906
diff --git a/dev-python/genshi/genshi-0.6.ebuild b/dev-python/genshi/genshi-0.6.ebuild
deleted file mode 100644
index 467c444213a3..000000000000
--- a/dev-python/genshi/genshi-0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.6.ebuild,v 1.10 2013/12/04 13:25:19 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-# Need call setup.py test manually making this for now redundant
-#DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-MY_P="Genshi-${PV}"
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ http://pypi.python.org/pypi/Genshi"
-SRC_URI="ftp://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cp genshi/filters/tests/html.py orig_html.py || die
-	epatch "${FILESDIR}"/${P}-html_test.patch
-}
-
-src_test() {
-	# The html_test.patch is needed only for python2.7 for now, breaks all other versions. The html.py needs
-	# adjusting only to pass the tests for 2.7. Other ABIs still need the original filters/tests/html.py,
-	# hence this long winded juggling appears the only method to set a viable genshi/filters/tests/html.py
-	# for each python version. The test needed patching, instead they changed the genshi/filters/tests/html.py
-	setHtmlpy() {
-		for f in build-${PYTHON_ABI}; do
-			if [[ ${PYTHON_ABI:2:3} < '7' || ${PYTHON_ABI:4:4} == "pypy" ]]; then
-				mv genshi/filters/tests/html.py patched_html.py || die
-				mv orig_html.py genshi/filters/tests/html.py || die
-				"$(PYTHON)" setup.py test
-				mv genshi/filters/tests/html.py orig_html.py
-				mv patched_html.py genshi/filters/tests/html.py || die
-			else
-				"$(PYTHON)" setup.py test
-			fi
-		done
-	}
-	python_execute_function setHtmlpy
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dodoc doc/*.txt
-		dohtml -r doc/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
index 1e72f1db937e..06fddfc48294 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild,v 1.5 2015/01/22 08:43:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild,v 1.6 2015/01/26 10:23:59 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/greenlet/greenlet-0.4.5.ebuild b/dev-python/greenlet/greenlet-0.4.5.ebuild
index 0c58fddb0b1d..fd3e75aefbea 100644
--- a/dev-python/greenlet/greenlet-0.4.5.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.5.ebuild,v 1.3 2015/01/22 08:43:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/greenlet/greenlet-0.4.5.ebuild,v 1.4 2015/01/26 10:24:17 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/icalendar/icalendar-3.8.4.ebuild b/dev-python/icalendar/icalendar-3.8.4.ebuild
index 2505c4b4519f..94202696440d 100644
--- a/dev-python/icalendar/icalendar-3.8.4.ebuild
+++ b/dev-python/icalendar/icalendar-3.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.8.4.ebuild,v 1.2 2015/01/22 08:43:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-3.8.4.ebuild,v 1.3 2015/01/26 10:24:36 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/i/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="doc test"
 DOCS="README.rst"
 
diff --git a/dev-python/ipy/ipy-0.81.ebuild b/dev-python/ipy/ipy-0.81.ebuild
index 343726d9b452..76d97c22ecd3 100644
--- a/dev-python/ipy/ipy-0.81.ebuild
+++ b/dev-python/ipy/ipy-0.81.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.81.ebuild,v 1.6 2014/12/27 19:24:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipy/ipy-0.81.ebuild,v 1.7 2015/01/26 10:22:29 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/isodate/isodate-0.5.1.ebuild b/dev-python/isodate/isodate-0.5.1.ebuild
index e64dbbb20b5a..cf940f7cd8e6 100644
--- a/dev-python/isodate/isodate-0.5.1.ebuild
+++ b/dev-python/isodate/isodate-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/isodate/isodate-0.5.1.ebuild,v 1.4 2015/01/22 08:41:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/isodate/isodate-0.5.1.ebuild,v 1.5 2015/01/26 10:24:54 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild b/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild
index 076bae671bcc..aeaa5e5fe4e8 100644
--- a/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild
+++ b/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild,v 1.5 2015/01/22 08:43:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kaa-base/kaa-base-0.6.0-r1.ebuild,v 1.6 2015/01/26 10:25:12 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/freevo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="avahi sqlite tls lirc"
 
 DEPEND=">=dev-libs/glib-2.4.0
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 48c5b7693aa3..0ee00eafdb34 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,4 +1,2 @@
-DIST Markdown-2.1.1.tar.gz 242852 SHA256 be6c8cc8163875062b60d759451fec1e55fd3426321b52a6a9077a3f95503864 SHA512 aa20209afc0f8b6bd3f39307b8487ffdf47b2ad017b8c6db70fcb2878c751a007c7f99bc71b1fe8abb7553468997a7b2be69f12211015835b94521a8c8c8657b WHIRLPOOL 2960850130190b0a123187160a0952d4e43f77cde0caddc3cc2142f361798e7c5fafd79c96a4ef03d51c3106db68cbccbffb03c1305f42bc808e63f10fe30b7b
-DIST Markdown-2.3.1.tar.gz 267131 SHA256 ffebd9385717aba00ff4e95b705b7693ddf12a7d483483d441218b6d3f4cf290 SHA512 4ceb0405825fb20f4432134b7904d402b41b1d95c18e10e484a71011a1429ae83804437ed94ce60315fb48664f096a8f5d8d9e0111cab332fe5c978d62d569a6 WHIRLPOOL df7d6b7046949fef03f4e65e996bc086bc0f57272e3b91387dcb2243800cbbba4f3395adb770bd4f89c8466dab26a1fe15ec122bca3dc6e8486e07f9e3b70e9e
 DIST Markdown-2.5.1.tar.gz 288970 SHA256 8f81ed12c18608a502828acb7d318f362c42f4eca97d01e93cadfc52c1e40b73 SHA512 27f0d3909d6aa1e0ae15403da1cdfafcbfd463d7a236e0ea0cf02c55efa8f863c2554d54e20b0d9f58d80502dbf333120431474f16c64883001e5a318866eeb0 WHIRLPOOL 88f76fcb744ad6b8429442de409275c655a85039475d6dab11031a141e148286cc56d7865f590b432bfcf91af4965963989dae9a68a01e6931f367f425f83420
 DIST Markdown-2.5.2.tar.gz 291696 SHA256 284e97e56db9ada03ede9c0ed2870ca6590ce7869f3119104d53510debf1533d SHA512 603853586fa61dec7665a4e5ef21549adb0aa4309b0f67aea804bf749ba76ea94b09b17c24a37e25d409575ee149d3baaaf77c3dd4dcf74793c8106830fae28d WHIRLPOOL 88a21531ffa1d3059c79324d376b55cfafc77ea94330e1a5b0995c8bce14473c76a8a2cb37d52278754f1884126e4ebf78f102064a0bd52f33104b233cf4ea0b
diff --git a/dev-python/markdown/markdown-2.1.1.ebuild b/dev-python/markdown/markdown-2.1.1.ebuild
deleted file mode 100644
index e4e7cc156b6d..000000000000
--- a/dev-python/markdown/markdown-2.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.1.1.ebuild,v 1.7 2012/11/13 14:23:53 ago Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="http://www.freewisdom.org/projects/python-markdown http://pypi.python.org/pypi/Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~ppc-macos ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="test? ( dev-python/nose )"
-RDEPEND="pygments? ( dev-python/pygments )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dodoc docs/[!extensions]*
-		docinto extensions
-		dodoc docs/extensions/*
-	fi
-}
-
-src_test() {
-	testing() {
-		cp -r run-tests.py tests build-${PYTHON_ABI}/ || return
-		cd build-${PYTHON_ABI}
-		if [[ $(python_get_version -l --major) == 3 ]]; then
-			2to3-${PYTHON_ABI} -n -w --no-diffs tests || return
-		fi
-		PYTHONPATH=lib "$(PYTHON)" run-tests.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/markdown/markdown-2.3.1.ebuild b/dev-python/markdown/markdown-2.3.1.ebuild
deleted file mode 100644
index 201606d12454..000000000000
--- a/dev-python/markdown/markdown-2.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.3.1.ebuild,v 1.14 2014/03/31 20:54:31 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="http://www.freewisdom.org/projects/python-markdown http://pypi.python.org/pypi/Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# do not build docs over and over again
-	sed -i -e "/'build':/s:md_build:build:" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( docs/. )
-
-		# templates which we don't want in docdir
-		rm -f docs/*.{html,css,png}
-	fi
-
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}" || die
-
-	if [[ ${EPYTHON} == python3* ]]; then
-		# don't use -n: it causes writes to hardlinked files
-		2to3 -w --no-diffs tests || die
-	fi
-
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index 8d5dde4874e1..f8e476f1dabe 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,3 +1 @@
-DIST MiniMock-1.2.6.tar.gz 10776 SHA256 f26e7d092b0071915e94bdacb018d2579d2758b88a5a66a6b1612e293f71c374 SHA512 05c692d548cbb6917969550ed6812d21f3265a21b80e2a608ee749e545cd3f5b44519c32b90c93a1b2d0431f97f01db66cfed342dcab86c357fba0006043836b WHIRLPOOL 239116dad8471313ab20fb9e202d90fa5caa387da8f2c36e9362d5a95e061e7e40ed1c45a637ba2ec7141867469d58d3d59eee43c6e6690d151e0b5850d72c67
-DIST MiniMock-1.2.7.tar.gz 15118 SHA256 3de5c14b986f984fa3cc113035d8b21b6c29c92d9f8b31cd34d33002e2fbb33b SHA512 b869934c046064c48c85ec90d525e11e441f985ee9e0e33a601df74660430191c4da97d7a96a6ace84292b17078849f99c46330ba69fc087421e4847bb489933 WHIRLPOOL 0a0c68f029b4294fa9e51a34bcbaa91173b0318715ffccef39ed1264ff55a872c00cffbef22c2460363333f0b5e39e8b2e43a8c1d6c945fef7bd1842b29ec3ea
 DIST MiniMock-1.2.8.tar.gz 13217 SHA256 5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c SHA512 91133251a6e6b1acc11e6ac4f24404807134f8a7fca49d5f7365d7fdfc6bdd1527e7382da8d866669408b1ad30331a176026dd31bcb0c3b7367b7f778fc61ca7 WHIRLPOOL 768a73dc82499615ee0d0ce9dd7a3e67253c27908778b0fcd0bf07d562254f48ba95128ced78b7599ccf77cf19bec1c1b85d21a60d251f302825516800bda69e
diff --git a/dev-python/minimock/minimock-1.2.6.ebuild b/dev-python/minimock/minimock-1.2.6.ebuild
deleted file mode 100644
index ada0607d056e..000000000000
--- a/dev-python/minimock/minimock-1.2.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/minimock/minimock-1.2.6.ebuild,v 1.5 2012/02/05 13:43:08 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="MiniMock"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The simplest possible mock library"
-HOMEPAGE="http://pypi.python.org/pypi/MiniMock"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="docs/changelog.rst docs/index.rst"
-PYTHON_MODNAME="minimock.py"
diff --git a/dev-python/minimock/minimock-1.2.7.ebuild b/dev-python/minimock/minimock-1.2.7.ebuild
deleted file mode 100644
index 1b1d1efeedf1..000000000000
--- a/dev-python/minimock/minimock-1.2.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/minimock/minimock-1.2.7.ebuild,v 1.5 2012/06/09 08:19:55 vapier Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="MiniMock"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The simplest possible mock library"
-HOMEPAGE="http://pypi.python.org/pypi/MiniMock"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="docs/changelog.rst docs/index.rst"
-PYTHON_MODNAME="minimock.py"
diff --git a/dev-python/minimock/minimock-1.2.8.ebuild b/dev-python/minimock/minimock-1.2.8.ebuild
deleted file mode 100644
index da0beafbafd1..000000000000
--- a/dev-python/minimock/minimock-1.2.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/minimock/minimock-1.2.8.ebuild,v 1.5 2013/05/20 17:24:14 ago Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="MiniMock"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The simplest possible mock library"
-HOMEPAGE="http://pypi.python.org/pypi/MiniMock"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="docs/changelog.rst docs/index.rst"
-PYTHON_MODNAME="minimock.py"
diff --git a/dev-python/mkpythonproj/Manifest b/dev-python/mkpythonproj/Manifest
index 4be99a0337a5..bac8e8f09982 100644
--- a/dev-python/mkpythonproj/Manifest
+++ b/dev-python/mkpythonproj/Manifest
@@ -1,3 +1 @@
-DIST mkpythonproj-1.7.tar.gz 35372 SHA256 725f3cb3ead276af246eadfccf5e69a75966d87929de2b616933d11a07a08113 SHA512 8c163ea6c3840e17dc460397f9f9080c389ef1f4a447a1fd2df7828ebcd06d4c232230a1f270a402cf7a50d207d1642d66af1aab6189d2d206ba4f59d4179cb6 WHIRLPOOL c3d5598f83510b44b287299535920fd8b491702bf900f6121169b41d4b3342f5d86c89e2ddf6d3f67c47f4f1655c0a9ba2bec551820333d7b858e054b6250396
-DIST mkpythonproj-1.8.tar.gz 34676 SHA256 6593318a2340f651f12313c3a70e2de1ae38b4f55abe6298cb056d8db583af07 SHA512 f942bb829ae0d94bd568cd67ad07779c9c98326e302c299367f9e8ad86ed70260b106fb31528e4142835dfdf0b5f630706840f2222a6725444084c7ed0ea9c12 WHIRLPOOL c474c396ff121af1cc3daf96537a0de47abbcb689ee1920c1ee36fa8c3374f347f1560adad6787026f2fe0d0ae8500abb40f8df54b714227db91605a7772a3b7
 DIST mkpythonproj-1.9.tar.gz 34828 SHA256 c89385ce08b46c81c4dbe1a9f77d2078a80ed49fc2fe11c81baf89f3ad68ead5 SHA512 6ace3a00657ca1e853b882e897ae727eede5f1f5d72f016b439be2d747ea7cf4954aed85032a50549c1a44f88fd98afd727476bef77797fa53c2234e1d22673b WHIRLPOOL 4e9564bc4beb1e23670a8e0d5d81c6f7069342ddc3fe403af906f8a516405886d287b9c550912f76f3d3f9e7d56efa1c131e801e8935a5edacd32d8aeea8b9c6
diff --git a/dev-python/mkpythonproj/files/mkpythonproj_licenses.patch b/dev-python/mkpythonproj/files/mkpythonproj_licenses.patch
deleted file mode 100644
index 1229ca142b2b..000000000000
--- a/dev-python/mkpythonproj/files/mkpythonproj_licenses.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr mkpythonproj-1.7/setup.py mkpythonproj-1.7.orig/setup.py
---- mkpythonproj-1.7/setup.py   2004-11-14 14:44:58.000000000 -0400
-+++ mkpythonproj-1.7.orig/setup.py  2009-07-12 08:20:46.000000000 -0430
-@@ -49,7 +49,7 @@
- 
- scripts=['scripts/mkpythonproj.py']
- py_modules=[]
--packages=['mkproj']
-+packages=['mkproj', 'mkproj/licenses']
- package_dir=[]
- ext_modules=[]
- #   [Extension('my_ext', ['my_ext.c', 'file1.c', 'file2.c'],
-
diff --git a/dev-python/mkpythonproj/mkpythonproj-1.7.ebuild b/dev-python/mkpythonproj/mkpythonproj-1.7.ebuild
deleted file mode 100644
index 2170c9927059..000000000000
--- a/dev-python/mkpythonproj/mkpythonproj-1.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mkpythonproj/mkpythonproj-1.7.ebuild,v 1.4 2014/08/10 21:13:56 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="Creates the framework for a new Python project or script"
-HOMEPAGE="http://www.seanet.com/~hgg9140/comp/mkpythonproj/doc/index.html"
-SRC_URI="http://www.seanet.com/~hgg9140/comp/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_MODNAME="mkproj"
-
-src_prepare(){
-	distutils_src_prepare
-	epatch "${FILESDIR}/${PN}_licenses.patch"
-}
diff --git a/dev-python/mkpythonproj/mkpythonproj-1.8.ebuild b/dev-python/mkpythonproj/mkpythonproj-1.8.ebuild
deleted file mode 100644
index 0998e247c339..000000000000
--- a/dev-python/mkpythonproj/mkpythonproj-1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mkpythonproj/mkpythonproj-1.8.ebuild,v 1.2 2014/08/10 21:13:56 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Creates the framework for a new Python project or script"
-HOMEPAGE="http://www.seanet.com/~hgg9140/comp/mkpythonproj/doc/index.html"
-SRC_URI="http://www.seanet.com/~hgg9140/comp/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-PYTHON_MODNAME="mkproj"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/*html
-	fi
-}
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index d53b8326f17d..2e019356adab 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,5 +1,3 @@
-DIST nltk-2.0.1.tar.gz 949079 SHA256 c69b1e7a2d3e1da8334b3760be55cae4d0a8108b7487bd8a41b4d40f544a29a2 SHA512 8d4e67f77d4f7bc6a7d17109d2f0e4099c6329d56bfd1448674dcf629cbeb49efad00eb88667241c222e4e96f6a5fbd994b820478df82eccdb17fde6154ad345 WHIRLPOOL f3748724e395085eb16b2e9d049ffd08799af8499d8eebdba1b74c6088f464337a7d1d6d659abceec3d8d627ed23496d7ce53f4c4fd5cbb1292ee76def9a530a
-DIST nltk-2.0.1rc1.zip 1095096 SHA256 ab26d1a93b783c26bd234ecaeef250b8a5f35b601810d0b78e24c52e749627e7 SHA512 a3b414349f1ecdc422a6181daac65b904f3654046eb4b6ff41c43a2048c727bb90dd28597b027eafa7c9aa064c17af2140182602ccd81b512a778af44150e5e2 WHIRLPOOL 1a5e02b8f6c4339272865ec8dff14bd495e7e7396e0566a291106c22348a160299d999e5bffa2a1521af0fbee4f5dc33e83d3969b396b6aa40821d3e4692ead3
 DIST nltk-2.0.4.tar.gz 955978 SHA256 a554d6b9c5c7c8b597a090d8848a6f78c6fc4665ae43c9a6a6d6a5b207d98c65 SHA512 1a1923f8819016926ad37337077a87782b1b244eb52c93b0b977946a3549a82b8b0cc4eb886f801d283b6df6f55fa8020db435dae9303371cda1dc1f8c40bc88 WHIRLPOOL b0affed720034261de343c4f7a09cc1a977e695ddeb7cd592d3d7b7c960728025336b8ece5667dda090593498d33d4e64b05b1bd3d8336e0f487d5ff2da82f80
 DIST nltk-2.0b9.zip 1043217 SHA256 bdbe3503f22d0766054d920a0b8d05697dcd576540231c2b6a4949ad5c9281d9 SHA512 5af22190f07a16873a522c41a7ef4ba5130f22d06d623ec85b9fd24c787e41fe3a10c69fb05c41a0c4fa5dd4478ad56ea9f5edeb6cb7e4be475c457e951e9f4e WHIRLPOOL 8c189a60112dd679ed966e179d44dd295ec9c0c96c7628c6eb49ae8a1f02af0f85ca7a7afc3b9a97619db8ff2714b55ff32c2bf11ad030fd76f2b4696782a2e0
 DIST nltk-3.0.0.tar.gz 962855 SHA256 ddfe202ab2d2aa270477f3c9658565d9759bd23be4bb6793cc3e02729e90f039 SHA512 e76c228a457a503af07e6219d60852411be0dfa8865fa408f493fd7012af0479f6b500645a3f3bfdbfaf64285dc8dd9b5f865161f8fe8822fb81662917c78fd6 WHIRLPOOL 1c17ead0578f81baf09019afc539bd8f4d35d1c16e06185222e45ca27eb5362ac46ab0f7cb4135d3250d87a3ed9e56d3f7cd5c823e2f663d75501ded9174febf
diff --git a/dev-python/nltk/nltk-2.0.1.ebuild b/dev-python/nltk/nltk-2.0.1.ebuild
deleted file mode 100644
index 42a20ff651b3..000000000000
--- a/dev-python/nltk/nltk-2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/nltk-2.0.1.ebuild,v 1.2 2012/10/19 04:06:35 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="tk(+) xml(+)"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Natural Language Toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://nltk.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/numpy
-	dev-python/pyyaml"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
diff --git a/dev-python/nltk/nltk-2.0.1_rc1.ebuild b/dev-python/nltk/nltk-2.0.1_rc1.ebuild
deleted file mode 100644
index b62c895a1f10..000000000000
--- a/dev-python/nltk/nltk-2.0.1_rc1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/nltk-2.0.1_rc1.ebuild,v 1.4 2012/02/25 16:25:58 patrick Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit distutils
-
-MY_P=${P/_rc/rc}
-DESCRIPTION="Natural Language Toolkit"
-SRC_URI="http://nltk.googlecode.com/files/${MY_P}.zip"
-HOMEPAGE="http://nltk.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/numpy
-	dev-python/pyyaml"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/nose-exclude/nose-exclude-0.2.0.ebuild b/dev-python/nose-exclude/nose-exclude-0.2.0.ebuild
index f27a35d3eb07..dab94014ed85 100644
--- a/dev-python/nose-exclude/nose-exclude-0.2.0.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-exclude/nose-exclude-0.2.0.ebuild,v 1.3 2015/01/09 13:44:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-exclude/nose-exclude-0.2.0.ebuild,v 1.4 2015/01/26 10:20:57 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
index 0f8e2d0fe605..e4a25d40fcbb 100644
--- a/dev-python/nosexcover/Manifest
+++ b/dev-python/nosexcover/Manifest
@@ -1,3 +1 @@
 DIST nosexcover-1.0.10.tar.gz 2744 SHA256 f5b3a7c936c4f703f15418c1f325775098184b69fa572f868edb8a99f8f144a8 SHA512 dbc3bc3379676d56711c96a4cf2d6b46ee77b5b04ac6a5fb2d58fee780ee547664738b9c6b248e3af64b3d0b7e6c9b44310c8e7025551df543c547da4239f52a WHIRLPOOL a7549547b9423ff32977dfea4dfd7babce05e637a3379b3b7e2d63c711608214ddd0495a09f5e7b5ef9560d46f82ef1727ec75e47f96a95245b0c0148093b4ad
-DIST nosexcover-1.0.7.tar.gz 2389 SHA256 2284c504e7ca9c5e36e5777f354b9224dff1f68d52f63aba62a0d50a241a824b SHA512 5f9934b3ab636e16edceec9f6b1a1558aca56934053474f3e0ef1bb557a5489756b3e764452840189a8c971fbab7e0a2f3d298c0b999d67ce280885486ea779d WHIRLPOOL 49124645a4232c8fc157460065e8ed4fc26dadb0e7de67cb3534c3c0e3cb6935ce467ec68b2215c787174bb70f9925e8590c05b21b44a815b0624a765b09e3f9
-DIST nosexcover-1.0.8.tar.gz 2463 SHA256 060d93ec8d5c302d6873866e3102af76ae2520b2e3b141fa6d610ff02b458ad4 SHA512 27b821bf56ab436276a2010972027510377fcfbc394b7cf759d0ba23039f0dcbf01e16e77a0d0cd1911ce2b86cce882a0e4334317286763986e38e8e786c29d2 WHIRLPOOL 76702f330fb0cc49ffbab650fb71bacfbfcb939afc382186c0bfdfc9312e087e4f4624be94ed9c8b105c7bda1acab9ad46c23c7b9a6cdc9c97d8360ef3e67ca3
diff --git a/dev-python/nosexcover/nosexcover-1.0.10.ebuild b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
index 4bdb2d858842..13366f1b52b7 100644
--- a/dev-python/nosexcover/nosexcover-1.0.10.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.10.ebuild,v 1.2 2015/01/09 13:44:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.10.ebuild,v 1.3 2015/01/26 10:25:30 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild
deleted file mode 100644
index e24b556b37ea..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.7-r1.ebuild,v 1.3 2014/03/31 21:22:04 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/nosexcover/nosexcover-1.0.7.ebuild b/dev-python/nosexcover/nosexcover-1.0.7.ebuild
deleted file mode 100644
index a907ad2f5930..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.7.ebuild,v 1.2 2013/01/02 20:02:05 prometheanfire Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools
-		dev-python/nose
-		dev-python/coverage"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/nosexcover/nosexcover-1.0.8.ebuild b/dev-python/nosexcover/nosexcover-1.0.8.ebuild
deleted file mode 100644
index 14f8ddea9437..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nosexcover/nosexcover-1.0.8.ebuild,v 1.4 2014/03/31 21:22:04 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/notify-python/notify-python-0.1.1-r2.ebuild b/dev-python/notify-python/notify-python-0.1.1-r2.ebuild
deleted file mode 100644
index cafd6e247c64..000000000000
--- a/dev-python/notify-python/notify-python-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/notify-python/notify-python-0.1.1-r2.ebuild,v 1.11 2012/08/13 06:50:04 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* 2.5-jython"
-
-inherit eutils python
-
-DESCRIPTION="Python bindings for libnotify"
-HOMEPAGE="http://www.galago-project.org/"
-SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="examples"
-
-RDEPEND=">=dev-python/pygtk-2.24:2
-	>=x11-libs/libnotify-0.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	# Disable byte-compilation.
-	rm -f py-compile
-	ln -s $(type -P true) py-compile
-
-	# Remove the old pynotify.c to ensure it's properly regenerated #212128.
-	rm -f src/pynotify.c
-
-	python_src_prepare
-}
-
-src_install() {
-	python_src_install
-	python_clean_installation_image
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# Requested from bug 351879.
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins tests/*.{png,py}
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize gtk-2.0/pynotify
-}
-
-pkg_postrm() {
-	python_mod_cleanup gtk-2.0/pynotify
-}
diff --git a/dev-python/optcomplete/optcomplete-1.2.ebuild b/dev-python/optcomplete/optcomplete-1.2.ebuild
deleted file mode 100644
index 5a9207d3ddd3..000000000000
--- a/dev-python/optcomplete/optcomplete-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/optcomplete/optcomplete-1.2.ebuild,v 1.9 2012/05/15 16:24:51 darkside Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Shell completion self-generator for Python"
-HOMEPAGE="http://furius.ca/optcomplete/ http://pypi.python.org/pypi/optcomplete"
-SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="CHANGES"
-PYTHON_MODNAME="optcomplete.py"
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins bin/* || die "doins failed"
-	fi
-}
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index 99d9f25ef7ee..19de82323369 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,2 +1 @@
 DIST pathlib-1.0.1.tar.gz 49298 SHA256 6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b WHIRLPOOL 3cb4b7c11e5cd0f3c942ffdd4478999c021a2c8167b586c99fea467bb145a71a51350d61be727f85ae63539d6407fe920cd07cacea654c3002cadf48e52e972a
-DIST pathlib-1.0.tar.gz 49113 SHA256 306314b3786f4c534d0cf618cb0d3ca8f1f16a69db399d21c0571ce2661e20f6 SHA512 14b475d0daa3b2debf919ee8df052ebff3995a0003d373402c773ddb1131233210561f731ed92b90259b77b40589286f8750647edc59c59ef4d48aeb48198444 WHIRLPOOL 6acadfa112475544d078ef1481ddbeb5fafc8495f5b150808d28f61a329bdbea5b860fbe19df769fe574a68bc86d071ce1eff0f51adb79a8a5403e41e7e3d812
diff --git a/dev-python/pathlib/pathlib-1.0.1.ebuild b/dev-python/pathlib/pathlib-1.0.1.ebuild
index c9085207bdc0..248389fbea30 100644
--- a/dev-python/pathlib/pathlib-1.0.1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pathlib/pathlib-1.0.1.ebuild,v 1.3 2015/01/22 08:43:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pathlib/pathlib-1.0.1.ebuild,v 1.4 2015/01/26 10:25:48 ago Exp $
 
 EAPI=5
 
@@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-python/pathlib/pathlib-1.0.ebuild b/dev-python/pathlib/pathlib-1.0.ebuild
deleted file mode 100644
index 102fd69f457d..000000000000
--- a/dev-python/pathlib/pathlib-1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pathlib/pathlib-1.0.ebuild,v 1.3 2014/09/12 16:56:51 nimiux Exp $
-
-EAPI=5
-
-# In Python 3.4, pathlib is now part of the standard library.
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="Object-oriented filesystem paths"
-HOMEPAGE="https://pathlib.readthedocs.org/"
-SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/pp/Manifest b/dev-python/pp/Manifest
index ba7b1beff698..15fe775c4675 100644
--- a/dev-python/pp/Manifest
+++ b/dev-python/pp/Manifest
@@ -1,4 +1 @@
-DIST pp-1.6.1.tar.bz2 22974 SHA256 4926ad51a9b21753672f71883441287ff3a1a66fc9d6ee0f0e357b8652b3cb98 SHA512 e439dc6e11d15025c69117ae33ed5dbb95a15778d9abd4d35a1c3d98bd48dd260698a86e262f6f25261accb5e0d1ea5a83677fb3450d60396fb3af68e177a3ee WHIRLPOOL 9a6004a49a6168426e6fbe1981cf9f032afe0b74eaba51d3af3429d6c65301ea4e092cc9a664cf3ff7a05465b73cf4f1ce9ee9c7c46b149aba1287e85d8b18dc
-DIST pp-1.6.2.tar.bz2 25736 SHA256 5b5a43b830e36add9f14fe10f6618c2aaa7636151f135b7f9023ecdb8f06b03b SHA512 52e90342473783bc8ef8126484afb45cb1cfa43f9b58824c3537d798c58c6abb3764c32700d411fb8f894912dfdcb83c6004ab13c83a55d9d08f25126625124c WHIRLPOOL 51c1d85afaba75a36600a6db1eeba8c62f660bc16be5e1bd12494c0d1df495ee83063159be72684e4b22648c67d4ad15c70656de375745abfab351d4f34ca5cc
-DIST pp-1.6.3.tar.bz2 27144 SHA256 9fd3ad3e5b16f5ae8085c1a49d5219deb418a2a63cf9ee8ccdc7f1367de168cd SHA512 76584d84e927613f204a012130b26e956291c8a37967e7e938fd2812cbc29b14eb99006b584618e635487f3d689739c4e11aea09b5ce6b57760f4df11e8a2dcf WHIRLPOOL 85ccac32aeca9d8c6bb2f1e1586d8c74748d05caa520b59dedf92ec59d8a9e1fdfbae8a482ba240702fe46130f154c41b255fc83e7d7a5065556bfb422f67ccd
 DIST pp-1.6.4.tar.bz2 27166 SHA256 7f932d8eff4b35357bf5b48c1abd7734a955c98a50138c13b7b9eb36aadaf408 SHA512 213322aaa60e1485b855e96336a01c45407185892dede693c013a200554656ce08799ee23ee4a0cf628b382b98e0519445c99dbb89f209b1b907ac0a1fc8147e WHIRLPOOL fce8fe3ceaeb9e1d4133734107924faec6bcc5b4d862a37629443d0ec1774504956271dfa1af7de8dd2c06012e488e99dbe1220705fe3f4ae7c8cc8f721211da
diff --git a/dev-python/pp/pp-1.6.1.ebuild b/dev-python/pp/pp-1.6.1.ebuild
deleted file mode 100644
index 4fbe78a3b9e4..000000000000
--- a/dev-python/pp/pp-1.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pp/pp-1.6.1.ebuild,v 1.1 2011/07/29 21:39:26 bicatali Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Parallel and distributed programming for Python"
-HOMEPAGE="http://www.parallelpython.com/"
-SRC_URI="http://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="pp.py ppauto.py pptransport.py ppworker.py"
-
-src_install() {
-	distutils_src_install
-
-	doman doc/ppserver.1
-	use doc && dohtml doc/ppdoc.html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples"
-	fi
-}
diff --git a/dev-python/pp/pp-1.6.2.ebuild b/dev-python/pp/pp-1.6.2.ebuild
deleted file mode 100644
index e7f2af76bed0..000000000000
--- a/dev-python/pp/pp-1.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pp/pp-1.6.2.ebuild,v 1.1 2012/06/28 06:46:52 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Parallel and distributed programming for Python"
-HOMEPAGE="http://www.parallelpython.com/"
-SRC_URI="http://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="pp.py ppauto.py pptransport.py ppworker.py"
-
-src_install() {
-	distutils_src_install
-
-	doman doc/ppserver.1
-	use doc && dohtml doc/ppdoc.html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples"
-	fi
-}
diff --git a/dev-python/pp/pp-1.6.3.ebuild b/dev-python/pp/pp-1.6.3.ebuild
deleted file mode 100644
index ad70c4cdebe0..000000000000
--- a/dev-python/pp/pp-1.6.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pp/pp-1.6.3.ebuild,v 1.1 2013/01/11 07:32:32 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Parallel and distributed programming for Python"
-HOMEPAGE="http://www.parallelpython.com/"
-SRC_URI="http://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="pp.py ppauto.py pptransport.py ppworker.py"
-
-src_install() {
-	distutils_src_install
-
-	doman doc/ppserver.1
-	use doc && dohtml doc/ppdoc.html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples"
-	fi
-}
diff --git a/dev-python/pp/pp-1.6.4.ebuild b/dev-python/pp/pp-1.6.4.ebuild
deleted file mode 100644
index 8bfec958d1b3..000000000000
--- a/dev-python/pp/pp-1.6.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pp/pp-1.6.4.ebuild,v 1.1 2013/03/11 06:59:45 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Parallel and distributed programming for Python"
-HOMEPAGE="http://www.parallelpython.com/"
-SRC_URI="http://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="pp.py ppauto.py pptransport.py ppworker.py"
-
-src_install() {
-	distutils_src_install
-
-	doman doc/ppserver.1
-	use doc && dohtml doc/ppdoc.html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples"
-	fi
-}
diff --git a/dev-python/progressbar/progressbar-2.3.ebuild b/dev-python/progressbar/progressbar-2.3.ebuild
deleted file mode 100644
index 1d8091910604..000000000000
--- a/dev-python/progressbar/progressbar-2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/progressbar/progressbar-2.3.ebuild,v 1.8 2012/10/17 06:27:19 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 3.3"
-
-inherit distutils
-
-DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="http://code.google.com/p/python-progressbar/ http://pypi.python.org/pypi/progressbar"
-SRC_URI="http://python-${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-src_install() {
-	distutils_src_install
-	dodoc README.txt || die "dodoc failed"
-
-	if use examples ; then
-		exeinto /usr/share/doc/${PF}/examples
-		doexe examples.py
-	fi
-}
diff --git a/dev-python/py-notify/Manifest b/dev-python/py-notify/Manifest
index c02897ef9b65..40ec394daf52 100644
--- a/dev-python/py-notify/Manifest
+++ b/dev-python/py-notify/Manifest
@@ -1,2 +1 @@
-DIST py-notify-0.2.1.tar.gz 143167 SHA256 160c3244c2699203d12cada7af27ed0a1d4e40026215c22e6dae0cb34bb43100 SHA512 61346cca5a6d12f679e40bb385a7c4a520152d313d4ac63b1921d6389bc5af143a768ed26453a2a308aead8df1a5fd1d3dbd409feb3c0ca70a80a5a6bb555e57 WHIRLPOOL acb3add93c7d34af2ecf47fd0a83925643bbaa2d5148c30a139ae198786bf0f9188cecf27e60cd740ad321a7f04ee891fdd1ee49e7a76c8e044c030465b86368
 DIST py-notify-0.3.1.tar.gz 144954 SHA256 91f4fd2822403b96037608c0a05e814890edd17601570ae3e96359877320193c SHA512 16d874e6e265edabffe2200484566823251a0a395e979657829a7facc419ec6e21589f97f1675556b48c67ab6b93ded7325d57c8de29a4216211a8c37a3d9075 WHIRLPOOL aedc39f7d71fd08ad83bd90b73a6b28b9253e3f383bc1d146c8d2b5562899a5cd08037c00df8164645acf078ad241c55c89e9753690948c6602dad7d26835b87
diff --git a/dev-python/py-notify/py-notify-0.2.1.ebuild b/dev-python/py-notify/py-notify-0.2.1.ebuild
deleted file mode 100644
index 332c0fb15122..000000000000
--- a/dev-python/py-notify/py-notify-0.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-notify/py-notify-0.2.1.ebuild,v 1.2 2012/02/21 08:43:46 patrick Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit python distutils
-
-DESCRIPTION="Tools for implementing the Observer programming pattern in Python"
-HOMEPAGE="http://home.gna.org/py-notify"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-python/py-notify/py-notify-0.3.1-r1.ebuild b/dev-python/py-notify/py-notify-0.3.1-r1.ebuild
index 8751141f5c0a..c78d5d26e6fb 100644
--- a/dev-python/py-notify/py-notify-0.3.1-r1.ebuild
+++ b/dev-python/py-notify/py-notify-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-notify/py-notify-0.3.1-r1.ebuild,v 1.2 2015/01/22 08:46:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-notify/py-notify-0.3.1-r1.ebuild,v 1.3 2015/01/26 10:28:49 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples test"
 
 python_test() {
diff --git a/dev-python/pyPdf/pyPdf-1.13.ebuild b/dev-python/pyPdf/pyPdf-1.13.ebuild
deleted file mode 100644
index 27a103ae9b37..000000000000
--- a/dev-python/pyPdf/pyPdf-1.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyPdf/pyPdf-1.13.ebuild,v 1.3 2011/01/11 15:36:25 phajdan.jr Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="http://pybrary.net/pyPdf/ http://pypi.python.org/pypi/pyPdf"
-SRC_URI="http://pybrary.net/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index fa681d33b933..6bf901647e5c 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,2 +1 @@
-DIST pyamg-2.0.5.tar.gz 1384132 SHA256 af00ffa8926c025715f4658250755ff227ce8b3a76255be04221120b8b7439e2 SHA512 d09797b519db35c9115db2d558f27cf5d087f20d26c4c0288228fd40f0b5f42c2749579ecd4000cb444aa169e79734a7876a031dfcb2a827de80a7490681d960 WHIRLPOOL db6b3453831b4937a1264db97db53a3a22b72aa936e50089309674db45508653798ce67f9864c325fc27037f8cee2a50cf8a203053ad35cbd5f00bfbcc4d14fe
 DIST pyamg-2.1.0.tar.gz 752632 SHA256 060a32ea8805b8e49e6d7304ab771efccd34d5e363a65f4f2cb33d85981225de SHA512 d2574ccb093e6c5bd214c4366ec70bfeae73449f98932a9a4435afb2d606b12a4d479411a88bcac4df500e33dbf635ae981620c584e688abc3f2cca6c6188d4d WHIRLPOOL ccf0817561eae43bb859aaedc9c7b4c94e338a2fc6817467bb5f162df3e63720030d3e36d55e72e9f7e613aab89cf4211f9c20fc97d566e3d7cdec988c9d9f6f
diff --git a/dev-python/pyamg/pyamg-2.0.5.ebuild b/dev-python/pyamg/pyamg-2.0.5.ebuild
deleted file mode 100644
index 4a3eb82600ca..000000000000
--- a/dev-python/pyamg/pyamg-2.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyamg/pyamg-2.0.5.ebuild,v 1.2 2013/09/05 18:46:40 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="http://code.google.com/p/pyamg/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RESTRICT="test" # quite buggy
-
-RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}"
-
-python_compile_all() {
-	if use doc; then
-		cd "${S}/Docs"
-		PYTHONPATH="${BUILD_DIR}"/lib emake html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Docs/build/html/* )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pychecker/Manifest b/dev-python/pychecker/Manifest
index cebfdf40e813..e5f47a04f548 100644
--- a/dev-python/pychecker/Manifest
+++ b/dev-python/pychecker/Manifest
@@ -1,2 +1 @@
-DIST pychecker-0.8.18.tar.gz 145784 SHA256 6495fe464659b175cefce20b187de6904b97b065fd609445b932d9c49a75a024 SHA512 10feb650023c030bd585808413bb45e70317b84a2c5baac92ce87b7f8e269e10147ceb43cc2a8ff8b7bd90b7b0c46dc78110e59d3ee916efc6ab6a833c656876 WHIRLPOOL b399e859960ce32da90da344cac3bb473105645495a6f58d8d7181fbdbc81f46e2d8beef43507aa75eb1aa370eb33fbdb409feaf193f1ea5aa88b3e5c7b755e0
 DIST pychecker-0.8.19.tar.gz 99783 SHA256 44fb26668f74aca3738f02d072813762a37ce1242f50dbff573720fa2e953279 SHA512 50f3d87a0ea80235761eb0ff078dc7e815848c356cea2bdf12bb699edc6d3301252acebaf6ab6aa961849d740dc38bc9b6deb7cfe956e7fff83a104750adfa18 WHIRLPOOL 1bf382babfed78a4dbe2805ce3d2c1c0acf38a3f5dc1638c2788d77a3825a1c34714b1a7c256221fec2a1d21cf16d12ecb95f6c3875fcadddcae8044bdb4b292
diff --git a/dev-python/pychecker/pychecker-0.8.18.ebuild b/dev-python/pychecker/pychecker-0.8.18.ebuild
deleted file mode 100644
index 2f6230938036..000000000000
--- a/dev-python/pychecker/pychecker-0.8.18.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.18.ebuild,v 1.10 2012/01/26 13:46:47 ssuominen Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Tool for finding common bugs in python source code"
-SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
-HOMEPAGE="http://pychecker.sourceforge.net/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="pychecker pychecker2"
-DOCS="pycheckrc"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/pychecker-0.8.17-no-data-files.patch
-	epatch "${FILESDIR}"/pychecker-0.8.18-pychecker2.patch
-	sed -e 's:root = self\.distribution\.get_command_obj("install")\.root:&\.rstrip("/"):' -i setup.py || die "sed setup.py failed"
-}
diff --git a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
index 6b8338002f86..116d364d450f 100644
--- a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
+++ b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild,v 1.8 2015/01/02 12:21:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild,v 1.9 2015/01/26 10:21:34 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 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="examples"
 
 RDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylirc/pylirc-0.0.5.ebuild b/dev-python/pylirc/pylirc-0.0.5.ebuild
deleted file mode 100644
index 55656b14d3a8..000000000000
--- a/dev-python/pylirc/pylirc-0.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylirc/pylirc-0.0.5.ebuild,v 1.7 2010/07/23 22:34:03 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="lirc module for Python"
-HOMEPAGE="http://sourceforge.net/projects/pylirc/ http://pypi.python.org/pypi/pylirc"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-misc/lirc"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/pymtp/Manifest b/dev-python/pymtp/Manifest
index 2d8c49a8ec58..a267f3cd32fa 100644
--- a/dev-python/pymtp/Manifest
+++ b/dev-python/pymtp/Manifest
@@ -1,4 +1,3 @@
-DIST pymtp-0.0.4.tar.bz2 18986 SHA256 b60d18ffa107a3e2a50a259123f51d81cd097a21e974f12dae84b3215a535f8b SHA512 8dfb9644ae724a71b683eae5a932103d82d916598a4de220b6a776e2e9508df5aa1347efc2bc25b42efe0fba257c4b2f28603aec10b3a5decfb31ba77ad3394c WHIRLPOOL fc859d0eed9ff500514ed588f43fb0ab3bafc7fda3d21044ac9a7643c124b075df5612790f98820470dc700d7dfa4a0773ded3e3bd9ad1f538b67941d5d51e28
 DIST pymtp_0.0.4-4.debian.tar.gz 4210 SHA256 82ff8c9f037336b4d23d7b1819108fb6bc635362fc80bc5aa8b1822f5199a4c1 SHA512 78cff7d0844d56ce97e606a6b2fcd1335265bcff17e9ff6958141effd3bcbc9a5fe038953c35ed81bc4c9dcacea1bcbccb827ec7c8901b63d00d2e78180356cb WHIRLPOOL 61a36dc91e5b2adbff74379d64fcd1efeedc2dc698bb9633ea8ccd04a2a26eb9954158cb6fc7bd9ca247f93990d8c654fb03156abc1a0e7dc251e68106b61b4e
 DIST pymtp_0.0.4.orig.tar.gz 20767 SHA256 7478ba47b27974482f318beb47ba389e63cb096fa74ce3138dd194fb1450f7ae SHA512 3e3a695d845a4303e4c2f5cbc771b9dd2122de52500d05c7c580912836a81445b57f255e64eca0bfe7b8ae1e594b2d310ed95b5726bac7f229fef8964bbb0bca WHIRLPOOL fe38b70832bf945e67cf9408aee58e9239e63267d318d6b4a639ae74600c7e3ecdf142b46e71ba8c5221772ee5d840991b2db4c8cff51bb9484a061d01abd833
 DIST pymtp_0.0.6.orig.tar.gz 22431 SHA256 c729beddad8d200afeefd0bf59b01065b9fe276a3845a4a4940eca4ea2e3a47b SHA512 f50249c6b2acfe2c86da5e5f8a24e1392d47e0ddd02d10891763a3150f9985ecdb8a0b7c7ce8bc36f53f2bf62073a26dd3a72b6c3f95d59cd447bb55684811b0 WHIRLPOOL fe34509a7a66d7e554fd84a1339758a57525771bea34db0433f503b334aa888556266e98967060acd07431412bab5ca5f87f6fefef3ca74cd692914923f40a73
diff --git a/dev-python/pymtp/pymtp-0.0.4.ebuild b/dev-python/pymtp/pymtp-0.0.4.ebuild
deleted file mode 100644
index 689f69d8bdcc..000000000000
--- a/dev-python/pymtp/pymtp-0.0.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymtp/pymtp-0.0.4.ebuild,v 1.9 2012/05/24 03:08:48 ssuominen Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="LibMTP bindings for Python"
-HOMEPAGE="http://libmtp.sourceforge.net/ http://pypi.python.org/pypi/PyMTP"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmtp-1.1.0"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="pymtp.py"
diff --git a/dev-python/pynut/Manifest b/dev-python/pynut/Manifest
index f6637437f7d0..580692f6ee99 100644
--- a/dev-python/pynut/Manifest
+++ b/dev-python/pynut/Manifest
@@ -1,2 +1 @@
-DIST python-pynut-1.1.tar.gz 3513 SHA256 533bbb912baf8d2125813db91eb0a7406fdf2521156584f06299f23753f8e93e SHA512 665dd0826225423b556bf58dde26604913b93fb659d41b644424f757597b379e101974186f2aae9da119be7fc0326a271dded6d4fbc73d371ec22e8ccdf718f6 WHIRLPOOL 1553388019f7e748dd014ec71c92c1b7c540e0e5ca8834186a9b956689d004e2bd5b6975c8377ecda17038845615ffabf532956f4a5fbb6b97ed8dd57b301957
 DIST python-pynut-1.2.tar.gz 3610 SHA256 446adbc317f67815d0faefb679c0c7f47c2cba64efaa1b9386f08a442b3fd2ce SHA512 b4fcaff1a23648c7a7bb48bb3b795291a57aabc032c2ed53fc54eb87d6ba46c970fb67472e41e23ce40b021d2b21a027189c2c93369c7503078acc8109368fb7 WHIRLPOOL 03964bc2648b22543dc11da62ce27e3cbd36cfcbf1352fd9d442fe46e3f151500295a5bec745ab8ac50bda6c5607b90ccf17e35d2e44fbd8d17ee07d9fdceec4
diff --git a/dev-python/pynut/pynut-1.1.ebuild b/dev-python/pynut/pynut-1.1.ebuild
deleted file mode 100644
index d84d8559f8e3..000000000000
--- a/dev-python/pynut/pynut-1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pynut/pynut-1.1.ebuild,v 1.2 2009/11/14 22:52:00 arfrever Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-DESCRIPTION="An abstraction class written in Python to access NUT (Network UPS Tools) server"
-HOMEPAGE="http://www.lestat.st/informatique/projets/pynut-en/"
-SRC_URI="http://www.lestat.st/_media/informatique/projets/pynut/python-${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-S="${WORKDIR}/python-${P}"
-
-src_install() {
-	installation() {
-		insinto $(python_get_sitedir)
-		doins PyNUT.py
-	}
-	python_execute_function -q installation
-
-	dodoc README
-}
-
-pkg_postinst() {
-	python_mod_optimize PyNUT.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyNUT.py
-}
diff --git a/dev-python/pynzb/pynzb-0.1.0.ebuild b/dev-python/pynzb/pynzb-0.1.0.ebuild
deleted file mode 100644
index 1a50939b76b7..000000000000
--- a/dev-python/pynzb/pynzb-0.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pynzb/pynzb-0.1.0.ebuild,v 1.1 2011/08/28 10:16:23 hwoarang Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Unified API for parsing NZB files"
-HOMEPAGE="http://pypi.python.org/pypi/pynzb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 7a5a06a40864..8c5cba92fc83 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,2 +1 @@
-DIST PyOpenGL-3.0.1.tar.gz 698475 SHA256 79065ba0fec47e9e9514f3be543866f07d7b08071336d566fbf3ab138c442635 SHA512 377fa8e95e938e9cf1f9fb4f0854eb42844c26537aedaa0e8ec36b99a726c34e3f1482e9134421560ba1415174f76ceed9ae3a92206f40d0e633766816655c81 WHIRLPOOL 14f97fb550161240d30c860021b432c8cad9ab1a3ec4b355c6469b70533466177a5e36ae9e75d5087961e9b7e5ec2c7b47e8c72f2fe9390fad46e1a380ae859e
 DIST PyOpenGL-3.0.2.tar.gz 891943 SHA256 9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03 SHA512 e5663682eee5aa7276590ae7547d8345141e2e8e34ddfcbb3867c10a91e9959ebe8ec82606e257826ba6dd21d731ad76f38134849f095a01760d007d752fe9a9 WHIRLPOOL 9638e25ae0c8e99f0adfe99eb99e6d321c0b38f6c1b6a9efb46d675707ceb547aa596878dbc99d114f53e80b80063bcd12fbeb58fb5f6296c3371c06a333f5e6
diff --git a/dev-python/pyopengl/pyopengl-3.0.1.ebuild b/dev-python/pyopengl/pyopengl-3.0.1.ebuild
deleted file mode 100644
index 17ac2450a9a2..000000000000
--- a/dev-python/pyopengl/pyopengl-3.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-3.0.1.ebuild,v 1.16 2012/05/29 14:40:59 aballier Exp $
-
-EAPI="3"
-PYTHON_USE_WITH="tk"
-PYTHON_USE_WITH_OPT="tk"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-* *-jython 3.*"
-
-inherit distutils
-
-MY_PN="PyOpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ http://pypi.python.org/pypi/PyOpenGL"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-#	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="tk"
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-	tk? ( dev-tcltk/togl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="OpenGL"
diff --git a/dev-python/pyopengl/pyopengl-3.0.2.ebuild b/dev-python/pyopengl/pyopengl-3.0.2.ebuild
deleted file mode 100644
index 72f8e9c89683..000000000000
--- a/dev-python/pyopengl/pyopengl-3.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-3.0.2.ebuild,v 1.1 2012/10/30 07:56:23 patrick Exp $
-
-EAPI="3"
-PYTHON_USE_WITH="tk"
-PYTHON_USE_WITH_OPT="tk"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-* *-jython 3.*"
-
-inherit distutils
-
-MY_PN="PyOpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ http://pypi.python.org/pypi/PyOpenGL"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-#	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="tk"
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-	tk? ( dev-tcltk/togl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="OpenGL"
diff --git a/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
index ed61b6f2cdbd..8ac7ad59c3d3 100644
--- a/dev-python/pyparsing/pyparsing-2.0.3.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.3.ebuild,v 1.5 2015/01/22 08:43:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.3.ebuild,v 1.6 2015/01/26 10:26:06 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
diff --git a/dev-python/pyrex/pyrex-0.9.9.ebuild b/dev-python/pyrex/pyrex-0.9.9.ebuild
deleted file mode 100644
index 178ea4bf763e..000000000000
--- a/dev-python/pyrex/pyrex-0.9.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.9.ebuild,v 1.8 2012/12/02 06:06:23 radhermit Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-MY_P="Pyrex-${PV}"
-
-DESCRIPTION="A language for writing Python extension modules"
-HOMEPAGE="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"
-SRC_URI="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="examples"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="Pyrex"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-DOCS="CHANGES.txt ToDo.txt USAGE.txt"
-
-src_install() {
-	distutils_src_install
-
-	dohtml -A c -r Doc/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r Demos
-	fi
-}
diff --git a/dev-python/pyro/pyro-4.25.ebuild b/dev-python/pyro/pyro-4.25.ebuild
index 92894d2ecd3e..f6fae35ed9a6 100644
--- a/dev-python/pyro/pyro-4.25.ebuild
+++ b/dev-python/pyro/pyro-4.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.25.ebuild,v 1.5 2015/01/16 04:37:55 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.25.ebuild,v 1.6 2015/01/26 09:38:18 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="!dev-python/pyro:0
diff --git a/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild
index 71ac747d2bbf..afe206ac7850 100644
--- a/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild,v 1.2 2015/01/06 16:01:54 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-runner/pytest-runner-2.1.2.ebuild,v 1.3 2015/01/26 10:21:16 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://pypi.python.org/pypi/pytest-runner"
 SRC_URI="mirror://pypi/p/${PN}/${P}.zip"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
index 309edd9ee620..ca58da718b28 100644
--- a/dev-python/python-bibtex/Manifest
+++ b/dev-python/python-bibtex/Manifest
@@ -1,3 +1,2 @@
-DIST python-bibtex-1.2.4.tar.gz 57057 SHA256 0df2e9cec2219aa08133972956d97eb9d641ac2e1e6a115fdded122ae18a1f7a SHA512 49020be898475a6fbdb233bbb673728075c310c27ae4f6fe7aeaab2128cf036228f50df297af76158f57df94043025b710ca4a7ebb9051ac1c4dbde04e372497 WHIRLPOOL 12ece30f10774dafb5265cd0fe55f90fbfea22a984300cdf2c175d8f750882da5d3c2a0435d47c1feb728693cda30a8e4216b12c82dc92a7435358bc124854e8
 DIST python-bibtex-1.2.5.tar.gz 59588 SHA256 59641db49689c5ae8dd4244e2d900a436e426d0f9b74c2512d11a00e40cfdd72 SHA512 b0ed2fecd420310f3bd8f0223ac3649125519b8715be36ed7a709750f947397f332d456590e8623335aac60d1f507c52789a861963947644e004be537b02bcc6 WHIRLPOOL 8cee754e5b91e8c9176c8a5f8646ae05f9bc5bafa56275e6abf19442f2a7ea450435f4c11a355ba108ad6ef3ae2119534596c9834553627b3ec421776eadba40
 DIST python-bibtex-1.2.7.tar.gz 60894 SHA256 37709a19b94858def4ede028e670b14153f98c62c6adc926af8102a3279eeaf0 SHA512 6739824fcdad91e2abb333d9e17a31bd222e6100630b8e4f65a9e718d36eb451600fdc7380cb63b89c4a33a7554b79dd1c52448d19c3359f21deee2134242e6b WHIRLPOOL 9c067e05473da5ec7ac5b6a0e5e5dc1363326aeff38946bef33858df8cc324079bf82bed59c5a7642310b749fcd9a8b62f341256373fcefe6919d54dae1fd034
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild
deleted file mode 100644
index 61bdd1908be7..000000000000
--- a/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/python-bibtex-1.2.4.ebuild,v 1.11 2012/05/04 15:12:16 patrick Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="A Python extension to parse BibTeX files"
-HOMEPAGE="http://pybliographer.org/"
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=app-text/recode-3.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	distutils_src_prepare
-
-	epatch "${FILESDIR}/${P}-fix_tests.patch"
-
-	# Disable tests during installation.
-	sed -e "/self.run_command ('check')/d" -i setup.py
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" check
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.7.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.7.ebuild
deleted file mode 100644
index 3c73f2340fc4..000000000000
--- a/dev-python/python-bibtex/python-bibtex-1.2.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/python-bibtex-1.2.7.ebuild,v 1.1 2014/05/03 09:15:14 patrick Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="A Python extension to parse BibTeX files"
-HOMEPAGE="http://pybliographer.org/"
-SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=app-text/recode-3.6-r1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Disable tests during installation.
-	sed -e "/self.run_command ('check')/d" -i setup.py
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" check
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
index 16bc1f40d107..12a23827f4c4 100644
--- a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild,v 1.4 2015/01/22 08:43:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild,v 1.5 2015/01/26 10:26:24 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-python/python-mhash/python-mhash-1.4.ebuild b/dev-python/python-mhash/python-mhash-1.4.ebuild
deleted file mode 100644
index 0a522cc6b576..000000000000
--- a/dev-python/python-mhash/python-mhash-1.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mhash/python-mhash-1.4.ebuild,v 1.9 2013/01/27 19:39:52 grobian Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Python interface to libmhash"
-HOMEPAGE="http://mhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-crypt/mhash"
-RDEPEND="${DEPEND}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="AUTHORS"
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild
index a437934575e6..c76df4ea8a11 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild,v 1.7 2015/01/18 08:38:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild,v 1.8 2015/01/26 09:58:38 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild
deleted file mode 100644
index 93d882e0ffaf..000000000000
--- a/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler/python-poppler-0.12.1-r3.ebuild,v 1.3 2012/06/08 11:35:20 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-
-inherit eutils libtool python
-
-DESCRIPTION="Python bindings to the Poppler PDF library"
-HOMEPAGE="http://launchpad.net/poppler-python"
-SRC_URI="http://launchpad.net/poppler-python/trunk/development/+download/pypoppler-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="examples"
-
-S=${WORKDIR}/pypoppler-${PV}
-
-RDEPEND=">=app-text/poppler-0.15.0[cairo]
-	>=dev-python/pycairo-1.8.4
-	dev-python/pygobject:2
-	dev-python/pygtk:2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# http://pkgs.fedoraproject.org/gitweb/?p=pypoppler.git;a=tree
-	epatch \
-		"${FILESDIR}"/${P}-75_74.diff \
-		"${FILESDIR}"/${P}-79_78.diff \
-		"${FILESDIR}"/${P}-poppler0.15.0-changes.patch \
-		"${FILESDIR}"/${P}-poppler-0.18.0-minimal-fix.patch
-
-	elibtoolize
-	python_copy_sources
-}
-
-src_install() {
-	python_src_install
-	python_clean_installation_image
-
-	dodoc NEWS || die
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demo/demo-poppler.py || die
-	fi
-}
diff --git a/dev-python/pytz/pytz-2014.10.ebuild b/dev-python/pytz/pytz-2014.10.ebuild
index 32b3d3a6701e..71d940dbd920 100644
--- a/dev-python/pytz/pytz-2014.10.ebuild
+++ b/dev-python/pytz/pytz-2014.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2014.10.ebuild,v 1.4 2015/01/22 08:43:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2014.10.ebuild,v 1.5 2015/01/26 10:26:42 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 0ad10865e385..2125e5712295 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,6 +1,2 @@
-DIST pyusb-0.4.2.tar.gz 15801 SHA256 121294da4c58d10bbb84404f27d5bdd75713a0b37ae38c8a873008c0b39e3dfe SHA512 169910174eaba6c417cdb25c65107b28f3f875416513ba00d84b9197d42b5814a6175373387eb5caaf9b31e71ba78ac5bdc0c9304124cc5842128bfaaa98b9f2 WHIRLPOOL 09505a3d190096ccb3819e9a343bf49ee30d118f9f614a3f9817ea84bd2fb883585d08c419d686749ac7726cccf20dd749a55772842ab51f1e1c3c5f865e010b
 DIST pyusb-0.4.3.tar.gz 16242 SHA256 3c08b292886b7001ab088345af4d0dfe3e7d37bfc4b2bdcd7edb564ea3ef04d5 SHA512 efe90f910cd8b02646de4ec47e28f6debbcc3c4ff7aa0a45d8355840abfdb079f8e9ac9ce78b785e3f5a26772c5118362e9f4a7a3629985eae2063bc06b53e4a WHIRLPOOL 1a7f231520cf7f1a9777fadad5bfa1f4886172f5a643ba6b9dc5a58bf687629629670d8c12b79844ce692010b8bcd25dede5d6182d3677c9c8beea0cad3b9c7f
-DIST pyusb-1.0.0-a1.tar.gz 158976 SHA256 625db49430732b9ffddc8cdd82c239024240f6db1854d47c6cc274979f35e48f SHA512 d2587e4ef58f938b04977238b7e6504b13d07cb4a856e67d96a6abc45aaeca9eceefbdfc2743be88f2ed457fe1190a1b3af6157f89e0fcdbfbb251b4648af256 WHIRLPOOL 22cfde33175709f1a0e47405e3d5b73a68498feaaa1aa20f55cc2074aada91db08688860ed68bfcf10acf2deb0093ffacb02b8d229a002cc080ac935535d780c
-DIST pyusb-1.0.0a3.tar.gz 40638 SHA256 09ede69752e3d57793627b9408275701df3b8109b46b09509e4d4c9049ebe3ab SHA512 f8dcf0c492f807c04e82400978147ec06b180d0223a39bd2961e3b9ee8d12501cdb07133280683d72b4872e54d5c536678213fa175656e81caeec1563885d522 WHIRLPOOL dc9fbf8ebbfa911f312c1d4c0f16e3fb02f31912aa1276aff1f5d64bf8db532a266cc0318ec18d5a540fcc25dfe5869a81be6084dbe65bb0c08d78d8fcbf194d
-DIST pyusb-1.0.0b1.tar.gz 44514 SHA256 6fa787840baa8c6a041e370bf381127aae5fb44c820ba655f966b7da4de6279f SHA512 10f364f9ffbb3fa964ac9db7591fd9ac4e3e62aff8b65e02d38990b66126a56d62671886f00f862730e3148138109d70b642aa4c5abe36725dd58185eb4d9aa5 WHIRLPOOL 0110d5036623482b17a66d615d0d1995c7ca794e1b9ca105b3b00165e0a15fbd67585f7af5c88cc9a5ceedf61de0fe8a75d0b2c3c412cfe9c52282867cf26f1d
 DIST pyusb-1.0.0b2.tar.gz 57747 SHA256 14ec66077bdcd6f1aa9e892a0a35a54bb3c1ec56aa740ead64349c18f0186d19 SHA512 8a69f6cb3e2876a52c1caa0854e98586cf6d7e01225b132b4d37b92814727ae66398282aedbe5e521c509dc3ee6dfc5799b9f22890be7c7a387eb427921cd73b WHIRLPOOL 45c70c339490789e2e1195a8b040358380e5e22438e58344e40b42c795a276d6e30c3efc452791ffe4093287c9d01f44d47be25c07fba925c9198c8f630149ba
diff --git a/dev-python/pyusb/pyusb-0.4.2.ebuild b/dev-python/pyusb/pyusb-0.4.2.ebuild
deleted file mode 100644
index 9629abc97c67..000000000000
--- a/dev-python/pyusb/pyusb-0.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyusb/pyusb-0.4.2.ebuild,v 1.4 2014/08/10 21:20:21 slyfox Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils flag-o-matic
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="http://pyusb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples"
-
-### The bus enumeration does not appear to work with libusb-compat
-### A new version based on libusb-1.x is in the works, but not yet released
-DEPEND="virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-RESTRICT_PYTHON_ABIS="3*"
-
-src_install() {
-	distutils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r samples
-	fi
-}
diff --git a/dev-python/pyusb/pyusb-1.0.0_alpha1.ebuild b/dev-python/pyusb/pyusb-1.0.0_alpha1.ebuild
deleted file mode 100644
index 7ef9837aa1b2..000000000000
--- a/dev-python/pyusb/pyusb-1.0.0_alpha1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyusb/pyusb-1.0.0_alpha1.ebuild,v 1.4 2014/08/10 21:20:21 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit distutils
-
-MY_P="${P/_alpha/-a}"
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="http://pyusb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="usb"
-
-src_test() {
-	cd tests
-
-	testing() {
-		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" testall.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/pyusb/pyusb-1.0.0_alpha3.ebuild b/dev-python/pyusb/pyusb-1.0.0_alpha3.ebuild
deleted file mode 100644
index b3e046bd0b49..000000000000
--- a/dev-python/pyusb/pyusb-1.0.0_alpha3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyusb/pyusb-1.0.0_alpha3.ebuild,v 1.4 2014/08/10 21:20:21 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-inherit distutils
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="http://pyusb.sourceforge.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb:1
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-DOCS="README.rst docs/tutorial.rst"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="usb"
diff --git a/dev-python/pyusb/pyusb-1.0.0_beta1.ebuild b/dev-python/pyusb/pyusb-1.0.0_beta1.ebuild
deleted file mode 100644
index 7e29e756624f..000000000000
--- a/dev-python/pyusb/pyusb-1.0.0_beta1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyusb/pyusb-1.0.0_beta1.ebuild,v 1.2 2014/05/29 08:47:59 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_P="${P/_beta/b}"
-
-DESCRIPTION="USB support for Python"
-HOMEPAGE="http://pyusb.sourceforge.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-### This version is compatible with both 0.X and 1.X versions of libusb
-DEPEND="virtual/libusb
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS="README.rst docs/tutorial.rst"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyutil/pyutil-2.0.0.ebuild b/dev-python/pyutil/pyutil-2.0.0.ebuild
index d9fbe02e2610..3222b8f4c174 100644
--- a/dev-python/pyutil/pyutil-2.0.0.ebuild
+++ b/dev-python/pyutil/pyutil-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyutil/pyutil-2.0.0.ebuild,v 1.3 2015/01/09 13:45:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyutil/pyutil-2.0.0.ebuild,v 1.4 2015/01/26 10:07:52 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
index cd85afe11d6b..8375aa4e6d4c 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild,v 1.5 2015/01/22 08:44:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild,v 1.6 2015/01/26 10:27:00 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://ekyo.nerim.net/software/pyogg/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyxattr/pyxattr-0.5.3.ebuild b/dev-python/pyxattr/pyxattr-0.5.3.ebuild
index 560022657aca..7704d1c0c276 100644
--- a/dev-python/pyxattr/pyxattr-0.5.3.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.3.ebuild,v 1.6 2015/01/01 21:20:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.5.3.ebuild,v 1.7 2015/01/26 10:21:53 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="sys-apps/attr"
diff --git a/dev-python/pyzor/pyzor-0.5.0-r1.ebuild b/dev-python/pyzor/pyzor-0.5.0-r1.ebuild
deleted file mode 100644
index fd43b55c100e..000000000000
--- a/dev-python/pyzor/pyzor-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.5.0-r1.ebuild,v 1.7 2010/07/27 16:49:25 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="pyzord"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="A distributed, collaborative spam detection and filtering network"
-HOMEPAGE="http://pyzor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="pyzord"
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="THANKS UPGRADING"
-
-src_prepare() {
-	epatch "${FILESDIR}/pyzord_getopt.patch"
-
-	# rfc822BodyCleanerTest doesn't work fine.
-	# Remove it until it's fixed.
-	sed -i \
-		-e '/rfc822BodyCleanerTest/,/self\.assertEqual/d' \
-		unittests.py || die "sed in unittest.py failed"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" unittests.py
-	}
-	python_execute_function testing
-}
-
-src_install () {
-	distutils_src_install
-
-	dohtml docs/usage.html
-	rm -rf "${ED}usr/share/doc/pyzor"
-
-	if use pyzord; then
-		dodir /usr/sbin
-		mv "${ED}"usr/bin/pyzord* "${ED}usr/sbin"
-	else
-		rm "${ED}"usr/bin/pyzord*
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	if use pyzord; then
-		ewarn "/usr/bin/pyzord has been moved to /usr/sbin"
-	fi
-}
diff --git a/dev-python/quixote/quixote-2.8.ebuild b/dev-python/quixote/quixote-2.8.ebuild
index 05a8302aa3ee..2a0cf181b5c0 100644
--- a/dev-python/quixote/quixote-2.8.ebuild
+++ b/dev-python/quixote/quixote-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-2.8.ebuild,v 1.2 2015/01/22 08:44:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-2.8.ebuild,v 1.3 2015/01/26 10:27:18 ago Exp $
 
 EAPI=5
 # Appears to be written only for py2
@@ -16,7 +16,7 @@ SRC_URI="http://quixote.ca/releases/${MY_P}.tar.gz"
 
 LICENSE="CNRI-QUIXOTE-2.4"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ia64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc test"
 
 DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index 5ab3aeb3ae35..2df771dc0168 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,2 +1 @@
-DIST repoze.lru-0.5.tar.gz 12537 SHA256 a82f38c416c0985350429810cc436a83ee2b0e260d490866e8f063d792388be5 SHA512 5c35439577815048ce873e64d03668eb54f06a28f1a095fbfda2579a36fbb55f0fc2a8fb2832311c28c078a65472acbeba2dee559aed17b6f015761051ae4e65 WHIRLPOOL d3a870dd6bf582782ba87af9acab6da43c9ae1c0105b84801b12ee31b19dde21b958724da86bbd343ec8793e346171ae04bf140ec435c7b51640ee48e60b16b6
 DIST repoze.lru-0.6.tar.gz 19814 SHA256 0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31 SHA512 32732286f41ac6ad55e65fa15907e44558e7fbf089d1565c9c413be7c4af158b7a8ef9fc6be68998f8a9b4cd836028b8e706ba508a328a7fa338e95364e968db WHIRLPOOL b79539325e2529295d8da8b084d698150961ed648470d0f79d2a9533284b146c0713551dab860880cc6fd851c3afe5a99f549e6b0971539bfb24ba1c3ab738b6
diff --git a/dev-python/repoze-lru/repoze-lru-0.5.ebuild b/dev-python/repoze-lru/repoze-lru-0.5.ebuild
deleted file mode 100644
index 41ed50481b22..000000000000
--- a/dev-python/repoze-lru/repoze-lru-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-lru/repoze-lru-0.5.ebuild,v 1.3 2012/05/25 22:08:16 floppym Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS=1
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A tiny LRU cache implementation and decorator"
-HOMEPAGE="http://www.repoze.org"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/repoze-lru/repoze-lru-0.6.ebuild b/dev-python/repoze-lru/repoze-lru-0.6.ebuild
deleted file mode 100644
index 7504d9a5ccda..000000000000
--- a/dev-python/repoze-lru/repoze-lru-0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/repoze-lru/repoze-lru-0.6.ebuild,v 1.1 2012/07/30 07:16:35 patrick Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS=1
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A tiny LRU cache implementation and decorator"
-HOMEPAGE="http://www.repoze.org"
-SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-python/ropemacs/Manifest b/dev-python/ropemacs/Manifest
index db8ce4451b0f..17b3e41281ed 100644
--- a/dev-python/ropemacs/Manifest
+++ b/dev-python/ropemacs/Manifest
@@ -1,2 +1 @@
-DIST ropemacs-0.6.tar.gz 19093 SHA256 40d0a5918cc26f999e8f4080eddae095b1e92087c90a9048bdd0431ff38f3d05 SHA512 2cf2eebb8c22be49bb7fe05a94b141c75111804e5a4428d16a3bc7de85cd6a10dd85d1ae9ce5546906b0e724044aad43ea05bbcf8339989956beede929738adc WHIRLPOOL c2448e5f690644eece14a815d99f952301b4227b1e347d57e5f37b5e5fb869d336e20f35f85fe97189e19a134b4d38ea2a3e02c9f7dee6be053d66e554d823ab
 DIST ropemacs-0.7.tar.gz 20744 SHA256 12d7dc9872f20de757610224999e866aac89ff04864d15a393e937965b70b8f4 SHA512 3cc61fe6416a473430ace720caf5516def0166752c8e2d72398e6bb863ee0c40a4b818a2754c60824bd365f20e9f72e5967f0d9ee7fce8851a2f753618c790c5 WHIRLPOOL f3111adc8caa4262379c34add573ccfa46f142c19aea5956219d94600e20985832d1b65cfdd66683b13063ac82885a9d97fb983cffc699d3155900e3727c0fd8
diff --git a/dev-python/ropemacs/files/ropemacs-0.6-ropemode-dir.patch b/dev-python/ropemacs/files/ropemacs-0.6-ropemode-dir.patch
deleted file mode 100644
index 496841c388ff..000000000000
--- a/dev-python/ropemacs/files/ropemacs-0.6-ropemode-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ropemacs-orig/setup.py
-+++ ropemacs/setup.py
-@@ -23,7 +23,7 @@
-       version='0.6',
-       description='An emacs mode for using rope python refactoring library',
-       long_description=get_long_description(),
--      packages=['ropemode', 'ropemacs'],
-+      packages=['ropemacs'],
-       author='Ali Gholami Rudi',
-       author_email='aligrudi@users.sourceforge.net',
-       url='http://rope.sf.net/ropemacs.html',
diff --git a/dev-python/ropemacs/ropemacs-0.6.ebuild b/dev-python/ropemacs/ropemacs-0.6.ebuild
deleted file mode 100644
index 07af62cd7031..000000000000
--- a/dev-python/ropemacs/ropemacs-0.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ropemacs/ropemacs-0.6.ebuild,v 1.2 2010/10/08 11:28:59 hwoarang Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="Rope in Emacs"
-HOMEPAGE="http://rope.sourceforge.net/ropemacs.html
-	http://pypi.python.org/pypi/ropemacs"
-SRC_URI="http://bitbucket.org/agr/ropemacs/get/8b277a188d00.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/rope
-	dev-python/ropemode"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Patch for nonexistent ropemode in setup.py
-	epatch "${FILESDIR}/${P}-ropemode-dir.patch"
-}
-
-src_install() {
-	distutils_src_install
-	dodoc docs/*.txt || die
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "In order to enable ropemacs support in Emacs, install"
-	elog "app-emacs/pymacs and add the following line to your ~/.emacs file:"
-	elog "  (pymacs-load \"ropemacs\" \"rope-\")"
-}
diff --git a/dev-python/ropemode/Manifest b/dev-python/ropemode/Manifest
index a01a6d083834..3a2497927ee8 100644
--- a/dev-python/ropemode/Manifest
+++ b/dev-python/ropemode/Manifest
@@ -1,2 +1 @@
-DIST ropemode-0.1-rc2.tar.gz 11700 SHA256 f5cfef7bd5382fdb60dff5b2449d45663f7914138b619737351363403c9fff8a SHA512 6415fdfbb9c53c5e7338fa2ebfeabdef91e1df3b81681d2183c23f7a1d4fd05afacb914e9c9978b5b44c62b1469aed36ca62d2155a9a740f1fd126a5a17d2701 WHIRLPOOL 64b09a76573abebcfef21111b5b9e1c70b0109ef5fc9d13866605c3e40f3f69176e8cdde8aec6833b0a92222a934ff232e003eb4501c26e3d98d7d13f5daec89
 DIST ropemode-0.2.tar.gz 12268 SHA256 54b2c7b4a04b22d41aa686942dc521a89ac36fd2c7356c2707939bb97980864b SHA512 59b9a8f8caf03f480994c546b48c0be8bd85ebf44b406e216b6651e254b3fd9c6a532a5bab1be1301b12dcf756d3ad325f38e810fe5ea5bbcc700979cfbd5055 WHIRLPOOL ccf2a99abe7c3cc9634dd118f3f65f3b32a09c7f846f8314d8abcfcd15ae761b43be0fa61089ba682b62f75256bb69d54f11f8cf171cc4586295fceb3189c4f2
diff --git a/dev-python/ropemode/ropemode-0.1_rc2.ebuild b/dev-python/ropemode/ropemode-0.1_rc2.ebuild
deleted file mode 100644
index fb005a86ea4d..000000000000
--- a/dev-python/ropemode/ropemode-0.1_rc2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ropemode/ropemode-0.1_rc2.ebuild,v 1.1 2010/10/03 16:39:32 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils
-
-MY_P="${P/_rc/-rc}"
-
-DESCRIPTION="A helper for using rope refactoring library in IDEs"
-HOMEPAGE="http://pypi.python.org/pypi/ropemode"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/rope-0.9.2"
-DEPEND="${DEPEND}
-	dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/ropemode/ropemode-0.2.ebuild b/dev-python/ropemode/ropemode-0.2.ebuild
deleted file mode 100644
index 4df4e381cfe6..000000000000
--- a/dev-python/ropemode/ropemode-0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ropemode/ropemode-0.2.ebuild,v 1.1 2012/06/28 07:24:42 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils
-
-MY_P="${P/_rc/-rc}"
-
-DESCRIPTION="A helper for using rope refactoring library in IDEs"
-HOMEPAGE="http://pypi.python.org/pypi/ropemode"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/rope-0.9.2"
-DEPEND="${DEPEND}
-	dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index a3daee4fac6f..be397d9c47dd 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,3 +1 @@
-DIST rpyc-3.2.1.tar.gz 47078 SHA256 8c7d276ad778c0c4567fb03e2027a06abe308e6d720449f4f2930b669e8f4fc9 SHA512 0bbc4cf04f8228a2c799bbb3ac900bee55c3ad116a5848d314a5e8746b137d8f0acce325cf0e8c39e41a6e6b382f126ae02fe75bf675eca1115ad9e20e46ef8f WHIRLPOOL 443bec835916a0332c8936f9e316a99428d7dc8c5a0020597b208a5428b5100d266859d4df8ad6ef0ec310901697341db8885a260d131c37a72085a38e6eca7a
-DIST rpyc-3.2.2.tar.gz 48300 SHA256 8495e6a2e8a66913e6339d041dc46f9e504a0078f22130c6ef1a7a55f1c8d0dc SHA512 dde1981358053c75370eb2a4ea5f6d6e8476e5b1771e6bb05ebefc54a969721c50a38470f5414aa7c2eccbf28d89435466b2fcc42a3fedc7857502e5b49c3bec WHIRLPOOL 5a6d4ce5aba6971f6678cac16f615324e280cc752b8de62a225a902a140ab14e8904e9adee3a7eee0267bf81cd699182c0d18b5a35951e089403fa7281d74e91
 DIST rpyc-3.2.3.tar.gz 48371 SHA256 80782d78863bc4f803b2534452dc37c5dcb6e85230af77fe0ce5a0206e37f661 SHA512 b0cc7a9429b062b0b796a7e4f6bc8056041db7e63b04dc8cbc67c5e2f343f1c1299e0e3fc88ff651f484caf5d3305cb4346523dee555e8315c9a1e1141da8b28 WHIRLPOOL 4fc6383571bb84aaed7c6e1b360c2e9b55c40f3ba2a7ca9dfd41527b889f3713003f5286edda625fcfbe4e293854389ddff437f54d18188187b3fd2a83a35cbe
diff --git a/dev-python/rpyc/rpyc-3.2.1.ebuild b/dev-python/rpyc/rpyc-3.2.1.ebuild
deleted file mode 100644
index 2a8d0566ae31..000000000000
--- a/dev-python/rpyc/rpyc-3.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpyc/rpyc-3.2.1.ebuild,v 1.1 2012/03/06 14:04:39 grozin Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="http://rpyc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=""
-DEPEND="dev-python/setuptools"
diff --git a/dev-python/rpyc/rpyc-3.2.2.ebuild b/dev-python/rpyc/rpyc-3.2.2.ebuild
deleted file mode 100644
index 2d6ba5e72a35..000000000000
--- a/dev-python/rpyc/rpyc-3.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpyc/rpyc-3.2.2.ebuild,v 1.1 2012/06/02 18:28:06 grozin Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="http://rpyc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=""
-DEPEND="dev-python/setuptools"
diff --git a/dev-python/rpyc/rpyc-3.2.3.ebuild b/dev-python/rpyc/rpyc-3.2.3.ebuild
deleted file mode 100644
index af8eeff5fbae..000000000000
--- a/dev-python/rpyc/rpyc-3.2.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpyc/rpyc-3.2.3.ebuild,v 1.1 2013/01/11 08:11:57 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="http://rpyc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=""
-DEPEND="dev-python/setuptools"
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 27374662392b..124f0b9ae6a7 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,2 +1 @@
-DIST rsa-3.1.1.tar.gz 37584 SHA256 ed83fe80602077bcbf91d14e41558c751d76527c7b88d44394e1e2900fddb7ba SHA512 5a8e8836f90ec1db41fa87b0f81accbc22814e71581ec0b66be850966603d0210f28e05f3330f62a4622ada2faa6d0f14a7f21cc46415e7a61bc0a51bd2bce37 WHIRLPOOL 8a78f4704f9ba011225baa2f698219400eacd430b01b822970da2873f719049f6ecb6df09238100594f9df16632db6498e731161ef0d5bef29be3b27df7644db
 DIST rsa-3.1.4.tar.gz 36181 SHA256 e2b0b05936c276b1edd2e1525553233b666df9e29b5c3ba223eed738277c82a0 SHA512 b6ff7b91909b58359bda5da99ca4297337da5985c5430d2e96663c8bcf599b2180d54afa3316d4c3b11a8f79ddcb1f41d6942a0c8db2f0d27221c3aee132f3c1 WHIRLPOOL bc71d736cb72d222243055ac336ed3d42fde680ad0bc8261802926adfc3c9d8f1321351fbd951c495da843cc6c16bde9dbd27cb235a870dc8817ebfd35c55c7b
diff --git a/dev-python/rsa/rsa-3.1.1.ebuild b/dev-python/rsa/rsa-3.1.1.ebuild
deleted file mode 100644
index 0cd84c27ffa5..000000000000
--- a/dev-python/rsa/rsa-3.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rsa/rsa-3.1.1.ebuild,v 1.4 2012/08/19 18:48:44 johu Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="http://stuvel.eu/rsa http://pypi.python.org/pypi/rsa"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyasn1-0.0.13
-	>=dev-python/setuptools-0.6.10"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/rsa/rsa-3.1.4-r1.ebuild b/dev-python/rsa/rsa-3.1.4-r1.ebuild
index ff757272b492..933df46e4705 100644
--- a/dev-python/rsa/rsa-3.1.4-r1.ebuild
+++ b/dev-python/rsa/rsa-3.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rsa/rsa-3.1.4-r1.ebuild,v 1.2 2015/01/22 08:44:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rsa/rsa-3.1.4-r1.ebuild,v 1.3 2015/01/26 10:27:36 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/runsnakerun/Manifest b/dev-python/runsnakerun/Manifest
index 0953bf682f65..ff9a033c761c 100644
--- a/dev-python/runsnakerun/Manifest
+++ b/dev-python/runsnakerun/Manifest
@@ -1,2 +1 @@
-DIST RunSnakeRun-2.0.1.tar.gz 448456 SHA256 ca285e445b1d701bc5f800fcacee38c120398cf6546f3c593708c75a6000fce9 SHA512 ab5bf15fd481e78917651f8ccc66bef979422ef185e584149e89609a94c452d9987f6b7b7af4740a9a3247e663a0c31741373040c52428289b5d8a687fe2f295 WHIRLPOOL b5c8c9a2ebc3215e197d5f0d14d4a5840972894564dcede1e866c1c89fdc851f6c1b78f6401e130944c1f127579534d4d42ced01c8c55e2c085a4a25aec71943
 DIST RunSnakeRun-2.0.4.tar.gz 447278 SHA256 61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef SHA512 2338d44ea57e7e9610e85dda5b2d806795d259e4e33e57e15f0ff8c938ba3dbcfc6df46d69f2fff3558879dd3b14725fdb7e0da939bf803776dc6bc95618ec24 WHIRLPOOL f8796d96a954b5d1b9556ef4e2113f494520b2a99142677581f1aca131c90bbeb9f1277d7892f6d58a9b750cc5a546e7f4c3b37c4372c31734a23e898a068aed
diff --git a/dev-python/runsnakerun/runsnakerun-2.0.1.ebuild b/dev-python/runsnakerun/runsnakerun-2.0.1.ebuild
deleted file mode 100644
index ace20b685402..000000000000
--- a/dev-python/runsnakerun/runsnakerun-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/runsnakerun/runsnakerun-2.0.1.ebuild,v 1.2 2013/02/24 10:10:34 swegener Exp $
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2:2.4"
-RESTRICT_PYTHON_ABIS="3.*"
-
-MY_PN="RunSnakeRun"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-inherit distutils
-
-DESCRIPTION="GUI Viewer for Python profiling runs"
-HOMEPAGE="http://www.vrplumber.com/programming/runsnakerun/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/squaremap
-	dev-python/wxpython"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild b/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
index f9ce544ab069..ee1137463998 100644
--- a/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
+++ b/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild,v 1.2 2015/01/22 08:44:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.2.1-r1.ebuild,v 1.3 2015/01/26 10:34:56 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=sys-libs/libselinux-2.0[python]
diff --git a/dev-python/six/six-1.8.0.ebuild b/dev-python/six/six-1.8.0.ebuild
index d035b06f2757..90a2207be817 100644
--- a/dev-python/six/six-1.8.0.ebuild
+++ b/dev-python/six/six-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.8.0.ebuild,v 1.6 2015/01/22 08:39:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.8.0.ebuild,v 1.7 2015/01/26 10:22:48 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="doc? ( dev-python/sphinx )
diff --git a/dev-python/snappy/snappy-0.5-r1.ebuild b/dev-python/snappy/snappy-0.5-r1.ebuild
deleted file mode 100644
index f00ed0ae2683..000000000000
--- a/dev-python/snappy/snappy-0.5-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snappy/snappy-0.5-r1.ebuild,v 1.3 2014/03/12 00:16:04 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-MY_PN=python-${PN}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="http://pypi.python.org/pypi/python-snappy"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND=">=app-arch/snappy-1.0.2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	"${PYTHON}" test_snappy.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/snappy/snappy-0.5.ebuild b/dev-python/snappy/snappy-0.5.ebuild
deleted file mode 100644
index 8f6bc934dfb9..000000000000
--- a/dev-python/snappy/snappy-0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snappy/snappy-0.5.ebuild,v 1.1 2013/09/02 04:12:09 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-inherit distutils
-
-DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="http://pypi.python.org/pypi/python-snappy"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-arch/snappy-1.0.2"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/stomper/Manifest b/dev-python/stomper/Manifest
index 032cb4c9e36b..edb32d6fb2eb 100644
--- a/dev-python/stomper/Manifest
+++ b/dev-python/stomper/Manifest
@@ -1,3 +1 @@
-DIST stomper-0.2.7.tar.gz 21459 SHA256 8978fd3421390abe3c1a8c8adc72346f4a8175b6fb154011fc8d37bb916e01ce SHA512 d0b61605bd23ee434267043665ba3b8f6fbd830731a5f36027821af62adcbed1625068291dc9b3f1cfa471ff4055530b9e8455c0b802932ba4712661de567a8b WHIRLPOOL cb9cd7f0a29ec1947973a2a36795d463cf4dc40fb591c4de7596ae7f459d8353b4b0a82253be71d8bd72bfe763b49ec4bbd491b09113976ea506ca6fa65ba0cc
-DIST stomper-0.2.8.tar.gz 19205 SHA256 30403340c97ca463bddba7385cefc81cd0f279ebe06309fddf4c65b412575e91 SHA512 e79ba1faffa13c96a46cac9299a3b6e477b1cbfa1d351e34beb2b161e6a627d1574fb44b1ecf9ff8f4e6a84d41c9f8265462ee93e22b5931beedaa4526c5c86b WHIRLPOOL 00ae3dd7e168ee0e6275caa4b1928cd799d1dc89350c59c7758389a8ab92ca1ad59ae4568ef5b018f8cd3e17bc39a93726e92aba1f8e662b810f82c53323a389
 DIST stomper-0.3.0.tar.gz 21051 SHA256 ceaacc016c0e8e98c3d3155f22069d18d403637d57492d9cf678813e27c9ecb0 SHA512 ba6feef44bb33a9b63f789043b131a314b903fda847dbb3ad909614a2a6b2b39f2d98dcd5bf19b070f4de9cec9dbce9cd79eb135911f16c1e8dc6d5f52158516 WHIRLPOOL 002bc793f6451ebcea03a1345930ba72df4e34aab288031371ba708daf06e58cb556c333f8c4fc640d129c2754171106679c28f983ceada4c5159208b6c895ff
diff --git a/dev-python/stomper/stomper-0.2.7.ebuild b/dev-python/stomper/stomper-0.2.7.ebuild
deleted file mode 100644
index d7dea13e795f..000000000000
--- a/dev-python/stomper/stomper-0.2.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stomper/stomper-0.2.7.ebuild,v 1.3 2014/03/03 23:48:05 pacho Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-# uuid module required.
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Transport neutral client implementation of the STOMP protocol"
-HOMEPAGE="http://pypi.python.org/pypi/stomper"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-src_install() {
-	distutils_src_install
-
-	delete_examples_and_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/${PN}/"{examples,tests}
-	}
-	python_execute_function -q delete_examples_and_tests
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins lib/stomper/examples/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/stomper/stomper-0.2.8.ebuild b/dev-python/stomper/stomper-0.2.8.ebuild
deleted file mode 100644
index 603bb03a1b4b..000000000000
--- a/dev-python/stomper/stomper-0.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stomper/stomper-0.2.8.ebuild,v 1.2 2014/10/15 12:18:47 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Transport neutral client implementation of the STOMP protocol"
-HOMEPAGE="http://pypi.python.org/pypi/stomper"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
-	mv lib/${PN}/examples . || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stomper/stomper-0.3.0.ebuild b/dev-python/stomper/stomper-0.3.0.ebuild
index 387c60004270..af8df520b4f9 100644
--- a/dev-python/stomper/stomper-0.3.0.ebuild
+++ b/dev-python/stomper/stomper-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stomper/stomper-0.3.0.ebuild,v 1.2 2015/01/22 08:44:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stomper/stomper-0.3.0.ebuild,v 1.3 2015/01/26 10:27:54 ago Exp $
 
 EAPI=5
 # Supports only py2 pypy
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tempita/tempita-0.5.3.ebuild b/dev-python/tempita/tempita-0.5.3.ebuild
index 05161c26dda0..6896546f067e 100644
--- a/dev-python/tempita/tempita-0.5.3.ebuild
+++ b/dev-python/tempita/tempita-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.3.ebuild,v 1.5 2015/01/25 21:19:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tempita/tempita-0.5.3.ebuild,v 1.6 2015/01/26 10:29:08 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tlslite/tlslite-0.4.3.ebuild b/dev-python/tlslite/tlslite-0.4.3.ebuild
deleted file mode 100644
index a569c34daf57..000000000000
--- a/dev-python/tlslite/tlslite-0.4.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/tlslite-0.4.3.ebuild,v 1.3 2013/05/20 08:39:19 ago Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1"
-HOMEPAGE="http://trevp.net/tlslite/ http://pypi.python.org/pypi/tlslite"
-SRC_URI="http://github.com/trevp/tlslite/downloads/${P}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-#Refrain for now setting IUSE test and deps of test given test restricted.
-IUSE="doc gmp"
-RESTRICT="test"
-
-DEPEND=">=dev-libs/cryptlib-3.3.3[python]
-	|| (
-		dev-python/m2crypto
-		dev-python/pycrypto
-	)
-	gmp? ( dev-python/gmpy )"
-RDEPEND="${DEPEND}"
-
-# This would serve as a test phase if ever comes the time it passes all requirements; currently hangs
-#src_test() {
-#	testing() {
-#		pushd $(ls -d build-"${PYTHON_ABI}"/lib/) > /dev/null
-#		PYTHONPATH=. "${S}"/tests/tlstest.py client localhost:4443 .
-#		PYTHONPATH=. "${S}"/tests/tlstest.py server localhost:4443 .
-#		popd > /dev/null
-#	}
-#	python_execute_function testing
-#}
-
-src_install(){
-	distutils_src_install
-
-	use doc && dohtml -r docs/
-}
diff --git a/dev-python/tox/tox-1.8.1.ebuild b/dev-python/tox/tox-1.8.1.ebuild
index fbb9c84da2ad..a75e522ee156 100644
--- a/dev-python/tox/tox-1.8.1.ebuild
+++ b/dev-python/tox/tox-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.8.1.ebuild,v 1.2 2015/01/22 08:47:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.8.1.ebuild,v 1.3 2015/01/26 10:28:13 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
index 24667e166398..21dbb076f9b0 100644
--- a/dev-python/translationstring/translationstring-1.3.ebuild
+++ b/dev-python/translationstring/translationstring-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/translationstring/translationstring-1.3.ebuild,v 1.5 2015/01/22 08:44:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/translationstring/translationstring-1.3.ebuild,v 1.6 2015/01/26 10:28:31 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 26bb803c3f07..1f02b4b677e6 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,2 +1 @@
-DIST xmltodict-0.9.0.tar.gz 37078 SHA256 cc506d660e1d231efa9b766f88cec2ced05394ce94adabddf7b149da7712e719 SHA512 91e9bb334910f63fd488e48a62c2ffd2d2fe99608ee63bb4ed5d352310bdf1f9a73cc801baa3fa2f2a2ef9ea589cea2e94cef515d5498e58f67c046520a513aa WHIRLPOOL f34831202667ba512698234b4f99fe2f2d49ddad5aae7f8000dd624c527d673c9cc15d9ce60de21c554b923460ec6687d5c00820d3992e89b1ac25db0a5a145d
 DIST xmltodict-0.9.1.tar.gz 37721 SHA256 ba676bec7a2a2e8be0565c26807db8661f1bfd49b5fd7b2d89731270137f49f3 SHA512 4dd3ef1424f74185d37e41c6860c37c63e4d11735bd5e111025429b66ae2bff8b07a30f245dc40c85dc3e657fdfd3e91d7074adc69fc0d4b7bde1bf16d6010ac WHIRLPOOL d4dd1e1af07778757f2de80bc606656ef1488589d50f8da7d68894b9c66e7a6b3f6bc7a5ad0c35aa93e661ec9fadae028261df59dd79b9b922c274eb29d27c02
diff --git a/dev-python/xmltodict/xmltodict-0.9.0.ebuild b/dev-python/xmltodict/xmltodict-0.9.0.ebuild
deleted file mode 100644
index 0afc17b7616e..000000000000
--- a/dev-python/xmltodict/xmltodict-0.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xmltodict/xmltodict-0.9.0.ebuild,v 1.1 2014/04/25 05:09:43 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
-inherit distutils-r1
-
-DESCRIPTION="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.python.org/pypi/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# avoid setuptools sandbox issues, bug #489726
-	sed -i '/setup_requires/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest
index 39eeda3f58fd..ddc62cb5a92c 100644
--- a/dev-ruby/color/Manifest
+++ b/dev-ruby/color/Manifest
@@ -1,2 +1 @@
-DIST color-1.4.1.gem 49664 SHA256 145980ad0ae549debf17ddeca30665b2745b573297f9802f04ef8321393e6431 SHA512 750e1cbc793f56a9654d118966a8fb3b3f094b22178951a87fc919ffbaacf2e26d96be45d7f470a1fa158cba5f96b2540ed89931d85cce778b62be2df470c7d3 WHIRLPOOL d8093e9479d3f4892b082edb63c422f1b278cf21c8b5eb538dc4eb53c183458f6f284b2254cb340261808d17753e836c67378a69deb49fbf86a94493d14d84fb
 DIST color-1.7.1.tar.gz 40780 SHA256 36deaa02dc327452f7ac4e35fe1ae1c2d7faa9bb2a0b0d9b6c1a112fe29d7f7b SHA512 78e0b4c171ab2754531cf0874088e7b9cc495957fa3de5c3899f176fd629f1677f1fd9bdb68c0a3784cd5939242f8a4127cda8932f114800052c973431739f07 WHIRLPOOL eb719f91162c15aef89f81e263940c41941e18f0fd7007b27377ca3fd781239951eb0dca80df142bb2f22a84e9917ffd322cb9640a684e95227c43d6f0678256
diff --git a/dev-ruby/color/color-1.4.1-r1.ebuild b/dev-ruby/color/color-1.4.1-r1.ebuild
deleted file mode 100644
index 5d37920616a0..000000000000
--- a/dev-ruby/color/color-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/color/color-1.4.1-r1.ebuild,v 1.8 2014/10/30 13:50:11 mrueg Exp $
-
-EAPI="2"
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Colour management with Ruby"
-HOMEPAGE="http://color.rubyforge.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( >=dev-ruby/hoe-2.5.0 )
-	test? (
-		>=dev-ruby/hoe-2.5.0
-	)"
diff --git a/dev-ruby/color/color-1.7.1.ebuild b/dev-ruby/color/color-1.7.1.ebuild
index fe2d8906cbd0..bf0d37b157cf 100644
--- a/dev-ruby/color/color-1.7.1.ebuild
+++ b/dev-ruby/color/color-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/color/color-1.7.1.ebuild,v 1.4 2015/01/22 08:43:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/color/color-1.7.1.ebuild,v 1.5 2015/01/26 10:31:17 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/halostatue/color/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild
index 01a1fd96f195..dc041043fed9 100644
--- a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild
+++ b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild,v 1.2 2014/08/26 20:12:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild,v 1.3 2015/01/26 13:00:13 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64"
 IUSE=""
 
+ruby_add_rdepend "dev-ruby/thread_safe"
+
 all_ruby_prepare() {
 	# Remove dependency on devtools
 	sed -i -e '/devtools\/spec_helper/d' spec/spec_helper.rb || die
diff --git a/dev-ruby/ffi/ffi-1.9.6-r1.ebuild b/dev-ruby/ffi/ffi-1.9.6-r1.ebuild
index b21ab7736923..b0f4ab5eddb2 100644
--- a/dev-ruby/ffi/ffi-1.9.6-r1.ebuild
+++ b/dev-ruby/ffi/ffi-1.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.6-r1.ebuild,v 1.3 2015/01/22 08:46:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.6-r1.ebuild,v 1.4 2015/01/26 10:31:38 ago Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="http://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 RDEPEND+=" virtual/libffi"
 DEPEND+=" virtual/libffi"
diff --git a/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild b/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild
index 5037014c9e9e..18d18aa97685 100644
--- a/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild
+++ b/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild,v 1.4 2014/11/03 20:05:09 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild,v 1.5 2015/01/26 12:52:44 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -23,4 +23,5 @@ ruby_add_rdepend "dev-ruby/nokogiri"
 
 all_ruby_prepare() {
 	sed -i -e '/guard-rspec/d' ${PN}.gemspec || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
 }
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 2d0df12f3b84..319fd5362a47 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,2 +1,3 @@
 DIST anjuta-3.12.0.tar.xz 6201372 SHA256 880efe7274d015a07aec2c5bdfebe27e313f76f1f524bd9309b5e3ecd29bda1f SHA512 b601210586ce6b4ab4cb2a21a4a4f7cb5d44ddbb615448cd71d4a203ad20b0d4f95cbc31d276cf6b6df9e377e2b98c790b97c1bd3cda5f89539d15afeb375f40 WHIRLPOOL 3926fd26a34158a2adeff498bcd585bdc58a98c8a53ac9b0bd7bcd47e12ad6841c961277928ff384049f9e1f70ecc5a18c7da3271212eaecaa9c10c7b1b9d417
 DIST anjuta-3.14.0.tar.xz 6197480 SHA256 b1aac2d4c35891b23c9bc3f168bf2845e02d0a438742478c98e450950d82b5e5 SHA512 4be2e893f75bad4dce35c7e3bdc2851d559026b57d87536b3ed0f95a439cf32d533c68d60b4b7639f322df6df0dd33a86a74219a06b7c7a4d0e593f59ad9c52d WHIRLPOOL 731ef34b1575d189675b0ea696806ddcee9ff892478ab70f61d752c1243a1334feab25e1716fec1c8ae659e639c48df6abd659c0c3721badb5752577dad08967
+DIST anjuta-3.14.1.tar.xz 6310008 SHA256 b26cd75ddb603c3cca4348e277d17360e511d75bd77ee2ef52047b75408e617b SHA512 474e5db8799c99645314c8822b97c375f91102d6617e2b8d5e3d856df5d51e11508ca76405ee333a1c208255b98c90c2816de0f2df9f70523d98a2aa0aa3837e WHIRLPOOL 928d6eefca146869a1e7ff004e0f4a990789758416e7209fa62e9dac8b1eafe53ee61d2c6a41d4dfc847cbd3411bd4032a12d3741287488438d6339cabbd459c
diff --git a/dev-util/anjuta/anjuta-3.14.1.ebuild b/dev-util/anjuta/anjuta-3.14.1.ebuild
new file mode 100644
index 000000000000..d13b0a54294f
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.14.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-3.14.1.ebuild,v 1.1 2015/01/26 14:15:08 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+# libanjuta-language-vala.so links to a specific slot of libvala; we want to
+# avoid automagic behavior.
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
+
+inherit gnome2 flag-o-matic readme.gentoo python-single-r1 vala
+
+DESCRIPTION="A versatile IDE for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: make python dependency non-automagic
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/gdl-3.5.5:3=
+	>=x11-libs/gtksourceview-3:3.0
+
+	sys-devel/autogen
+
+	>=gnome-extra/libgda-5:5=
+	dev-util/ctags
+
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	${PYTHON_DEPS}
+
+	devhelp? ( >=dev-util/devhelp-3.7.4:= )
+	glade? ( >=dev-util/glade-3.12:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	subversion? (
+		>=dev-vcs/subversion-1.8:=
+		>=net-libs/serf-1.2:1=
+		>=dev-libs/apr-1:=
+		>=dev-libs/apr-util-1:= )
+	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.1
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!dev-libs/gnome-build
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	app-text/yelp-tools
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# yelp-tools, gi-common and gnome-common are required by eautoreconf
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use vala; then
+		DISABLE_AUTOFORMATTING="yes"
+		DOC_CONTENTS="To create a generic vala project you will need to specify
+desired valac versioned binary to be used, to do that you
+will need to:
+1. Go to 'Build' -> 'Configure project'
+2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
+'Configure options'."
+	fi
+
+	# COPYING is used in Anjuta's help/about entry
+	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+
+	# Conflicts with -pg in a plugin, bug #266777
+	filter-flags -fomit-frame-pointer
+
+	# python2.7-configure in Fedora vs. python-configure in Gentoo
+	sed -e 's:$PYTHON-config:$PYTHON$PYTHON_VERSION-config:g' \
+		-i plugins/am-project/tests/anjuta.lst || die "sed failed"
+
+	# Do not build benchmarks, they are not installed and for dev purpose only
+	sed -e '/SUBDIRS =/ s/benchmark//' \
+		-i plugins/symbol-db/Makefile.{am,in} || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-neon \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable devhelp plugin-devhelp) \
+		$(use_enable glade plugin-glade) \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable subversion plugin-subversion) \
+		$(use_enable subversion serf) \
+		$(use_enable terminal plugin-terminal) \
+		$(use_enable vala)
+}
+
+src_install() {
+	# COPYING is used in Anjuta's help/about entry
+	docompress -x "/usr/share/doc/${PF}/COPYING"
+
+	# Anjuta uses a custom rule to install DOCS, get rid of it
+	gnome2_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
+
+	use vala && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use vala && readme.gentoo_print_elog
+}
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index c5027f532c22..32ad5a24d818 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -7,6 +7,5 @@
     <flag name="glade">Build glade plugin for anjuta</flag>
     <flag name="packagekit">Use packagekit to search for missing tools</flag>
     <flag name="terminal">Enable terminal plugin based on <pkg>x11-libs/vte</pkg></flag>
-    <flag name="vala">Enable support for the Vala programming language</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-util/bam/bam-0.4.0-r1.ebuild b/dev-util/bam/bam-0.4.0-r1.ebuild
index 9cbbb5f55252..2e05b3260bd2 100644
--- a/dev-util/bam/bam-0.4.0-r1.ebuild
+++ b/dev-util/bam/bam-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bam/bam-0.4.0-r1.ebuild,v 1.2 2015/01/09 13:42:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bam/bam-0.4.0-r1.ebuild,v 1.3 2015/01/26 10:04:05 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/downloads/matricks/${PN}/${P}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-lang/lua:="
diff --git a/dev-util/bam/bam-0.4.0.ebuild b/dev-util/bam/bam-0.4.0.ebuild
deleted file mode 100644
index b22644bf3f16..000000000000
--- a/dev-util/bam/bam-0.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bam/bam-0.4.0.ebuild,v 1.5 2012/07/22 17:32:58 pacho Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit eutils python toolchain-funcs
-
-DESCRIPTION="Fast and flexible Lua-based build system"
-HOMEPAGE="http://matricks.github.com/bam/"
-SRC_URI="http://github.com/downloads/matricks/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="dev-lang/lua"
-DEPEND="${RDEPEND}
-	doc? ( dev-lang/python )
-	test? ( dev-lang/python )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/Makefile "${S}"/Makefile || die "cp failed"
-	epatch "${FILESDIR}"/${PV}/${P}-test.py.patch
-	python_convert_shebangs -r 2 .
-	tc-export CC
-}
-
-src_compile() {
-	emake ${PN}
-	if use doc; then
-		$(PYTHON) scripts/gendocs.py || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-	if use doc; then
-		dohtml docs/${PN}{.html,_logo.png}
-	fi
-}
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 42b170446b89..1d8ff4e1c09e 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,2 +1 @@
-DIST cdiff-0.9.3.tar.gz 29355 SHA256 893ffb90d3b9723318bfc9fd02bcefae69d9bbb1f7ac99e357bbee87dc269e6e SHA512 c4b980d0948b34ed978c1063101ca27a374ae69b1a5a525a8cabaa8d344a58651a6728b92b433bc1561265d5b201a93e601d9c5cb5e843d696d04f465ef9fc8c WHIRLPOOL 0c4013ca742534b205bd619d4d01604bbc4aeb6b56dadfcf5e686e56c79224b468c766ade0dcaf8491cd7a1f355c32745c65e02f402116b4b2741fef7c717fe2
 DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce
diff --git a/dev-util/cdiff/cdiff-0.9.3.ebuild b/dev-util/cdiff/cdiff-0.9.3.ebuild
deleted file mode 100644
index bae7d3afe45d..000000000000
--- a/dev-util/cdiff/cdiff-0.9.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.3.ebuild,v 1.7 2014/11/14 07:10:58 jlec Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-DOCS=( CHANGES README.rst )
-
-inherit distutils-r1
-
-if [[ "${PV}" != *"9999"* ]] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-else
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
-	inherit git-r3
-fi
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
-
-python_test() {
-	python_export_best
-
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/cdiff/cdiff-0.9.6.ebuild b/dev-util/cdiff/cdiff-0.9.6.ebuild
index c84598ee994e..be8df8ff268e 100644
--- a/dev-util/cdiff/cdiff-0.9.6.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.6.ebuild,v 1.2 2015/01/09 13:46:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.6.ebuild,v 1.3 2015/01/26 09:59:52 ago Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 inherit distutils-r1
 
 if [[ "${PV}" != *"9999"* ]] ; then
-	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 else
 	KEYWORDS=""
diff --git a/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild b/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild
index dad471d158c0..f66667e87de5 100644
--- a/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild
+++ b/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild,v 1.2 2015/01/09 13:46:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake-fedora/cmake-fedora-1.3.0.ebuild,v 1.3 2015/01/26 10:12:01 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/c/m/cmake-fedora/${P}-Source.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/comparator/comparator-2.10.ebuild b/dev-util/comparator/comparator-2.10.ebuild
index 0e0622124522..76375054d86a 100644
--- a/dev-util/comparator/comparator-2.10.ebuild
+++ b/dev-util/comparator/comparator-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/comparator/comparator-2.10.ebuild,v 1.5 2015/01/18 08:35:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/comparator/comparator-2.10.ebuild,v 1.6 2015/01/26 09:41:51 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-util/diffuse/diffuse-0.4.8.ebuild b/dev-util/diffuse/diffuse-0.4.8.ebuild
index 98d43b4b53c4..ecb2d79abd32 100644
--- a/dev-util/diffuse/diffuse-0.4.8.ebuild
+++ b/dev-util/diffuse/diffuse-0.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.4.8.ebuild,v 1.2 2015/01/09 13:40:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.4.8.ebuild,v 1.3 2015/01/26 09:52:50 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-solaris"
+KEYWORDS="amd64 x86 ~x64-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index cb27b688002e..07a9f8a22a96 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-devel-docs-3.12.3.tar.xz 10199720 SHA256 c8e13e3d94aa28de5d09645abf9ec72f19a37af87fbf5765871dc8a52407c656 SHA512 a677f43ebcf5c5a72360477a451770d5ab5d34384e7e3b023d7d19a0f77b8c9af4afcc54fafb702fde58d8a845595b5a8bf6829dbe95bf316955673418675d66 WHIRLPOOL 18f7c6009cce7edd4ad8453a13bf1feb48949df2e183697d6c831adc7bf02d4d512e7feb0eabbeb0cca7b70807344b0fb15c8b6a660649bfb51da72273ca498f
 DIST gnome-devel-docs-3.14.3.tar.xz 8523916 SHA256 3d36bd8c07ff7bc8092223aa8f366cc42dfd9a091ea0ce720caaa77254284a70 SHA512 5f61fcb5520a215e0621f7477e7a9672e13ac5c978bf93ae720dd69d600e22d6217c92bb751a264ec011624ca3557e9e0ba27e2ba60083ee3bb854da7157a336 WHIRLPOOL ae455435b83292fad227fc40d4844277c82253acef0e25b9fc0a90cc4a507d5ae4392faec7efe1a9547c3b7d6f829e1f1eab0face580d7b454284e54ec91f74a
+DIST gnome-devel-docs-3.14.4.tar.xz 8527376 SHA256 515a940239223f9f1bbbbe81258c4e1f37a6a225197c1075411c0afac76e229b SHA512 16e941ff150c8c25b36c69cfe45dab41e45e51fbdf7dcc8bd6285ba3474efd3914066ec9d86b2d1e12677392b8724f2591c3157b796ee453d0c1ac1aae919910 WHIRLPOOL 2cf02eed1c9fbc95d2abbf04c281c488ec7ff921973df5dd8513e9ff4457b2036c20913cf0e1e04e79968511109014eb74c81abef8ab6ce769537a5cf935efa8
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild
new file mode 100644
index 000000000000..5297fef39333
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gnome-devel-docs/gnome-devel-docs-3.14.4.ebuild,v 1.1 2015/01/26 14:25:12 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="http://developer.gnome.org/"
+
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	gnome2_src_configure ITSTOOL=$(type -P true)
+}
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r1.ebuild
deleted file mode 100644
index b697305816aa..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r1.ebuild,v 1.2 2014/04/25 20:35:37 johu Exp $
-
-EAPI=5
-
-inherit kde4-base
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="http://www.kdevelop.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND=""
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
index 1f769416c20c..91fb050a259b 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild,v 1.2 2015/01/22 08:44:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild,v 1.3 2015/01/26 10:01:26 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ if [[ $PV == *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
diff --git a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
index e39ba4175636..1c369dafe9b6 100644
--- a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.9-r1.ebuild,v 1.4 2015/01/22 18:30:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.9-r1.ebuild,v 1.5 2015/01/26 09:40:53 ago Exp $
 
 EAPI="5"
 inherit autotools eutils linux-info multilib user java-pkg-opt-2
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="java pch qt4"
 
 DEPEND=">=dev-libs/popt-1.7-r1
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 3441d0b96d01..a3ca459db4a4 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,2 +1 @@
-DIST RBTools-0.6.2.tar.gz 109583 SHA256 86ad4e3fc92abe39d7a3178a34cbc60992c7dac02d621feb574bda18fa1710fd SHA512 c490ba5d961caf8fd0613fe22b724ab918a38d955c3fcef7d2e9004aa59b6ac4b84c10fe0af8e15dd1f57f5e9a7735eaf2dc2191c7ed7523b13ab56b65bc28cc WHIRLPOOL 0cba57562ade47ecc8fc761fb1b735d0ec05b1101a8ece3ab032d3ac97bea2c5f6b68f1c883987a4834237a2814b639e2c1d9789147f600a67c8819ab119b3ba
 DIST RBTools-0.6.3.tar.gz 110117 SHA256 5f61ce90f73d086f6a6242c0ed30c55a20a18f4174e39124517cfe32a74a556f SHA512 bf0afc303b86f393349542e02f7f1c540e3fef098ff287d92b919ccff1afacc0b8af598e49faff11401fd8cf24ba6f683b9a7b6d9df376875a518713e7e0c8c0 WHIRLPOOL 40987855541c30a898dc75c6e94b19359ae66978f7a68edbfd401f5f19238df5fff548c6cf399ddbf418007ba733a01493a3df1f86599cc9c8745ed1b67977b3
diff --git a/dev-util/rbtools/rbtools-0.6.2.ebuild b/dev-util/rbtools/rbtools-0.6.2.ebuild
deleted file mode 100644
index 89213dc678b4..000000000000
--- a/dev-util/rbtools/rbtools-0.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.6.2.ebuild,v 1.3 2014/08/16 10:32:26 johu Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="http://www.reviewboard.org/"
-SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS NEWS README )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-0.6.3.ebuild b/dev-util/rbtools/rbtools-0.6.3.ebuild
index ad30cd0cc9c4..774b8de2b514 100644
--- a/dev-util/rbtools/rbtools-0.6.3.ebuild
+++ b/dev-util/rbtools/rbtools-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.6.3.ebuild,v 1.2 2015/01/22 08:44:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.6.3.ebuild,v 1.3 2015/01/26 10:01:44 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_compon
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/re2c/re2c-0.13.7.5.ebuild b/dev-util/re2c/re2c-0.13.7.5.ebuild
index 70bbaf980a9b..eb50631351bc 100644
--- a/dev-util/re2c/re2c-0.13.7.5.ebuild
+++ b/dev-util/re2c/re2c-0.13.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/re2c/re2c-0.13.7.5.ebuild,v 1.5 2015/01/22 08:45:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/re2c/re2c-0.13.7.5.ebuild,v 1.6 2015/01/26 10:30:22 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 src_prepare() {
 	epatch_user
diff --git a/dev-vcs/hg-git/hg-git-0.7.0.ebuild b/dev-vcs/hg-git/hg-git-0.7.0.ebuild
index 67d916b5e8f4..d8394bfcbda0 100644
--- a/dev-vcs/hg-git/hg-git-0.7.0.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/hg-git-0.7.0.ebuild,v 1.2 2015/01/09 13:42:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hg-git/hg-git-0.7.0.ebuild,v 1.3 2015/01/26 09:44:46 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-vcs/mr/mr-1.20141024.ebuild b/dev-vcs/mr/mr-1.20141024.ebuild
index 2296edc8f1bb..61f44462c4db 100644
--- a/dev-vcs/mr/mr-1.20141024.ebuild
+++ b/dev-vcs/mr/mr-1.20141024.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mr/mr-1.20141024.ebuild,v 1.2 2015/01/09 13:42:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mr/mr-1.20141024.ebuild,v 1.3 2015/01/26 10:42:46 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/joeyh/myrepos/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild b/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild
index 4c21c4beedd7..b59bfb71a5b3 100644
--- a/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild
+++ b/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild,v 1.2 2015/01/22 08:41:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild,v 1.3 2015/01/26 09:47:53 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gamediameter/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-games/guichan-0.8[opengl,sdl]
diff --git a/games-arcade/digger/digger-20140423.ebuild b/games-arcade/digger/digger-20140423.ebuild
index e2c73bceca47..c06cb6101022 100644
--- a/games-arcade/digger/digger-20140423.ebuild
+++ b/games-arcade/digger/digger-20140423.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/digger/digger-20140423.ebuild,v 1.2 2015/01/22 08:40:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/digger/digger-20140423.ebuild,v 1.3 2015/01/26 09:51:23 ago Exp $
 
 EAPI=5
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="https://gitorious.org/digger/digger/archive/8d5769c59d68b37a5b30aa7a9cb
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 DEPEND="media-libs/libsdl[X,video]
 	x11-libs/libX11"
diff --git a/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild b/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
index 5d0254751ece..e85309dfd58c 100644
--- a/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
+++ b/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild,v 1.2 2015/01/22 08:41:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild,v 1.3 2015/01/26 09:48:10 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild
index b9dc7b37ed65..0e2ae6969679 100644
--- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild
+++ b/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild,v 1.2 2015/01/22 08:41:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild,v 1.3 2015/01/26 09:48:27 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://hectigo.net/puskutraktori/whichwayisup/${MY_P}.zip"
 
 LICENSE="GPL-2 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-board/xboard/xboard-4.8.0.ebuild b/games-board/xboard/xboard-4.8.0.ebuild
index 894dff971f1c..91690365f827 100644
--- a/games-board/xboard/xboard-4.8.0.ebuild
+++ b/games-board/xboard/xboard-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.8.0.ebuild,v 1.2 2015/01/22 08:45:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.8.0.ebuild,v 1.3 2015/01/26 09:52:15 ago Exp $
 
 EAPI=5
 inherit autotools eutils fdo-mime gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/xboard/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="Xaw3d +default-font gtk nls zippy"
 RESTRICT="test" #124112
 
diff --git a/games-emulation/stella/stella-4.0.ebuild b/games-emulation/stella/stella-4.0.ebuild
index f0f22a699259..d8c64ff12ea7 100644
--- a/games-emulation/stella/stella-4.0.ebuild
+++ b/games-emulation/stella/stella-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-4.0.ebuild,v 1.3 2015/01/22 08:45:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-4.0.ebuild,v 1.4 2015/01/26 09:51:57 ago Exp $
 
 EAPI=5
 inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/stella/${P}-src.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="joystick"
 
 DEPEND="media-libs/libsdl2[joystick?,opengl,video]
diff --git a/games-fps/doomsday/doomsday-1.14.5.ebuild b/games-fps/doomsday/doomsday-1.14.5.ebuild
index a55f781417de..fe6bcbb4e64c 100644
--- a/games-fps/doomsday/doomsday-1.14.5.ebuild
+++ b/games-fps/doomsday/doomsday-1.14.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.14.5.ebuild,v 1.3 2015/01/22 08:42:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.14.5.ebuild,v 1.4 2015/01/26 09:48:46 ago Exp $
 
 # TODO: fmod support broken (deng_fmod)
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
 # we need python at build time, so
 # snowberry? ( ${PYTHON_REQUIRED_USE} )
diff --git a/games-misc/openmsx/openmsx-0.3.1-r1.ebuild b/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
index 077a433d6ec6..08bfa51939f5 100644
--- a/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
+++ b/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/openmsx/openmsx-0.3.1-r1.ebuild,v 1.4 2015/01/22 08:42:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/openmsx/openmsx-0.3.1-r1.ebuild,v 1.5 2015/01/26 09:49:03 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://bundles.openttdcoop.org/openmsx/releases/${PV}/${P}-source.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
index 80e9a328494c..18be906f3827 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild,v 1.2 2015/01/22 08:42:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild,v 1.3 2015/01/26 09:49:21 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
index b60037c309bb..436a8d5bded2 100644
--- a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
+++ b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild,v 1.4 2015/01/22 08:42:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild,v 1.5 2015/01/26 09:51:40 ago Exp $
 
 EAPI=5
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/jools/jools-0.20-r2.ebuild b/games-puzzle/jools/jools-0.20-r2.ebuild
index b7f98eb75e3d..3e5b9a6ba11c 100644
--- a/games-puzzle/jools/jools-0.20-r2.ebuild
+++ b/games-puzzle/jools/jools-0.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jools/jools-0.20-r2.ebuild,v 1.2 2015/01/22 08:39:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jools/jools-0.20-r2.ebuild,v 1.3 2015/01/26 09:49:38 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild b/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
index 7013c8ae02a9..eee9d55f584f 100644
--- a/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
+++ b/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild,v 1.4 2015/01/22 08:42:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild,v 1.5 2015/01/26 09:50:13 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://emhsoft.com/dh/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 CC-SA-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild
index 23aa42fc0d2e..4c97d97db53a 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild,v 1.5 2015/01/22 08:39:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild,v 1.6 2015/01/26 09:49:56 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_6 python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/freedroid/freedroidRPG-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="opengl vorbis"
 
 RDEPEND="media-libs/libsdl[opengl?,video]
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5.ebuild b/games-rpg/wastesedge/wastesedge-0.3.5.ebuild
index 3ad6a7b49300..4c1c029c9b2c 100644
--- a/games-rpg/wastesedge/wastesedge-0.3.5.ebuild
+++ b/games-rpg/wastesedge/wastesedge-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/wastesedge/wastesedge-0.3.5.ebuild,v 1.4 2015/01/22 08:42:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/wastesedge/wastesedge-0.3.5.ebuild,v 1.5 2015/01/26 09:50:30 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 RESTRICT="userpriv"
 
diff --git a/games-server/cyphesis/cyphesis-0.6.2.ebuild b/games-server/cyphesis/cyphesis-0.6.2.ebuild
index 84a082699408..6228203d48ac 100644
--- a/games-server/cyphesis/cyphesis-0.6.2.ebuild
+++ b/games-server/cyphesis/cyphesis-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.6.2.ebuild,v 1.7 2015/01/22 08:42:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/cyphesis/cyphesis-0.6.2.ebuild,v 1.8 2015/01/26 09:50:49 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-server/monopd/monopd-0.9.7.ebuild b/games-server/monopd/monopd-0.9.7.ebuild
index b0040b04a36e..20070f2add89 100644
--- a/games-server/monopd/monopd-0.9.7.ebuild
+++ b/games-server/monopd/monopd-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.7.ebuild,v 1.3 2015/01/17 13:40:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.7.ebuild,v 1.4 2015/01/26 09:51:06 ago Exp $
 
 EAPI=5
 inherit autotools eutils systemd games
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/gtkatlantic/monopd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
diff --git a/games-simulation/qct/qct-0.7-r1.ebuild b/games-simulation/qct/qct-0.7-r1.ebuild
index f07fac7880c1..d23138f7c594 100644
--- a/games-simulation/qct/qct-0.7-r1.ebuild
+++ b/games-simulation/qct/qct-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/qct/qct-0.7-r1.ebuild,v 1.2 2015/01/22 08:45:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/qct/qct-0.7-r1.ebuild,v 1.3 2015/01/26 09:47:36 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://www.sourcefiles.org/Games/Role_Play/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=">=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]"
diff --git a/games-sports/ski/ski-6.8.ebuild b/games-sports/ski/ski-6.8.ebuild
index 0b9fbf0f2d8c..0f5065f5e780 100644
--- a/games-sports/ski/ski-6.8.ebuild
+++ b/games-sports/ski/ski-6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.8.ebuild,v 1.3 2015/01/22 08:40:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/ski/ski-6.8.ebuild,v 1.4 2015/01/26 09:47:19 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-strategy/lightyears/lightyears-1.4-r1.ebuild b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
index f691d2ae4f6b..0374d084212a 100644
--- a/games-strategy/lightyears/lightyears-1.4-r1.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4-r1.ebuild,v 1.2 2015/01/22 08:45:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4-r1.ebuild,v 1.3 2015/01/26 09:47:02 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://www.jwhitham.org.uk/20kly/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
deleted file mode 100644
index db427421470b..000000000000
--- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r2.ebuild,v 1.7 2012/05/05 06:25:18 jdhore Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-inherit eutils gnome2 autotools
-
-DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
-HOMEPAGE="http://live.gnome.org/GPointingDeviceSettings"
-SRC_URI="mirror://sourceforge.jp/gsynaptics/45812/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# recent enough x11-base/xorg-server required
-RDEPEND=">=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.14.0:2
-	>=gnome-base/gconf-2.24:2
-	>=gnome-base/gnome-settings-daemon-2.28
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libX11-1.2.0
-	!<=x11-base/xorg-server-1.6.0
-	!gnome-extra/gsynaptics"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5"
-
-DOCS="MAINTAINERS NEWS TODO"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-crash.patch" \
-		"${FILESDIR}/${P}-plugin.patch" \
-		"${FILESDIR}/${P}-reboot.patch" \
-		"${FILESDIR}/${P}-gtk22.patch" \
-		"${FILESDIR}/${P}-gsd-crash.patch" \
-		"${FILESDIR}/${P}-gsd-3.2-fix.patch"
-	sed 's|\(^GPDS_CFLAGS=.*-D[A-Z_]*_DISABLE_DEPRECATED.*\)|#\1|' \
-		-i configure.ac || die
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
index a08c5a7f73a8..fe06d1d47606 100644
--- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild,v 1.2 2014/12/27 19:24:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild,v 1.3 2015/01/26 10:03:28 ago Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/gsynaptics/45812/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # recent enough x11-base/xorg-server required
diff --git a/kde-misc/customizable-weather/Manifest b/kde-misc/customizable-weather/Manifest
index 53d189a5d028..aeda837be68c 100644
--- a/kde-misc/customizable-weather/Manifest
+++ b/kde-misc/customizable-weather/Manifest
@@ -1,2 +1 @@
-DIST 98925-cwp-1.11.1.tar.bz2 188293 SHA256 457f3274ff9e2cec66c50d6135a603e9f93890ea165e05a0a2f82c5804ed3037 SHA512 8cffadc03ec25025351c2fa53b1c546a3f8dfb92798528af3f569b4af3243651f2d0afc9ff6e2ab3d58e425d92610987db52d05c923b5580e9713e187692ed85 WHIRLPOOL 8f1c2aebc865882eea9bef2658edb87b3c252769874fae04cb6161b131cc7b09c20adcd2df30aee31cc9b4c08a30e1f019c7ac052f1117c27be96d11e1a74c18
 DIST 98925-cwp-1.12.0.tar.bz2 188131 SHA256 62d91e7bcca086525bf124b37c1478a55e741e7ecfde76053195bbb097f99ea1 SHA512 3ebf6ac3f1fe3b8e708aeabe648408e68cb492a89a9f41d4f43cc6316367ddbec87ae544f3fdad8aaa4ec43e9c88589c7ca9f1b24203f3d7fb9f048dc7759d7d WHIRLPOOL f3655a70b243f85339af65e9f764c116be692bb84efbc3da37dd68f474278ddf9d9c22f84ed4751da5fafe605234c5ee1dd414467e8beca57caef216ebd2b6d4
diff --git a/kde-misc/customizable-weather/customizable-weather-1.11.1.ebuild b/kde-misc/customizable-weather/customizable-weather-1.11.1.ebuild
deleted file mode 100644
index ac3512709d2e..000000000000
--- a/kde-misc/customizable-weather/customizable-weather-1.11.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/customizable-weather/customizable-weather-1.11.1.ebuild,v 1.3 2014/10/30 10:05:21 ago Exp $
-
-EAPI=5
-
-KDE_LINGUAS="br de el es fr hu it nb nl pl ro ru sr sr@Latn tr zh_CN"
-inherit kde4-base
-
-MY_P="cwp-${PV}"
-
-DESCRIPTION="KDE4 weather plasmoid. It aims to be highly customizable, but is a little harder to setup"
-HOMEPAGE="http://www.kde-look.org/content/show.php/Customizable+Weather+Plasmoid?content=98925"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/98925-${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdebase_dep plasma-workspace)
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/kde-misc/customizable-weather/customizable-weather-1.12.0.ebuild b/kde-misc/customizable-weather/customizable-weather-1.12.0.ebuild
index b1ea89ed652b..8ebc7a8a0ea0 100644
--- a/kde-misc/customizable-weather/customizable-weather-1.12.0.ebuild
+++ b/kde-misc/customizable-weather/customizable-weather-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/customizable-weather/customizable-weather-1.12.0.ebuild,v 1.2 2015/01/09 13:43:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/customizable-weather/customizable-weather-1.12.0.ebuild,v 1.3 2015/01/26 10:02:05 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.kde-look.org/content/show.php/Customizable+Weather+Plasmoid
 SRC_URI="http://www.kde-look.org/CONTENT/content-files/98925-${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/kde-misc/kanyremote/Manifest b/kde-misc/kanyremote/Manifest
index f17bde348039..b3e81d7685f0 100644
--- a/kde-misc/kanyremote/Manifest
+++ b/kde-misc/kanyremote/Manifest
@@ -1,3 +1 @@
-DIST kanyremote-6.3.2.tar.gz 301688 SHA256 1c9f1118c4fc9ac91d5056f25eec5437a5f5aa17e02f33f859be703a7194b1b5 SHA512 610944540d8c421070136481f264471ccdd20b5e08641b7251874e3f8e51e7c1476cbe6251c8891d2f027c5b457dd4d32bceee4853d51f460213995c36127054 WHIRLPOOL 0be7cc7412d9600ceebd695926d25dfa1d9927a97e164115d7f7f03bc1ba264a523bf6f9d224793e65cca6e19a3854c227e46b01b7f1c1cd0433ba05b9a90cdd
-DIST kanyremote-6.3.3.tar.gz 310747 SHA256 aeeae5b255b9e5e11c2d97fae57124de4353a0cf1583f43fdf92eb7934bb9224 SHA512 9201f8d91fc95d4605e859f5677dffddc1ba2f2d1a0efcf82250115562deeed4cc35c87073022e2961a220109c1b1b006380a0930d288af7fe67c551c76bda73 WHIRLPOOL f3af6a57ccae07fbe493770809c93e02803e1469d47de4a585a4c15fea4b366d221ee157ac13e89bd5ad8911ad8e94f675e9c7c31e8ff9a3b658c2b809125aed
 DIST kanyremote-6.3.4.tar.gz 310769 SHA256 ea7f11af91609d3bcb18bd064f3ef0a0f107f58debef7423580bdc53e65d6a4f SHA512 a0f488b33d5c7f974615d7e6bf6df8f2ccd0f0dc4307238cd75833848603801801be24805ca89feb2fe2074c1b78b635029994e3efe0f616205da6d05ca7f023 WHIRLPOOL 3a7a5d937dc7befd9b9d347b5dc6f1eb468308763941054326dd68a5b5fb40e9cc814d96d22ce0334642a31b4a2f0354c3c039fe9e94ad73cace71b8d8dc3af4
diff --git a/kde-misc/kanyremote/kanyremote-6.3.2.ebuild b/kde-misc/kanyremote/kanyremote-6.3.2.ebuild
deleted file mode 100644
index aeec5afc2bae..000000000000
--- a/kde-misc/kanyremote/kanyremote-6.3.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.3.2.ebuild,v 1.3 2014/08/25 15:07:44 mrueg Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit autotools python-r1 base
-
-DESCRIPTION="KDE frontend to Anyremote"
-HOMEPAGE="http://anyremote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/anyremote/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="bluetooth"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-mobilephone/anyremote-6.0[bluetooth?]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	kde-base/pykde4:4[${PYTHON_USEDEP}]
-	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_prepare() {
-	# using gettextize no-interactive example from dev-util/bless package
-	cp $(type -p gettextize) "${T}"/
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-	"${T}"/gettextize -f --no-changelog > /dev/null
-
-	# remove deprecated entry
-	sed -e "/Encoding=UTF-8/d" \
-		-i kanyremote.desktop || die "fixing .desktop file failed"
-
-	# fix documentation directory wrt bug #316087
-	sed -i "s/doc\/${PN}/doc\/${PF}/g" Makefile.am
-	eautoreconf
-
-	# disable bluetooth check to avoid errors
-	if ! use bluetooth ; then
-		sed -e "s/usepybluez    = True/usepybluez    = False/" -i kanyremote || die
-	fi
-}
-
-src_install() {
-	default
-
-	python_replicate_script "${D}"/usr/bin/kanyremote
-}
diff --git a/kde-misc/kanyremote/kanyremote-6.3.3.ebuild b/kde-misc/kanyremote/kanyremote-6.3.3.ebuild
deleted file mode 100644
index 344d1841ed50..000000000000
--- a/kde-misc/kanyremote/kanyremote-6.3.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.3.3.ebuild,v 1.1 2014/09/24 00:04:01 mrueg Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-r1 base
-
-DESCRIPTION="KDE frontend to Anyremote"
-HOMEPAGE="http://anyremote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/anyremote/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-mobilephone/anyremote-6.0[bluetooth?]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	kde-base/pykde4:4[${PYTHON_USEDEP}]
-	bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_prepare() {
-	# using gettextize no-interactive example from dev-util/bless package
-	cp $(type -p gettextize) "${T}"/ || die
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
-	"${T}"/gettextize -f --no-changelog > /dev/null || die
-
-	# remove deprecated entry
-	sed -e "/Encoding=UTF-8/d" \
-		-i kanyremote.desktop || die "fixing .desktop file failed"
-
-	# fix documentation directory wrt bug #316087
-	sed -i "s/doc\/${PN}/doc\/${PF}/g" Makefile.am || die
-	eautoreconf
-
-	# disable bluetooth check to avoid errors
-	if ! use bluetooth ; then
-		sed -e "s/usepybluez    = True/usepybluez    = False/" -i kanyremote || die
-	fi
-}
-
-src_install() {
-	default
-
-	python_replicate_script "${D}"/usr/bin/kanyremote
-}
diff --git a/kde-misc/kanyremote/kanyremote-6.3.4.ebuild b/kde-misc/kanyremote/kanyremote-6.3.4.ebuild
index 1c919b551b35..7e1fa7e6fe29 100644
--- a/kde-misc/kanyremote/kanyremote-6.3.4.ebuild
+++ b/kde-misc/kanyremote/kanyremote-6.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.3.4.ebuild,v 1.2 2015/01/09 13:43:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.3.4.ebuild,v 1.3 2015/01/26 10:02:27 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/anyremote/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bluetooth"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-gfx/geeqie/geeqie-1.2-r1.ebuild b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
index 3c15c7d96272..0ff0673433d0 100644
--- a/media-gfx/geeqie/geeqie-1.2-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.2-r1.ebuild,v 1.3 2015/01/22 08:42:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.2-r1.ebuild,v 1.4 2015/01/26 10:43:21 ago Exp $
 
 EAPI=5
 inherit autotools base eutils
@@ -11,7 +11,7 @@ SRC_URI="https://gitorious.org/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc exif jpeg lcms lirc lua tiff xmp"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 5e7e503a821f..8385caa0102c 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,3 +1,2 @@
-DIST gphoto2-2.5.3.tar.bz2 740384 SHA256 719447efe115c519c81f6ddd3e4e7d22795743d93c56bae2d54a0dfbb697d844 SHA512 34cd1db6d26ebc21dcff683e61c557c0055f68ce70fbd76746bf454cd00ca35129025aba640869c175bab0887efc97d871c654f3ff89e7dc88e7f67474c61a08 WHIRLPOOL d4e8e2712abb3421723fc0520cd282111f055ad0eded97d13ce1a0e6e2f482fbb67a3989af431096aeb5e97655c3a6f800bd412ea304f16443a0ac36ec3a0c97
-DIST gphoto2-2.5.4.tar.bz2 740449 SHA256 7da2124dbc4b77f4107437e52aa41301513488195dcd16f62f34eb631aa75c2b SHA512 213a86127937c5a734c08ce6affd11063bd476c2c7db953aa6fa091ee388d383162978bfa80a55caf1a2d0fd72bae51b3581aff9a75a1c155f5075d7052d7b97 WHIRLPOOL ace03a2b3accb65b48b3e6442361dbaacb9552818bf40ce8bb611415773c981f134bb6ca3b096250f74117bb16dc410e8fbe649b1b0c880244b63c319a3e3eae
 DIST gphoto2-2.5.5.tar.bz2 751227 SHA256 54e9aea97d926bfd7ffbe3b91fcf239ce58be0833df2938a385a67fdcadd14b4 SHA512 542653b5285df2941b971e7f158c6fddebddbe42525f5f7dfcb9ad69007568e8c7f60e49f220823aaa0b93fd4ba35b47e3b81ac222a3e666b98f7f01d905ef19 WHIRLPOOL 3f1d8ae18525c262623da24202c56a902ce74644e35efe6e2a7dc4d0ba5f4afeb46e6806820807885b4099614d8fa9f3f5fd059dacc934ea119d7bbe542a2d73
+DIST gphoto2-2.5.6.tar.bz2 756926 SHA256 55e5ec8b2bba4ed358f15eda466f61c79d6f75c220237f821ac687a3ceb336e8 SHA512 8877a87f624c9036f3409e78e9f28cccea2bcb8218d7d46636f19c7576a7480ab0d2fabd0a486b3f75e1be7db93f5121dd90ce806a772963f49f7a0c409ffba1 WHIRLPOOL 28be1adce983b6029cb1c781cbc3f45e1f1bce50085d0bce67c2015eddb10deb24ab55096d76928499af4db4eab0d0fc0a7e7bc9b3fd64a1530a403aad3ae3fc
diff --git a/media-gfx/gphoto2/gphoto2-2.5.3.ebuild b/media-gfx/gphoto2/gphoto2-2.5.3.ebuild
deleted file mode 100644
index 1b1a0892ec53..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.5.3.ebuild,v 1.11 2014/05/17 15:31:35 ago Exp $
-
-EAPI="5"
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-# raise libgphoto to get a proper .pc
-RDEPEND="
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.2[exif?]
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	ncurses? ( dev-libs/cdk )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-src_prepare() {
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure{.ac,} || die
-	eautoreconf
-}
-
-src_configure() {
-	CPPFLAGS="-I/usr/include/cdk" econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with aalib) \
-		$(use_with aalib jpeg) \
-		$(use_with exif libexif auto) \
-		$(use_with ncurses cdk) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
-		install
-
-	dodoc ChangeLog NEWS* README AUTHORS
-	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
-}
diff --git a/media-gfx/gphoto2/gphoto2-2.5.4.ebuild b/media-gfx/gphoto2/gphoto2-2.5.6.ebuild
similarity index 87%
rename from media-gfx/gphoto2/gphoto2-2.5.4.ebuild
rename to media-gfx/gphoto2/gphoto2-2.5.6.ebuild
index 574418a6ae89..42eb877631b4 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.4.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.5.4.ebuild,v 1.8 2014/09/15 08:20:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.5.6.ebuild,v 1.1 2015/01/26 12:12:39 pacho Exp $
 
 EAPI="5"
 inherit autotools
@@ -11,13 +11,13 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
 RDEPEND="
 	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.4[exif?]
+	>=media-libs/libgphoto2-2.5.6[exif?]
 	aalib? (
 		media-libs/aalib
 		virtual/jpeg:0 )
diff --git a/media-gfx/imageworsener/imageworsener-1.2.0.ebuild b/media-gfx/imageworsener/imageworsener-1.2.0.ebuild
index de6924a9c2ca..48b738cad817 100644
--- a/media-gfx/imageworsener/imageworsener-1.2.0.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/imageworsener-1.2.0.ebuild,v 1.3 2015/01/09 13:47:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/imageworsener-1.2.0.ebuild,v 1.4 2015/01/26 10:42:29 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="jpeg png static-libs test webp zlib"
 
 DEPEND="png? ( media-libs/libpng:0 )
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index d518a1d3c192..8f001509ff3d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,2 +1,3 @@
 DIST inkscape-0.48.5.tar.bz2 19719332 SHA256 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 SHA512 97f08d9d31e2ad84e15b9f37be3a3039aabb5b15061919e1500a01ecf56398abb3ab06a4fe557bd379dcf7acd95166637be2f4d3ef1a17c3cc76a79a7868b418 WHIRLPOOL 8147f8328212e8951f026db92b0c6d475e293aa8bff8964b90c1a3d1e85395fab400758954a2e73501b4974d644bd44c0e572aababaec809b3c73f777a13c284
 DIST inkscape-0.91pre3.tar.bz2 24817640 SHA256 2163e8e582bc072b84f2f178d1ac201aac41c22e51d3b48a129c0ff44eb50c55 SHA512 383363cf6d5add909ab6424a34a7b7ffefffc18d86c9015e706695b2933a223ffa5b8af7c0ad6fff99f9283fd069e9f5d57c0d4f759bcae380592e5c5b3a5445 WHIRLPOOL 30effd256174ad33ea99eb226008008b514305db090cfd27957ee4ca1f91f46c230f0b1fb3830ee29a5e629f390864da6348fe315f19361c5787ce288488bd05
+DIST inkscape-0.91pre4.tar.bz2 25844184 SHA256 314d2019f67f58907f0c0b9f8a97e6b4e029ea7eb8fbe5ef418ce1ace4e8690f SHA512 01c5f91f7bce4e04bfceac1549748aa2dbb9519a5a59154540b3560700d857b2ac16dabf9e93c94e946637fb978df3c05a333bc0b8ad8cc0a4cebd32b7c6b9d8 WHIRLPOOL 8f04d368aabd2808492c5e1fdcfdbd511794242ff500053443ca6a910c63d9938b7e9cc08df298fc6e0ed049a0cdd8a9c8a22005a06e1216a1accfafe75eadfc
diff --git a/media-gfx/inkscape/inkscape-0.91_pre3-r1.ebuild b/media-gfx/inkscape/inkscape-0.91_pre4.ebuild
similarity index 91%
rename from media-gfx/inkscape/inkscape-0.91_pre3-r1.ebuild
rename to media-gfx/inkscape/inkscape-0.91_pre4.ebuild
index 4561c4442908..22cfcd82e40c 100644
--- a/media-gfx/inkscape/inkscape-0.91_pre3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91_pre4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.91_pre3-r1.ebuild,v 1.1 2014/12/15 17:43:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.91_pre4.ebuild,v 1.1 2015/01/26 15:27:43 mrueg Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -98,11 +98,11 @@ pkg_pretend() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-automagic.patch \
-		"${FILESDIR}"/${P}-cppflags.patch \
-		"${FILESDIR}"/${P}-desktop.patch \
-		"${FILESDIR}"/${P}-exif.patch \
-		"${FILESDIR}"/${P}-sk-man.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-automagic.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-cppflags.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-desktop.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-exif.patch \
+		"${FILESDIR}"/${PN}-0.91_pre3-sk-man.patch \
 		"${FILESDIR}"/${PN}-0.48.4-epython.patch
 
 	sed -i "s#@EPYTHON@#${EPYTHON}#" src/extension/implementation/script.cpp || die
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 8abe183f2827..438765f0dfc3 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,3 +1,3 @@
-DIST simple-scan-3.12.1.tar.xz 474476 SHA256 fbef2cd91408e0ead7649fcf39eb2af125bbd904869ad7d3694c63a38b999fe8 SHA512 e1215829364b2eb6a8a9cfebcd75ad0ff7a10d7263c1c876c425f31666ffabbc6c3cc2d036fb88af5245a8f4059bd992438a5f565a3cd65f4f9c963fd8c0d2da WHIRLPOOL 9d7faf92b5467352d0eb369f61df8cf48470ad9c248e4004294b5c0ceabf75a88892d16ec516d2352c4686f2edd24bbbbe846d638e599f6a6672e94a62b35df3
 DIST simple-scan-3.12.2.tar.xz 473848 SHA256 6a7942ec37247cd37f888052ae27a5c6bdff3f304628fa638ce2c16f2d4ca9eb SHA512 c22afc1b313ba408dbdab9feeefe11a54b794e6d6a9627f919401226be9d19b6f7531d9c241c681c5fb086ac18fc2584a71b8b5ed4606bc80514400d5b6268e5 WHIRLPOOL b90b2372df3a446a246bff1c6617d32128e770e8b33ccaeffb34fb5a31d53e6b87ee6aaab6c6f1bd436ac1e5c546ac3b77f44be130d28939efef786e25272bcc
 DIST simple-scan-3.14.0.tar.xz 484788 SHA256 9a8afa0d72ef889a79c6e0eec490ccef535106d7bf60ece4ba555bf7368399f1 SHA512 9216b78b83e671150811d0633aec98ebbdc7e33a0ec9c003b5d65168f8a68cb9c0cadd443ffba441aa92c6837207d13a7185dd7f494eb8d58094ea24df8a221f WHIRLPOOL 0cf3bfead7a03c0abb12dff8428d62d4e907bee4bf8d31e1aa61563379c08df8b8915c6aaa7634ed28db7c6e92b55a1f587bb7c5fb97873635f37d959e4c5377
+DIST simple-scan-3.14.2.tar.xz 484596 SHA256 d46caaafd2dfe46cf7e022363842cf3da0721b70768de5d29c808d1e5953a6a3 SHA512 89fb4f44f48d22924e3de9831525992328c4b59ae953bd78d3ea14c853abe39f6a269b7b65f3c540f4d2b0c335b23a786f8f3b2cc5dc1a743d710c9295fb09d5 WHIRLPOOL 38f3c4542b1f02119bd36b20aa5550dac05e4d9cac0cfb6152a2210b44f26b457f8d2d5c136624c24928ad105feade56bf4493b54fdd8e8e0d9e2cc5de26ce17
diff --git a/media-gfx/simple-scan/simple-scan-3.12.1-r1.ebuild b/media-gfx/simple-scan/simple-scan-3.14.2.ebuild
similarity index 88%
rename from media-gfx/simple-scan/simple-scan-3.12.1-r1.ebuild
rename to media-gfx/simple-scan/simple-scan-3.14.2.ebuild
index 38d8b5969411..e981eb2073c0 100644
--- a/media-gfx/simple-scan/simple-scan-3.12.1-r1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.14.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.12.1-r1.ebuild,v 1.1 2014/07/30 04:02:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.14.2.ebuild,v 1.1 2015/01/26 12:18:12 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ SRC_URI="http://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/media-libs/allegro/allegro-5.0.8-r1.ebuild b/media-libs/allegro/allegro-5.0.8-r1.ebuild
index fe837d7db8c6..71a42180796f 100644
--- a/media-libs/allegro/allegro-5.0.8-r1.ebuild
+++ b/media-libs/allegro/allegro-5.0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.8-r1.ebuild,v 1.5 2014/12/27 19:29:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.8-r1.ebuild,v 1.6 2015/01/26 09:46:44 ago Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index c71c14d5e032..62e784c3844b 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-gst-1.6.0.tar.xz 349332 SHA256 abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622 SHA512 5641326567aea1d5c19f84768a94ee329412e6d4958a980de8ec835ce6eb80794ea5b23cd16f041f3dca3d3fe9f2cf371cedffb16b0522aaa124ca1e50552d97 WHIRLPOOL c79d7ae5e39c5d9b05ff38ba329f428f08c8e44f9f439ef5e5e4a1da6cf72d851c6d6cbb11718eabfd2bb2b04312b6fcba85c3b927d641b914d7d26437a901a2
-DIST clutter-gst-2.0.10.tar.xz 355744 SHA256 f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00 SHA512 a0f9114ae00f711a2e98a946aa939f72f558668da0ac791f3d2e3e8c5bb22549d16a54def61d68fd28ad665c7c804a2ce53d97f5219bff5e8ed8710514696801 WHIRLPOOL afe331b7a63a19093b4235197ad030ce5ec1610b9636175b8074b9e236999122aab3b8b906dd7aae18b4c497769a8475cf932b92702068ccfd4a782cddf3e047
 DIST clutter-gst-2.0.12.tar.xz 356164 SHA256 c2f1453692b0c3ff6a500113bc1d2c95d2bde11caca0809610a6d1424bbbffb5 SHA512 d612791605e3839cf02f4df8a5856df07aa4d27a79e7efb11fc5cdf30cdfb3a31cda6f4b47eeda9188abb554cc06880905b4f0658863b5e8d7437800d887606e WHIRLPOOL cefbf31a4f30ab5a536521e9cb1d1736b10a103bbfb318e8ab7b77ba548882f192b813b85f7f7603422a33109fc4c3a62ca52de9747bef90f4ce520091901c0c
+DIST clutter-gst-2.0.14.tar.xz 357192 SHA256 5d7d8c1a31748e9039b7ba9dae9f412ec065715008adffdfde332dd34e7d0535 SHA512 9bbafb034968f9b584c2a14924d426e17fae32102b7b9eea298b4556d266dbbd051aa937c79c42a9379f9c67bcda7a350171375e047c13a436c71e346e3d86f9 WHIRLPOOL 0322cfa5085d1ab1bf3894745c0d59a255b4f87a42a28e41c3761a74edc6f77b7ce1da2c9642e72fb95cf3b5db5866be8e5bc5d364e530306d263e5c765da9a4
diff --git a/media-libs/clutter-gst/clutter-gst-2.0.10.ebuild b/media-libs/clutter-gst/clutter-gst-2.0.14.ebuild
similarity index 78%
rename from media-libs/clutter-gst/clutter-gst-2.0.10.ebuild
rename to media-libs/clutter-gst/clutter-gst-2.0.14.ebuild
index 664ce6c712e6..703ff85d50c5 100644
--- a/media-libs/clutter-gst/clutter-gst-2.0.10.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-2.0.14.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.10.ebuild,v 1.4 2014/03/09 12:01:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.14.ebuild,v 1.1 2015/01/26 14:23:00 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
-CLUTTER_LA_PUNT="yes"
+GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 
-# inherit clutter after gnome2 so that defaults aren't overriden
-# inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
-inherit gnome2 clutter gnome.org python-any-r1
+inherit gnome2 python-any-r1
 
+HOMEPAGE="http://www.clutter-project.org/"
 DESCRIPTION="GStreamer integration library for Clutter"
 
+LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples +introspection"
 
 # FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 "
 # uses goom from gst-plugins-good
 RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-good:1.0
+	>=media-libs/gst-plugins-good-1.2.0:1.0
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
@@ -38,9 +38,6 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	DOCS="AUTHORS NEWS README"
-	EXAMPLES="examples/{*.c,*.png,README}"
-
 	# Make doc parallel installable
 	cd "${S}"/doc/reference
 	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
@@ -68,5 +65,14 @@ src_compile() {
 	# Clutter tries to access dri without userpriv, upstream bug #661873
 	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
 	unset DISPLAY
-	default
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/{*.c,*.png,README}
+	fi
 }
diff --git a/media-libs/gavl/gavl-1.4.0-r1.ebuild b/media-libs/gavl/gavl-1.4.0-r1.ebuild
index 3089cfc8152b..04a48702c9f3 100644
--- a/media-libs/gavl/gavl-1.4.0-r1.ebuild
+++ b/media-libs/gavl/gavl-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gavl/gavl-1.4.0-r1.ebuild,v 1.4 2014/12/31 15:58:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gavl/gavl-1.4.0-r1.ebuild,v 1.5 2015/01/26 10:09:54 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ppc ~ppc64 x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/media-libs/herqq/herqq-1.0.0-r1.ebuild b/media-libs/herqq/herqq-1.0.0-r1.ebuild
deleted file mode 100644
index 763181b7c1e1..000000000000
--- a/media-libs/herqq/herqq-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r1.ebuild,v 1.9 2014/01/02 18:46:17 pinkbyte Exp $
-
-EAPI=4
-
-inherit multilib base qt4-r2
-
-DESCRIPTION="A software library for building UPnP devices"
-HOMEPAGE="http://www.herqq.org"
-SRC_URI="mirror://sourceforge/hupnp/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-# no release of QtSolutions using bundled libQtSolutions_SOAP
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtxmlpatterns:4
-	!media-libs/hupnp-ng
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( hupnp/ChangeLog )
-HTML_DOCS=( hupnp/docs/html/ )
-
-src_prepare() {
-	# fix the .pro file for multilib issues
-	sed \
-		-e "s:PREFIX/lib:PREFIX/$(get_libdir):" \
-		-i "${S}/hupnp/src.pro" \
-		-i "${S}/hupnp/lib/qtsoap-2.7-opensource/buildlib/buildlib.pro" || die
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	eqmake4 PREFIX="${EPREFIX}/usr/"
-}
-
-src_install() {
-	qt4-r2_src_install
-	use doc && base_src_install_docs
-}
diff --git a/media-libs/herqq/herqq-1.0.0-r2.ebuild b/media-libs/herqq/herqq-1.0.0-r2.ebuild
index cce9df5e453b..02df7149ffa5 100644
--- a/media-libs/herqq/herqq-1.0.0-r2.ebuild
+++ b/media-libs/herqq/herqq-1.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r2.ebuild,v 1.2 2015/01/22 08:45:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/herqq/herqq-1.0.0-r2.ebuild,v 1.3 2015/01/26 10:02:45 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hupnp/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="doc"
 
 # no release of QtSolutions using bundled libQtSolutions_SOAP
diff --git a/media-libs/libaacs/libaacs-0.7.1.ebuild b/media-libs/libaacs/libaacs-0.7.1.ebuild
index f93d6f1f7b09..7339bba66a64 100644
--- a/media-libs/libaacs/libaacs-0.7.1.ebuild
+++ b/media-libs/libaacs/libaacs-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacs/libaacs-0.7.1.ebuild,v 1.5 2015/01/02 12:19:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacs/libaacs-0.7.1.ebuild,v 1.6 2015/01/26 10:10:13 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 62422b945ade..8b6d4d41290c 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,2 @@
-DIST libgphoto2-2.5.3.1.tar.bz2 6676451 SHA256 29322d3b163d1d91501280259ca16d1ba966e7d11739d8dc7cf07ef5e617cda2 SHA512 86dc8848103ead23e950d9e3cfd19bec14acc3ee654431731f07c9518c439c8d7d24f832e623d23f3eef0fb554641fa3da9f8ac5b8db99ee00ccf3aa478f4a6f WHIRLPOOL 7da218fe99d1d359277041f539e75032f3926178590f7b8ffb0c908e06f3c8367f160ccf730a3aadb0fe45e3687c792a086d514f03c34f05e189e1c2091d7243
-DIST libgphoto2-2.5.4.tar.bz2 6682743 SHA256 5fb412e28d3a8ed15bfe86df2173360fcccd29f3d2117e8329d827c356e60bc0 SHA512 04494918aedb4dcb1b7d57a5756b9a00366f87034d1c622dfaeb129fa7988974f3abba31f5acdd1f9041aaaf55a301128c906242610b6f5cb1796451240be9d5 WHIRLPOOL 173e3a0db98c06426a91a78e72e35618dc4cea095461d37e37826a96f14d53a32fa1074a67208b7f983396e36fe950264751ec52ddb6389b7b7c6c00287aff23
 DIST libgphoto2-2.5.5.1.tar.bz2 6699687 SHA256 600e6bde24545eef4d2d8285af389a5ae738707becb018c78611b2d8a3054846 SHA512 a274bb553abed2f498b28388b2e2bc1810b4f57823744e7461248020818f1b79430198d81091aaa8ddc18a2a2acc5acf4fce5800e80da5e7ba534f0c094c749a WHIRLPOOL 8831627d38a0d53eecc8cbbd54595f7c0eff93a6b78ba40b1651b36d843c1bb973e8ce07ebeba0bffd3dafe4302abcd2512472b76c3225fedc1df4c827aa5190
+DIST libgphoto2-2.5.7.tar.bz2 6726164 SHA256 7260193277bdb4c319dd8f151224f87deac9fde64cbe5d2eb25d9c19e4d09894 SHA512 eaff704eb4ccfc6f7a2890c6583ece268005d91acbf8c5e192e2ac91e5a2f5f4f6c84b4dfc95773a6e6023fb12cb0e63d75eed8cd4f8a98019069ac6ab4e60f1 WHIRLPOOL 87a2fa5bbff780dce0131bcca90169bc4c273a42f4b99f2d614accba42284c1a6087ff4b1dbc6bdf139b88b95df6e4367404c873ac27b8388e594af2959dd563
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch
deleted file mode 100644
index fc10aec0c9fe..000000000000
--- a/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Make sure with_bonjour value gets set by corresponding AC_ARG_WITH
-# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=283332
---- a/libgphoto2_port/configure.ac	2010-01-07 00:25:53.000000000 +0100
-+++ b/libgphoto2_port/configure.ac	2010-01-07 00:25:43.000000000 +0100
-@@ -161,7 +161,6 @@
- dnl ---------------------------------------------------------------------------
- dnl Apple Bonjour / mDNSResponder multicast DNS queries.
- dnl ---------------------------------------------------------------------------
--with_bonjour=no
- AC_ARG_WITH([bonjour],
- 	AS_HELP_STRING([--without-bonjour], [whether to exclude Bonjour PTP/IP autodetection]),
- 	,
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild
deleted file mode 100644
index b6e697bcd753..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild,v 1.10 2014/07/30 19:24:55 ssuominen Exp $
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
-
-EAPI="5"
-
-inherit autotools eutils multilib udev user
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls serial zeroconf"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
-	adc65 agfa_cl20 aox ax203
-	barbie
-	canon casio_qv clicksmart310
-	digigr8 digita dimagev dimera3500 directory
-	enigma13
-	fuji
-	gsmart300
-	hp215
-	iclick
-	jamcam jd11 jl2005a jl2005c
-	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
-	largan lg_gsm
-	mars mustek
-	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
-	ricoh ricoh_g3
-	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
-	toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-# libgphoto2 actually links to libtool
-RDEPEND="
-	dev-libs/libxml2:2
-	sys-devel/libtool
-	virtual/libusb:1
-	cameras_ax203? ( media-libs/gd:= )
-	cameras_st2205? ( media-libs/gd:= )
-	exif? ( >=media-libs/libexif-0.5.9:= )
-	gd? ( media-libs/gd[jpeg=] )
-	jpeg? ( virtual/jpeg:0 )
-	serial? ( dev-libs/lockdev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	>=sys-devel/gettext-0.14.1
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# FIXME: gtk-doc is broken
-#		>=dev-util/gtk-doc-1.10 )"
-
-RDEPEND="${RDEPEND}
-	!<sys-fs/udev-175"
-
-pkg_pretend() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "No camera drivers will be built since you did not specify any."
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Handle examples ourselves
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "examples sed failed"
-
-	# Fix pkgconfig file when USE="-exif"
-	if ! use exif; then
-		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
-	fi
-
-	sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
-
-	# Fix USE=zeroconf, bug #283332
-	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local cameras
-	local cam
-	local cam_warn=no
-	for cam in ${IUSE_CAMERAS} ; do
-		if use "cameras_${cam}"; then
-			cameras="${cameras},${cam}"
-		else
-			cam_warn=yes
-		fi
-	done
-
-	if [ "${cam_warn}" = "yes" ]; then
-		[ -z "${cameras}" ] || cameras="${cameras:1}"
-		einfo "Enabled camera drivers: ${cameras:-none}"
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-	else
-		cameras="all"
-		einfo "Enabled camera drivers: all"
-	fi
-
-	local myconf
-	use doc || myconf="ac_cv_path_DOXYGEN=false"
-
-	# Upstream doesn't default to --enable-option-checking due having another
-	# configure in libgphoto2_port/ that also needs to be checked on every bump
-	#
-	# Serial port uses either lockdev or ttylock, but we don't have ttylock
-	econf \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_with zeroconf bonjour) \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		$(use_enable serial) \
-		$(use_enable serial lockdev) \
-		--with-libusb=no \
-		--with-libusb-1.0=auto \
-		--disable-ttylock \
-		--with-camlibs=${cameras} \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
-		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="$(get_udevdir)" \
-		${myconf}
-
-# FIXME: gtk-doc is currently broken
-#		$(use_enable doc docs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	# Empty dependency_libs in .la files, bug #386665
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# Clean up unwanted files
-	rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
-	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
-	fi
-
-	# FIXME: fixup autoconf bug
-	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	local udev_rules cam_list
-	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
-	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${cam_list} ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${udev_rules%/*}
-		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${udev_rules}
-		"${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}"
-	fi
-
-}
-
-pkg_postinst() {
-	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to access your camera."
-	fi
-
-	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
-	if [[ -f ${old_udev_rules} ]]; then
-		rm -f "${old_udev_rules}"
-	fi
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild
deleted file mode 100644
index 7f41698434e1..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild,v 1.2 2014/07/30 19:24:55 ssuominen Exp $
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
-
-EAPI="5"
-
-inherit autotools eutils multilib udev user
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls serial zeroconf"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
-	adc65 agfa_cl20 aox ax203
-	barbie
-	canon casio_qv clicksmart310
-	digigr8 digita dimagev dimera3500 directory
-	enigma13
-	fuji
-	gsmart300
-	hp215
-	iclick
-	jamcam jd11 jl2005a jl2005c
-	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
-	largan lg_gsm
-	mars mustek
-	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
-	ricoh ricoh_g3
-	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
-	toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-# libgphoto2 actually links to libtool
-RDEPEND="
-	dev-libs/libxml2:2
-	sys-devel/libtool
-	virtual/libusb:1
-	cameras_ax203? ( media-libs/gd:= )
-	cameras_st2205? ( media-libs/gd:= )
-	exif? ( >=media-libs/libexif-0.5.9:= )
-	gd? ( media-libs/gd[jpeg=] )
-	jpeg? ( virtual/jpeg:0 )
-	serial? ( dev-libs/lockdev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	!<sys-fs/udev-175
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	>=sys-devel/gettext-0.14.1
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-pkg_pretend() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "No camera drivers will be built since you did not specify any."
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Handle examples ourselves
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "examples sed failed"
-
-	# Fix pkgconfig file when USE="-exif"
-	# https://sourceforge.net/p/gphoto/bugs/980/
-	if ! use exif; then
-		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
-	fi
-
-	sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
-
-	# Fix USE=zeroconf, bug #283332
-	# https://sourceforge.net/p/gphoto/bugs/981/
-	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	local cameras
-	local cam
-	local cam_warn=no
-	for cam in ${IUSE_CAMERAS} ; do
-		if use "cameras_${cam}"; then
-			cameras="${cameras},${cam}"
-		else
-			cam_warn=yes
-		fi
-	done
-
-	if [ "${cam_warn}" = "yes" ]; then
-		[ -z "${cameras}" ] || cameras="${cameras:1}"
-		einfo "Enabled camera drivers: ${cameras:-none}"
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-	else
-		cameras="all"
-		einfo "Enabled camera drivers: all"
-	fi
-
-	local myconf
-	use doc || myconf="ac_cv_path_DOXYGEN=false"
-
-	# gd detection is broken: https://sourceforge.net/p/gphoto/bugs/982/
-	if use gd; then
-		export LIBGD_CFLAGS=" "
-		export LIBGD_LIBS="-lgd"
-	fi
-
-	# Upstream doesn't default to --enable-option-checking due having another
-	# configure in libgphoto2_port/ that also needs to be checked on every bump
-	#
-	# Serial port uses either lockdev or ttylock, but we don't have ttylock
-	econf \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_with zeroconf bonjour) \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		$(use_enable serial) \
-		$(use_enable serial lockdev) \
-		--with-libusb=no \
-		--with-libusb-1.0=auto \
-		--disable-ttylock \
-		--with-camlibs=${cameras} \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
-		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="$(get_udevdir)" \
-		${myconf}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	# Empty dependency_libs in .la files, bug #386665
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# Remove recursive symlink
-	# https://sourceforge.net/p/gphoto/bugs/983/
-	rm "${ED}/usr/include/gphoto2/gphoto2" || die
-
-	# Clean up unwanted files
-	rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
-	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
-	fi
-
-	# FIXME: fixup autoconf bug
-	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	local udev_rules cam_list
-	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
-	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${cam_list} ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${udev_rules%/*}
-		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${udev_rules}
-		"${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}"
-	fi
-
-}
-
-pkg_postinst() {
-	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to access your camera."
-	fi
-
-	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
-	if [[ -f ${old_udev_rules} ]]; then
-		rm -f "${old_udev_rules}"
-	fi
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.7.ebuild
similarity index 82%
rename from media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild
rename to media-libs/libgphoto2/libgphoto2-2.5.7.ebuild
index c35aba33a4fd..e28f70e30b7e 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild,v 1.1 2014/11/06 18:27:31 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.7.ebuild,v 1.1 2015/01/26 11:39:25 pacho Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -8,16 +8,18 @@
 
 EAPI="5"
 
-inherit autotools eutils multilib multilib-minimal udev user
+inherit eutils multilib multilib-minimal udev user
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
 SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+
+# FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.
@@ -48,13 +50,10 @@ for camera in ${IUSE_CAMERAS}; do
 	IUSE="${IUSE} cameras_${camera}"
 done
 
-# libgphoto2 actually links to libltdl, leave old libtool multilib dep there for now
+# libgphoto2 actually links to libltdl
 RDEPEND="
 	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
 	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
 	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
@@ -67,7 +66,8 @@ RDEPEND="
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-medialibs-20140508
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
+	)
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	sys-devel/flex
@@ -96,19 +96,9 @@ src_prepare() {
 	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
 		|| die "examples sed failed"
 
-	# Fix pkgconfig file when USE="-exif"
-	# https://sourceforge.net/p/gphoto/bugs/980/
-	if ! use exif; then
-		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
-	fi
-
-	sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
-
-	# Fix USE=zeroconf, bug #283332
-	# https://sourceforge.net/p/gphoto/bugs/981/
-	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
-
-	eautoreconf
+	# If running eautoreconf
+	# sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
+	sed -e 's/sleep 2//' -i configure || die
 }
 
 multilib_src_configure() {
@@ -135,12 +125,6 @@ multilib_src_configure() {
 	local myconf
 	use doc || myconf=( ac_cv_path_DOXYGEN=false )
 
-	# gd detection is broken: https://sourceforge.net/p/gphoto/bugs/982/
-	if use gd; then
-		export LIBGD_CFLAGS=" "
-		export LIBGD_LIBS="-lgd"
-	fi
-
 	# Upstream doesn't default to --enable-option-checking due having another
 	# configure in libgphoto2_port/ that also needs to be checked on every bump
 	#
@@ -177,12 +161,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	# Empty dependency_libs in .la files, bug #386665
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# Remove recursive symlink
-	# https://sourceforge.net/p/gphoto/bugs/983/
-	rm "${ED}/usr/include/gphoto2/gphoto2" || die
+	prune_libtool_files --modules
 
 	# Clean up unwanted files
 	rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
@@ -193,7 +172,7 @@ multilib_src_install_all() {
 		doins examples/README examples/*.c examples/*.h
 	fi
 
-	# FIXME: fixup autoconf bug
+	# FIXME: fixup autoconf bug #????
 	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
 		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
 	fi
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.2.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.2.ebuild
index 464de9609b7c..bb7354802beb 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.2.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.2.ebuild,v 1.2 2015/01/22 08:46:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-0.8.2.ebuild,v 1.3 2015/01/26 09:57:11 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.7.0
diff --git a/media-radio/unixcw/unixcw-3.4.0.ebuild b/media-radio/unixcw/unixcw-3.4.0.ebuild
index a40cc891a227..aa4c70ebaf72 100644
--- a/media-radio/unixcw/unixcw-3.4.0.ebuild
+++ b/media-radio/unixcw/unixcw-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/unixcw-3.4.0.ebuild,v 1.3 2015/01/17 14:02:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/unixcw-3.4.0.ebuild,v 1.4 2015/01/26 10:37:36 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="alsa ncurses pulseaudio suid qt4"
 
 RDEPEND="ncurses? ( sys-libs/ncurses )
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 2a9fb35d5d91..e9c0c3de3a13 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,2 +1,2 @@
 DIST gnome-music-3.12.2.1.tar.xz 1423164 SHA256 9f0c99283853f054e3c5b4ad15df1e8fe3ac07bc046ac0f019ef0600ca969fef SHA512 8dc1b665b7e236e404dbc996a56216e90b8f3e0f61fe2ec719ed478a2900130af371312f04fe4a83ff9f5b975ce92b76e3654878ebeb72b2c49bcfdd996022a4 WHIRLPOOL 50d86204d2ed4b87b23f2d9c2ae0431913a7dc3e09eeb7e220aee70c8addf6047b4d88cdec1c789ba4f374c81a0bb1c6e2e0c532cf815e4cb61298664eaace5a
-DIST gnome-music-3.14.3.tar.xz 1466112 SHA256 30bec04bb506f8dfc9a41ccf89243ed7422736f65e804482a3b4ed2b7b80e55d SHA512 b76c263f88f996fe8570c49db0b01bff9d407f1770b5052258b5eba7139d5c70c16f1dd6548fbdfa3e6f8b4f66227fced66821a8d054e80f0220f6770ddd1f6b WHIRLPOOL b8659d3ea10975d345bd56f859d257ac0b81874a1a53a4b5692e062435ed2f8ff3b293c18c775740baee5a5e9bc4c74f1241782b505ec7ec62dda79d3da138f0
+DIST gnome-music-3.14.3.1.tar.xz 1466232 SHA256 9bf614cd790bc7abebe56c65f3acae56c90ea5488f97a41a8ef70bcbce42604a SHA512 ce394fdd6701f5da2b1ac1bf9ca66de706a335ac5022466260a4e5a76646a062f7b48cf27207baea37c29805b234fe0fabe34fe47cea33009b27dbc5aec54e9b WHIRLPOOL 0672023af6dc95da76c78030bfb88c3f74ae127c69715cfc624d1391c5a651808a32203e6a7e20e6408977f610c23c3153ca71616fde21b3dfb290605cf98c35
diff --git a/media-sound/gnome-music/files/gnome-music-3.14.3-music-dir.patch b/media-sound/gnome-music/files/gnome-music-3.14.3-music-dir.patch
deleted file mode 100644
index 3d69f155c1b9..000000000000
--- a/media-sound/gnome-music/files/gnome-music-3.14.3-music-dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gnome-music-3.14.3/gnomemusic/query.py~	2015-01-19 13:14:23.000000000 +0100
-+++ gnome-music-3.14.3/gnomemusic/query.py	2015-01-25 15:30:42.478238978 +0100
-@@ -30,14 +30,14 @@
- 
- class Query():
-     music_folder = None
--    MUSIC_URI = None
-+    MUSIC_DIR = None
-     download_folder = None
--    DOWNLOAD_URI = None
-+    DOWNLOAD_DIR = None
-     try:
-         music_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
--        MUSIC_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder))
-+        MUSIC_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder))
-         download_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD)
--        DOWNLOAD_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder))
-+        DOWNLOAD_DIR = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder))
- 
-     except TypeError:
-         print("XDG user dirs are not set")
\ No newline at end of file
diff --git a/media-sound/gnome-music/gnome-music-3.14.3-r1.ebuild b/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild
similarity index 88%
rename from media-sound/gnome-music/gnome-music-3.14.3-r1.ebuild
rename to media-sound/gnome-music/gnome-music-3.14.3.1.ebuild
index 99f60b3499d7..632ad4a8c1a7 100644
--- a/media-sound/gnome-music/gnome-music-3.14.3-r1.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/gnome-music-3.14.3-r1.ebuild,v 1.1 2015/01/25 15:07:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild,v 1.1 2015/01/26 14:28:27 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -50,12 +50,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Fix call for music directory, upstream bug #743484
-	epatch "${FILESDIR}"/${PN}-3.14.3-music-dir.patch
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure ITSTOOL="$(type -P true)"
 }
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
index 22c574ec48aa..b9e98ee4b737 100644
--- a/media-sound/gramofile/Manifest
+++ b/media-sound/gramofile/Manifest
@@ -1,2 +1,3 @@
-DIST gramofile_1.6-8.diff.gz 26697 RMD160 087786ee1552bdfb1128e16a5a66a6d8e318356c SHA1 e8e62c6ea943d33e87836fa981b4438faf4d40e7 SHA256 ec4f879885daf542a1cae8c9f77a5dcd37cf33ac4400159b0d5243486617cc34
-DIST gramofile_1.6.orig.tar.gz 108596 RMD160 3f7c8a8e8053e92ece830bbb1138fc7ed1c49967 SHA1 6e5365d9e04801725be694fefcff5fc10ea2f912 SHA256 d1c9fe01f3b49c8c9141c3e09c15f519dcb9ffdcaabcfa51ece0c41540ba69e2
+DIST gramofile_1.6-8.diff.gz 26697 SHA256 ec4f879885daf542a1cae8c9f77a5dcd37cf33ac4400159b0d5243486617cc34 SHA512 f03ab82de0aa8fca44bd5be4e64c0606c08a083ed09039728e163a2e535348c8984acd958bc6589139907101faf867e3030ff2ad09abdc8e3b292864f69e64ae WHIRLPOOL 83cce33030cf2feaa5096129c87ea51387f4856eae82359ca050cb46b91ee25e9d47ab7b37519d28086632e611b6dfeeb2a382e7a208c1e856e8f06874c622ae
+DIST gramofile_1.6-9.diff.gz 25244 SHA256 f18fba5fba9889cf8090c22643fa39e6e93011d66a75e6274311f70244d8826e SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249 WHIRLPOOL f51ed79b6a61d728dccfd1cb61195909dbd188d16612f3680573b1463027f15d1ed4d8feced4ea9e28a719997041148679c1f796c09b51e4fe499989f27dcb49
+DIST gramofile_1.6.orig.tar.gz 108596 SHA256 d1c9fe01f3b49c8c9141c3e09c15f519dcb9ffdcaabcfa51ece0c41540ba69e2 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5 WHIRLPOOL 19c739b5c654f2180740f2d11ce567950d83431844807bc27cedc209378d4105de075946b42999019be3007ed30e0f25b23d40f4263ce6184fc480ce83d057ac
diff --git a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
index 0b6c4dcb999d..4c35dd3eb2ff 100644
--- a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
+++ b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
@@ -1,6 +1,5 @@
-diff -ur gramofile-1.6.orig/bplaysrc/Makefile gramofile-1.6/bplaysrc/Makefile
---- gramofile-1.6.orig/bplaysrc/Makefile	2009-05-12 22:39:32.000000000 +0300
-+++ gramofile-1.6/bplaysrc/Makefile	2009-05-12 22:45:53.000000000 +0300
+--- a/bplaysrc/Makefile
++++ b/bplaysrc/Makefile
 @@ -6,13 +6,12 @@
          ../clrscr.o ../secshms.o
  #SRCS = bplay.c sndfunc.o shmbuf.c
@@ -17,9 +16,8 @@ diff -ur gramofile-1.6.orig/bplaysrc/Makefile gramofile-1.6/bplaysrc/Makefile
  LIBS = -lncurses
  
  # For FreeBSD (and maybe others), use these:
-diff -ur gramofile-1.6.orig/gramofile.c gramofile-1.6/gramofile.c
---- gramofile-1.6.orig/gramofile.c	2009-05-12 22:39:32.000000000 +0300
-+++ gramofile-1.6/gramofile.c	2009-05-12 22:41:25.000000000 +0300
+--- a/gramofile.c
++++ b/gramofile.c
 @@ -11,6 +11,7 @@
  #include "splashscr.h"
  #include <signal.h>
@@ -28,9 +26,8 @@ diff -ur gramofile-1.6.orig/gramofile.c gramofile-1.6/gramofile.c
  #include <string.h>
  #ifndef OLD_CURSES
  #include <ncurses.h>
-diff -ur gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
---- gramofile-1.6.orig/Makefile	2009-05-12 22:39:32.000000000 +0300
-+++ gramofile-1.6/Makefile	2009-05-12 22:45:28.000000000 +0300
+--- a/Makefile
++++ b/Makefile
 @@ -14,13 +14,12 @@
  OBJS = $(SRCS:.c=.o)
  SHELL = /bin/sh
@@ -47,9 +44,8 @@ diff -ur gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
  DEPS = $(OBJS) makebplay
  LIBS = -lncurses -lrfftw -lfftw -lm
  COPY_A = -a
-diff -ur gramofile-1.6.orig/signpr_cmf3.c gramofile-1.6/signpr_cmf3.c
---- gramofile-1.6.orig/signpr_cmf3.c	2009-05-12 22:39:32.000000000 +0300
-+++ gramofile-1.6/signpr_cmf3.c	2009-05-12 22:41:09.000000000 +0300
+--- a/signpr_cmf3.c
++++ b/signpr_cmf3.c
 @@ -34,6 +34,7 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
new file mode 100644
index 000000000000..9fdbe1477233
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
@@ -0,0 +1,39 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,15 +14,12 @@
+ OBJS = $(SRCS:.c=.o)
+ SHELL = /bin/sh
+ 
+-CC = gcc
+-LDFLAGS = 
+-
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
++CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
+ DEPS = $(OBJS) makebplay
+-LIBS = -lncurses -lrfftw -lfftw -lm
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses) -lrfftw -lfftw -lm
+ COPY_A = -a
+ 
+ # For FreeBSD (and maybe others), use these:
+--- a/bplaysrc/Makefile
++++ b/bplaysrc/Makefile
+@@ -6,14 +6,11 @@
+         ../clrscr.o ../secshms.o
+ #SRCS = bplay.c sndfunc.o shmbuf.c
+ 
+-CC = gcc
+-LDFLAGS = 
+-
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
+-LIBS = -lncurses
++CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
+ 
+ # For FreeBSD (and maybe others), use these:
+ #CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
new file mode 100644
index 000000000000..0369914779fd
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
@@ -0,0 +1,20 @@
+--- a/gramofile.c
++++ b/gramofile.c
+@@ -11,6 +11,7 @@
+ #include "splashscr.h"
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+--- a/signpr_cmf3.c
++++ b/signpr_cmf3.c
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
++#include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+ #else
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
new file mode 100644
index 000000000000..711bbca0caf3
--- /dev/null
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gramofile/gramofile-1.6_p9.ebuild,v 1.1 2015/01/26 10:41:57 jer Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Transfer sound from gramophone records to CD"
+HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
+SRC_URI="
+	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses
+	sci-libs/fftw:2.1
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${P/_p*}/debian/patches
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
+
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	dobin ${PN}
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bplay_gramo brec_gramo
+	dodoc ChangeLog README TODO *.txt
+	newdoc ${P/_p*}/debian/changelog ChangeLog.debian
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.2.ebuild
index 929cb5e9ae44..650dd85739a7 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.2.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.6.2.ebuild,v 1.6 2015/01/25 21:16:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.6.2.ebuild,v 1.7 2015/01/26 10:38:13 ago Exp $
 
 EAPI=5
 inherit bash-completion-r1 eutils
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ~sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/media-video/acidrip/acidrip-0.14-r3.ebuild b/media-video/acidrip/acidrip-0.14-r3.ebuild
index 5bb9f02780a7..1c8b17a8ec51 100644
--- a/media-video/acidrip/acidrip-0.14-r3.ebuild
+++ b/media-video/acidrip/acidrip-0.14-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/acidrip-0.14-r3.ebuild,v 1.2 2015/01/09 13:48:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/acidrip-0.14-r3.ebuild,v 1.3 2015/01/26 10:10:26 ago Exp $
 
 EAPI=5
 inherit perl-app
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="encode"
 
 RDEPEND="dev-lang/perl
diff --git a/media-video/dirac/dirac-1.0.2-r1.ebuild b/media-video/dirac/dirac-1.0.2-r1.ebuild
index 2336381792bb..62508fe3501c 100644
--- a/media-video/dirac/dirac-1.0.2-r1.ebuild
+++ b/media-video/dirac/dirac-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/dirac-1.0.2-r1.ebuild,v 1.9 2015/01/02 12:19:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dirac/dirac-1.0.2-r1.ebuild,v 1.10 2015/01/26 10:09:36 ago Exp $
 
 EAPI=5
 inherit autotools eutils multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc mmx static-libs"
 
 RDEPEND=""
diff --git a/media-video/kplayer/kplayer-0.7.2-r1.ebuild b/media-video/kplayer/kplayer-0.7.2-r1.ebuild
index 7ba08dfaa2a8..d034c97132f6 100644
--- a/media-video/kplayer/kplayer-0.7.2-r1.ebuild
+++ b/media-video/kplayer/kplayer-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.2-r1.ebuild,v 1.3 2015/01/09 13:48:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.2-r1.ebuild,v 1.4 2015/01/26 10:10:47 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="${DEPEND}
diff --git a/media-video/kplayer/kplayer-0.7.2.ebuild b/media-video/kplayer/kplayer-0.7.2.ebuild
deleted file mode 100644
index 4dfa0053a7db..000000000000
--- a/media-video/kplayer/kplayer-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +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/kplayer/kplayer-0.7.2.ebuild,v 1.4 2014/08/10 21:00:01 slyfox Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB es et eu fr ga gl he hi hne
-it ja km lt mai nb nds nl pa pl pt pt_BR ro ru sr sr@ijekavian sr@ijekavianlatin
-sr@latin sv th tr uk zh_CN zh_TW"
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION="KPlayer is a KDE media player based on mplayer"
-HOMEPAGE="https://projects.kde.org/projects/extragear/multimedia/kplayer"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="${DEPEND}
-	|| ( >=media-video/mplayer-1.0_rc1 media-video/mplayer2 )
-"
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 9091dee68c3e..abb90606fdbf 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1 @@
-DIST subtitlecomposer-0.5.3.tar.bz2 344295 SHA256 87f3831b5ae09f4ffcefe586cd3b04b197784bf09652b02518b24a12fde2cad0 SHA512 5e336ae1f6cbe84b00ee1495cd1897afc6c9dc6b2bca604a33510a022004e57c49304c0feaeff92c3569cd2681c48e305ab48c82f32eece4825b4d555c2bb52c WHIRLPOOL 486288ff0a6679740a78feaca0d991dfc08ef2f01aed200015cb13f1b602cfb5e41cbb4601be0ce2aa103c899290364cd4c50f583b006c415cd26890564da3b2
 DIST subtitlecomposer-0.5.6.tar.gz 1489710 SHA256 f55f3330e72a9a9f19f00674651d7d4c6cd7e19993a14d1deedfa6d34737cf0f SHA512 f06f25d746870886669a66875d4d772e10d18136b9107c2f7d23f177ff3979785b7f73a7e723139fe1757298ef7b0a791a95f40fe585ab3239c82d71d2ab4db0 WHIRLPOOL 0aa86a1a58d7a4f2551774725655223ae2847337ea877db11aff01da55af3be31e941d09fa68468924b47db359b584ee0d9c3d1939e350b7b023a264f9a27010
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gcc45.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gcc45.patch
deleted file mode 100644
index 4439071173b1..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with GCC-4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=323055
-
---- src/core/sstring.cpp
-+++ src/core/sstring.cpp
-@@ -1112,7 +1112,7 @@
- 	append( str );
- }
- 
--SStringList::SStringList( const SStringList::SStringList& list ):
-+SStringList::SStringList( const SStringList& list ):
- 	QList<SString>( list )
- {
- }
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-gstreamer.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-gstreamer.patch
deleted file mode 100644
index 091c00540a86..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-gstreamer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: This pacth adds a missing find_package for GObject.
-#  Without this patch the package will FTBFS with binutils-gold.
-# Forwarded: http://sourceforge.net/tracker/?func=detail&aid=2897376&group_id=208427&atid=1005654
-# Author: José Manuel Santamaría Lema <panfaust@gmail.com>
-# 
---- subtitlecomposer-0.5.3.orig/src/player/gstreamer/CMakeLists.txt
-+++ subtitlecomposer-0.5.3/src/player/gstreamer/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # TODO WHY AREN'T THESE INCLUDED BY MACRO_OPTIONAL_FIND_PACKAGE( GStreamer )?
- FIND_PACKAGE( GLIB2 REQUIRED )
- FIND_PACKAGE( LibXml2 REQUIRED )
-+FIND_PACKAGE( GObject REQUIRED )
- 
- SET( players_gstreamer_INCLUDE_DIR
- 	${GLIB2_INCLUDE_DIR}
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-xine.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-xine.patch
deleted file mode 100644
index 1ec73e7ce54e..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-xine.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/player/xine/CMakeLists.txt
-+++ src/player/xine/CMakeLists.txt
-@@ -10,6 +10,7 @@
- 
- SET( players_xine_LIBS
- 	${XINE_LIBRARY}
-+	-lX11
- 	CACHE INTERNAL EXPORTEDVARIABLE
- )
- 
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-linkage-patch.patch b/media-video/subtitlecomposer/files/subtitlecomposer-linkage-patch.patch
deleted file mode 100644
index f45c87e975ca..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-linkage-patch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main/CMakeLists.txt	2009-04-17 21:09:12.000000000 +0200
-+++ src/main/CMakeLists.txt	2009-06-04 01:47:35.000000000 +0200
-@@ -46,6 +46,8 @@
- 	${KDE4_KDEUI_LIBS}
- 	${KDE4_KHTML_LIBS}
- 	${KDE4_KFILE_LIBS}
-+	${KDE4_PHONON_LIBS}
-+	${KDE4_KROSSCORE_LIBS}
- 	${KDE4_KROSSUI_LIBS}
- 	${common_LIBS}
- 	${config_LIBS}
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild
deleted file mode 100644
index 463d3b18e4bb..000000000000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild,v 1.5 2014/03/16 12:22:38 johu Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bg cs de el es fr pl pt_BR sr"
-inherit kde4-base
-
-DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
-SRC_URI="mirror://sourceforge/subcomposer/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug gstreamer xine"
-
-RDEPEND="
-	gstreamer? ( media-libs/gstreamer:0.10 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-linkage-patch.patch"
-	"${FILESDIR}/${P}-gcc45.patch"
-	"${FILESDIR}/${P}-gold-gstreamer.patch"
-	"${FILESDIR}/${P}-gold-xine.patch"
-)
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	sed -e '/ADD_SUBDIRECTORY( api )/s/^/# DISABLED/' \
-		-i src/main/scripting/examples/CMakeLists.txt \
-		|| die "failed to disable installation of scripting API"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with gstreamer GStreamer)
-		$(cmake-utils_use_with xine)
-	)
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	echo
-	elog "Some example scripts provided by ${PV} require dev-lang/ruby"
-	elog "or dev-lang/python to be installed."
-	echo
-}
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
index a11f02e660b5..abc914feecd9 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild,v 1.3 2015/01/09 13:48:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild,v 1.4 2015/01/26 10:11:09 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
 SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="debug gstreamer unicode xine"
 
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index ba0fea2ef758..aeaabe41064f 100644
--- a/media-video/vlc/vlc-2.1.2.ebuild
+++ b/media-video/vlc/vlc-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.18 2014/12/18 13:36:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.20 2015/01/26 13:53:45 dlan Exp $
 
 EAPI="5"
 
@@ -211,9 +211,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -409,6 +406,11 @@ src_configure() {
 		--disable-vsxu
 
 		# ^ We don't have these disables libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.1.4.ebuild b/media-video/vlc/vlc-2.1.4.ebuild
index 63ca76cc95df..c8659694e2f6 100644
--- a/media-video/vlc/vlc-2.1.4.ebuild
+++ b/media-video/vlc/vlc-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.13 2014/12/18 13:36:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.15 2015/01/26 13:53:45 dlan Exp $
 
 EAPI="5"
 
@@ -212,9 +212,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -424,6 +421,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.1.5.ebuild b/media-video/vlc/vlc-2.1.5.ebuild
index a29c011841ee..e6ac8b8551b6 100644
--- a/media-video/vlc/vlc-2.1.5.ebuild
+++ b/media-video/vlc/vlc-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.6 2014/12/18 13:36:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.8 2015/01/26 13:53:45 dlan Exp $
 
 EAPI="5"
 
@@ -212,9 +212,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -427,6 +424,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index 486c2f8d6b01..bf945f022f2c 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.28 2014/12/18 13:41:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.30 2015/01/26 13:53:45 dlan Exp $
 
 EAPI="5"
 
@@ -212,9 +212,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -424,6 +421,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 5d1d49d3b84d..640d974f4e62 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.5 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.7 2015/01/26 13:53:45 dlan Exp $
 
 EAPI="5"
 
@@ -223,9 +223,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -439,6 +436,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
 }
 
 src_test() {
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 2fa47ba213a7..8765b0441ae1 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.228 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.230 2015/01/26 13:53:45 dlan Exp $
 
 EAPI="5"
 
@@ -223,9 +223,6 @@ src_prepare() {
 		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
 	fi
 
-	# _FORTIFY_SOURCE is set to 2 by default on Gentoo, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-
 	# Bootstrap when we are on a git checkout.
 	if [[ "${PV%9999}" != "${PV}" ]] ; then
 		./bootstrap
@@ -439,6 +436,11 @@ src_configure() {
 		--disable-wasapi
 
 		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
 }
 
 src_test() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 191fd221f0f7..51f29fe2802e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jan 2015 09:36:52 +0000
+Mon, 26 Jan 2015 16:06:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 191fd221f0f7..2c1bad924f0b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jan 2015 09:36:52 +0000
+Mon, 26 Jan 2015 16:06:53 +0000
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.2 b/metadata/md5-cache/app-accessibility/brltty-5.2
index 94b5539c9650..1c2703430c85 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.2
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2
@@ -4,11 +4,11 @@ DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind pe
 EAPI=5
 HOMEPAGE=http://brltty.com/
 IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java +midi ncurses nls ocaml +pcm python usb +speech tcl X elibc_FreeBSD java python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) tcl? ( >=dev-lang/tcl-8.4.15 ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=59357bfff92e1f11b7282bf431dd24e4
+_md5_=4f1c1734f20c6ac474dff56f4d652efb
diff --git a/metadata/md5-cache/app-admin/eselect-ctags-1.18 b/metadata/md5-cache/app-admin/eselect-ctags-1.18
index 753bb26ba6f1..05cddc0545d3 100644
--- a/metadata/md5-cache/app-admin/eselect-ctags-1.18
+++ b/metadata/md5-cache/app-admin/eselect-ctags-1.18
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages ctags implementations
 EAPI=5
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Emacs
-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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=!<app-admin/eselect-emacs-1.18 >=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.18.tar.xz
-_md5_=eb745a4470640ffe58acb7311e91abdf
+_md5_=33930171f80f0b0fd5715aafe046163c
diff --git a/metadata/md5-cache/app-admin/eselect-emacs-1.18 b/metadata/md5-cache/app-admin/eselect-emacs-1.18
index ea594339f7ea..98909c6d96ec 100644
--- a/metadata/md5-cache/app-admin/eselect-emacs-1.18
+++ b/metadata/md5-cache/app-admin/eselect-emacs-1.18
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Manage multiple Emacs versions on one system
 EAPI=5
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-admin/eselect-1.2.6 ~app-admin/eselect-ctags-1.18
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.18.tar.xz
-_md5_=80b9e08fd4404d0bae997790edf69f8c
+_md5_=d2498c6e56073ca29227fb2aa44e0034
diff --git a/metadata/md5-cache/app-admin/hardening-check-2.6 b/metadata/md5-cache/app-admin/hardening-check-2.6
index 494b1badb2c9..ab13d7e96d45 100644
--- a/metadata/md5-cache/app-admin/hardening-check-2.6
+++ b/metadata/md5-cache/app-admin/hardening-check-2.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Report the hardening characterists of a set of binaries
 EAPI=5
 HOMEPAGE=https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/h/hardening-wrapper/hardening-wrapper_2.6.tar.xz
-_md5_=cd94673085afa84546de765ac93339d1
+_md5_=94ced5c42891307d75d82245562246fb
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304
deleted file mode 100644
index 293208ded5b5..000000000000
--- a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
-EAPI=3
-HOMEPAGE=http://sourceforge.net/projects/procinfo-ng/
-KEYWORDS=amd64 hppa x86
-LICENSE=|| ( GPL-2 LGPL-2.1 )
-RDEPEND=sys-libs/ncurses !app-admin/procinfo
-SLOT=0
-SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=898393c427103c5c9ff7ce728dc46916
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
index 6455721c90c1..46c043bde913 100644
--- a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
+++ b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses !app-admin/procinfo virtual/pkgconfig !<sys-devel/gettex
 DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/procinfo-ng/
-KEYWORDS=amd64 hppa ~x86
+KEYWORDS=amd64 hppa x86
 LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=sys-libs/ncurses !app-admin/procinfo
 SLOT=0
 SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ef8a8be921c0283f9fa76f6e802ccad3
+_md5_=c57856c1f0b253aaa7fe7812fde2ef15
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.4 b/metadata/md5-cache/app-admin/ulogd-2.0.4
index 8d9a475cd794..02ff0db7991b 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.4
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=A userspace logging daemon for netfilter/iptables related logging
 EAPI=5
 HOMEPAGE=http://netfilter.org/projects/ulogd/index.html
 IUSE=dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite
-KEYWORDS=amd64 ~ia64 ~ppc ~x86
+KEYWORDS=amd64 ~ia64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.4.tar.bz2 http://www.netfilter.org/projects/ulogd/files/ulogd-2.0.4.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b28a695b75e2139d676644cf72bb97cb
+_md5_=5c275590d1533c6d05c99fa6a127eceb
diff --git a/metadata/md5-cache/app-arch/gzip-1.6 b/metadata/md5-cache/app-arch/gzip-1.6
index e12c1f2a0c48..146d72606320 100644
--- a/metadata/md5-cache/app-arch/gzip-1.6
+++ b/metadata/md5-cache/app-arch/gzip-1.6
@@ -3,9 +3,9 @@ DESCRIPTION=Standard GNU compressor
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gzip/
 IUSE=pic static
-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 ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu-alpha/gzip/gzip-1.6.tar.xz mirror://gnu/gzip/gzip-1.6.tar.xz mirror://gentoo/gzip-1.6.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=51fff995d7dede3e0e3bdb9ad17756a1
+_md5_=18e2f2c52d9cfb11a0af066f7f9d91f7
diff --git a/metadata/md5-cache/app-arch/lzip-1.16 b/metadata/md5-cache/app-arch/lzip-1.16
index 2a51227a714b..384a93c305c3 100644
--- a/metadata/md5-cache/app-arch/lzip-1.16
+++ b/metadata/md5-cache/app-arch/lzip-1.16
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=lossless data compressor based on the LZMA algorithm
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/lzip/lzip.html
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lzip-1.16.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7d39e5eeca8e69ddd1c668f5d1ce1ffa
+_md5_=29fabee68fd937649982722bfac66278
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.16 b/metadata/md5-cache/app-arch/lziprecover-1.16
index a90ab47d8c14..d22420cae60c 100644
--- a/metadata/md5-cache/app-arch/lziprecover-1.16
+++ b/metadata/md5-cache/app-arch/lziprecover-1.16
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=Lziprecover is a data recovery tool and decompressor for files in the lzip compressed data format
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/lzip/lziprecover.html
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/lzip/lziprecover/lziprecover-1.16.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=afdfba7bd298a236f04203798c01c1f3
+_md5_=b7a226027c9bc8fdaa1605def8a29ba4
diff --git a/metadata/md5-cache/app-benchmarks/spew-1.0.8-r1 b/metadata/md5-cache/app-benchmarks/spew-1.0.8-r1
index c0cf4ff93deb..124819e7fc4d 100644
--- a/metadata/md5-cache/app-benchmarks/spew-1.0.8-r1
+++ b/metadata/md5-cache/app-benchmarks/spew-1.0.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Measures I/O performance and/or generates I/O load
 EAPI=4
 HOMEPAGE=http://spew.berlios.de/
 IUSE=static
-KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt )
 SLOT=0
 SRC_URI=ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c9f786bdb10f4eafd4e41d9931a46179
+_md5_=9200ea3649e747a1b125b71810a9b04b
diff --git a/metadata/md5-cache/app-crypt/ckpass-0.2 b/metadata/md5-cache/app-crypt/ckpass-0.2
index 892f3902a270..921c9eb5b05f 100644
--- a/metadata/md5-cache/app-crypt/ckpass-0.2
+++ b/metadata/md5-cache/app-crypt/ckpass-0.2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/libkpass-6
+DEFINED_PHASES=prepare
+DEPEND=>=dev-libs/libkpass-6 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An ncurses based password database client that is compatible with KeePass 1.x format databases
 EAPI=5
 HOMEPAGE=http://ckpass.sourceforge.net/
@@ -8,4 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/libkpass-6
 SLOT=0
 SRC_URI=mirror://sourceforge/ckpass/ckpass-0.2.tar.gz
-_md5_=785331b22ccb803f0f4853cc65beb965
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=80f0e15b686b003486dfa76d5576ca73
diff --git a/metadata/md5-cache/app-crypt/dirmngr-1.1.1-r1 b/metadata/md5-cache/app-crypt/dirmngr-1.1.1-r1
index f94add7f6ab4..650d83dd3ebe 100644
--- a/metadata/md5-cache/app-crypt/dirmngr-1.1.1-r1
+++ b/metadata/md5-cache/app-crypt/dirmngr-1.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=DirMngr is a daemon to handle CRL and certificate requests for GnuPG
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/download/index.en.html#dirmngr
 IUSE=nls
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=net-nds/openldap-2.1.26 >=dev-libs/libgpg-error-1.4 >=dev-libs/libgcrypt-1.4.0:0 >=dev-libs/libksba-1.0.2 >=dev-libs/pth-1.3.7 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/dirmngr/dirmngr-1.1.1.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=55d74c6e8b9ff780be8f6e3beff42d83
+_md5_=00eb9491129de0edf74d94807f7c6064
diff --git a/metadata/md5-cache/app-crypt/md6sum-1.0-r1 b/metadata/md5-cache/app-crypt/md6sum-1.0-r1
deleted file mode 100644
index 5bbcab9bf509..000000000000
--- a/metadata/md5-cache/app-crypt/md6sum-1.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A C implementation of MD6
-EAPI=4
-HOMEPAGE=http://groups.csail.mit.edu/cis/md6
-KEYWORDS=amd64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=mirror://sourceforge/md6sum/md6sum-1.0.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=aa977e2203ade74188ff3bf70c74744d
diff --git a/metadata/md5-cache/app-crypt/md6sum-1.0-r2 b/metadata/md5-cache/app-crypt/md6sum-1.0-r2
index 844095ac9c1c..09ca4da5394f 100644
--- a/metadata/md5-cache/app-crypt/md6sum-1.0-r2
+++ b/metadata/md5-cache/app-crypt/md6sum-1.0-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=A C implementation of MD6
 EAPI=5
 HOMEPAGE=http://groups.csail.mit.edu/cis/md6
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/md6sum/md6sum-1.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=498add76b67579a386f103019c8597c5
+_md5_=71c84cd986ebb2d78ea67f2d946dd132
diff --git a/metadata/md5-cache/app-crypt/pgpdump-0.29 b/metadata/md5-cache/app-crypt/pgpdump-0.29
index ea0875f49668..204c074f6611 100644
--- a/metadata/md5-cache/app-crypt/pgpdump-0.29
+++ b/metadata/md5-cache/app-crypt/pgpdump-0.29
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib app-arch/bzip2
 DESCRIPTION=A PGP packet visualizer
 EAPI=5
 HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
-KEYWORDS=amd64 ppc ~sparc ~x86
+KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib app-arch/bzip2
 SLOT=0
 SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.29.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cdda0435973f532b0a2bd8a2ac02959f
+_md5_=471fffa3a68bc1bee14c69800033aa45
diff --git a/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r1 b/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r1
deleted file mode 100644
index 9f8128b8956e..000000000000
--- a/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/openssl-0.9.7e dev-perl/Locale-gettext >=virtual/perl-MIME-Base64-2.12 >=dev-perl/gtk2-perl-1.072 >=sys-apps/sed-4
-DESCRIPTION=Simple Perl/Tk GUI to manage a small certification authority
-HOMEPAGE=http://tinyca.sm-zone.net/
-IUSE=linguas_en linguas_de linguas_cs linguas_es linguas_sv
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=Artistic
-RDEPEND=>=dev-libs/openssl-0.9.7e dev-perl/Locale-gettext >=virtual/perl-MIME-Base64-2.12 >=dev-perl/gtk2-perl-1.072
-SLOT=0
-SRC_URI=http://tinyca.sm-zone.net/tinyca2-0.7.5.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b236418fba21957c9fcfa49760630487
diff --git a/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r2 b/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r2
index 9e60684ee1d9..96772bde5355 100644
--- a/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r2
+++ b/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Perl/Tk GUI to manage a small certification authority
 EAPI=5
 HOMEPAGE=http://tinyca.sm-zone.net/
 IUSE=linguas_en linguas_de linguas_cs linguas_es linguas_sv
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=Artistic
 RDEPEND=>=dev-libs/openssl-0.9.7e dev-perl/Locale-gettext >=virtual/perl-MIME-Base64-2.12 >=dev-perl/gtk2-perl-1.072
 SLOT=0
 SRC_URI=http://tinyca.sm-zone.net/tinyca2-0.7.5.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f721c73944af7dcb483fa7400f61517c
+_md5_=ed02acd41d1e8279f71cc9bcf2230d0a
diff --git a/metadata/md5-cache/app-dicts/dictd-vera-1.22 b/metadata/md5-cache/app-dicts/dictd-vera-1.22
index 74c9bc3ad9be..7af2d72fe3a5 100644
--- a/metadata/md5-cache/app-dicts/dictd-vera-1.22
+++ b/metadata/md5-cache/app-dicts/dictd-vera-1.22
@@ -3,9 +3,9 @@ DEPEND=>=app-text/dictd-1.5.5
 DESCRIPTION=V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict
 EAPI=5
 HOMEPAGE=http://home.snafu.de/ohei/vera/vueber-e.html
-KEYWORDS=amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=FDL-1.3
 RDEPEND=>=app-text/dictd-1.5.5
 SLOT=0
 SRC_URI=mirror://gnu/vera/vera-1.22.tar.gz
-_md5_=fcb61bf63fb8bf00e0baee8cb993b588
+_md5_=24899583f9cd4f19c8c033c9a65db037
diff --git a/metadata/md5-cache/app-dicts/myspell-id-2.0 b/metadata/md5-cache/app-dicts/myspell-id-2.0
index 87c64e6032ca..a4bd547092da 100644
--- a/metadata/md5-cache/app-dicts/myspell-id-2.0
+++ b/metadata/md5-cache/app-dicts/myspell-id-2.0
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Indonesian dictionaries for myspell/hunspell
 EAPI=4
 HOMEPAGE=http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius
-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
 SLOT=0
 SRC_URI=http://extensions.libreoffice.org/extension-center/indonesian-dictionary-kamus-indonesia-by-benitius/releases/2.0/id_id.oxt -> myspell-id-2.0.oxt
 _eclasses_=myspell-r2	16f301e982001f671a68d8c364cabbd0
-_md5_=ba2df88c1765286df6bcdc283df0a827
+_md5_=4657116a5bb092e17056c5f9730686a1
diff --git a/metadata/md5-cache/app-dicts/myspell-lv-1.0.0 b/metadata/md5-cache/app-dicts/myspell-lv-1.0.0
index c290c3000779..146cfdc94593 100644
--- a/metadata/md5-cache/app-dicts/myspell-lv-1.0.0
+++ b/metadata/md5-cache/app-dicts/myspell-lv-1.0.0
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Latvian dictionaries for myspell/hunspell
 EAPI=5
 HOMEPAGE=http://dict.dv.lv/home.php?prj=lv http://extensions.libreoffice.org/extension-center/latviesu-valodas-pareizrakstibas-parbaudes-modulis
-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=LGPL-2.1
 SLOT=0
 SRC_URI=http://dict.dv.lv/download/lv_LV-1.0.0.zip
 _eclasses_=myspell-r2	16f301e982001f671a68d8c364cabbd0
-_md5_=812940fcb35c120a7d364383132d89fb
+_md5_=f1c5f6f47933c521fa4705ce97576ac8
diff --git a/metadata/md5-cache/app-dicts/myspell-ro-3.3.10 b/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
index 58a071be161a..47b62bdf4de0 100644
--- a/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
+++ b/metadata/md5-cache/app-dicts/myspell-ro-3.3.10
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Romanian dictionaries for myspell/hunspell
 EAPI=5
 HOMEPAGE=http://rospell.wordpress.com/
-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 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/rospell/ro_RO.3.3.10.zip mirror://sourceforge/rospell/hyph_ro_RO.3.3.10.zip mirror://sourceforge/rospell/th_ro_RO.3.3.zip
 _eclasses_=myspell-r2	16f301e982001f671a68d8c364cabbd0
-_md5_=07aab5d2d8d6ab758d83b640540101d8
+_md5_=d92207274846f17c69f1ce9620c8c067
diff --git a/metadata/md5-cache/app-emacs/css-mode-0.11-r1 b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
index 8799bd7b48ec..30f3828b1046 100644
--- a/metadata/md5-cache/app-emacs/css-mode-0.11-r1
+++ b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=A major mode for editing Cascading Style Sheets (CSS)
 EAPI=5
 HOMEPAGE=http://www.garshol.priv.no/download/software/css-mode/
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
 _eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=988255587d46b570e3fba4f4f8196f2a
+_md5_=2942ad5435f04dd4cf88fc56b700b95b
diff --git a/metadata/md5-cache/app-emacs/folding-2013.0613.1821 b/metadata/md5-cache/app-emacs/folding-2013.0613.1821
index 6bbe6b88c023..37f7fa00087b 100644
--- a/metadata/md5-cache/app-emacs/folding-2013.0613.1821
+++ b/metadata/md5-cache/app-emacs/folding-2013.0613.1821
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=A folding-editor-like Emacs minor mode
 EAPI=5
 HOMEPAGE=http://www.emacswiki.org/cgi-bin/wiki/FoldingMode
-KEYWORDS=~alpha amd64 ~x86
+KEYWORDS=~alpha amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/distfiles/folding-2013.0613.1821.el.xz
 _eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cabb6e94a5e371901af47a4d471c39ff
+_md5_=6b2cec2e061f92b625482036c5a840ae
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.19.3 b/metadata/md5-cache/app-emacs/po-mode-0.19.3
index d1787669a1ad..da3fb48d71f6 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.3
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.3
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=Major mode for GNU gettext PO files
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gettext/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.3.tar.gz
 _eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6f425dc838c9228d7e7ef336061e997c
+_md5_=ed2f71051fce601e5f8c8cb4a92d4883
diff --git a/metadata/md5-cache/app-emulation/free42-1.5.5 b/metadata/md5-cache/app-emulation/free42-1.5.5
index 2147569a3379..b678e0c91fa2 100644
--- a/metadata/md5-cache/app-emulation/free42-1.5.5
+++ b/metadata/md5-cache/app-emulation/free42-1.5.5
@@ -4,10 +4,10 @@ DESCRIPTION=An HP-42S Calculator Simulator
 EAPI=5
 HOMEPAGE=http://thomasokken.com/free42/
 IUSE=alsa
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=mirror://gentoo/free42-1.5.5.tgz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9a1e5acdec118da0526bbad25326d750
+_md5_=77cceebb3e7f5366bc7316d6174e74df
diff --git a/metadata/md5-cache/app-forensics/foremost-1.5.7-r2 b/metadata/md5-cache/app-forensics/foremost-1.5.7-r2
index 26e8cf297e60..8e1c1a188195 100644
--- a/metadata/md5-cache/app-forensics/foremost-1.5.7-r2
+++ b/metadata/md5-cache/app-forensics/foremost-1.5.7-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A console program to recover files based on their headers and footers
 EAPI=4
 HOMEPAGE=http://foremost.sourceforge.net/
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://foremost.sourceforge.net/pkg/foremost-1.5.7.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c1322d04f4d96c3a343660999aebdd9f
+_md5_=8d872aba9ae7f77cc36d7fbbc9848d59
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203 b/metadata/md5-cache/app-laptop/hdapsd-20141203
index 8e38ee403906..337e6d80e6d1 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203
@@ -4,10 +4,10 @@ DESCRIPTION=IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon
 EAPI=5
 HOMEPAGE=https://github.com/evgeni/hdapsd/
 IUSE=libconfig
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libconfig? ( dev-libs/libconfig )
 SLOT=0
 SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f56d01c32f0fb7f9d9f6f3ff31b5f712
+_md5_=c1db233cf46881b234ff60a8c7ad1633
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.10 b/metadata/md5-cache/app-misc/beanstalkd-1.10
index 371d1f1dc6a9..fc9efb6bad0a 100644
--- a/metadata/md5-cache/app-misc/beanstalkd-1.10
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.10
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A simple, fast work queue
 EAPI=5
 HOMEPAGE=http://kr.github.io/beanstalkd/
-KEYWORDS=amd64 ~mips ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~mips x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/kr/beanstalkd/archive/v1.10.tar.gz -> beanstalkd-1.10.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a061441d3f2446a617f19245f95494da
+_md5_=dc3c81ad6908cea57ddef0a15ec65c66
diff --git a/metadata/md5-cache/app-misc/colordiff-1.0.13-r1 b/metadata/md5-cache/app-misc/colordiff-1.0.13-r1
index 2ff5f1243a96..5cd85ac9603c 100644
--- a/metadata/md5-cache/app-misc/colordiff-1.0.13-r1
+++ b/metadata/md5-cache/app-misc/colordiff-1.0.13-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Colorizes output of diff
 EAPI=5
 HOMEPAGE=http://www.colordiff.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl sys-apps/diffutils
 SLOT=0
 SRC_URI=http://www.colordiff.org/colordiff-1.0.13.tar.gz
 _eclasses_=prefix	21058c21ca48453d771df15500873ede
-_md5_=4804c4ef3fac4a61a71aab0467275076
+_md5_=098f35dfc8e5636aacb39815e2f6a50d
diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3 b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3
index 6b4c887cc7f0..929d4779138a 100644
--- a/metadata/md5-cache/app-misc/devtodo-0.1.20-r3
+++ b/metadata/md5-cache/app-misc/devtodo-0.1.20-r3
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 !<sys-devel/gettext-0.18.1
 DESCRIPTION=A nice command line todo list for developers
 EAPI=5
 HOMEPAGE=http://swapoff.org/DevTodo
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1
 SLOT=0
 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e3d76a33b4e6bdc120e0331f5d3fac7d
+_md5_=dc4c11fb799210a437cd013ecd307e8c
diff --git a/metadata/md5-cache/app-misc/gcal-3.6.2 b/metadata/md5-cache/app-misc/gcal-3.6.2
deleted file mode 100644
index a6280f911a10..000000000000
--- a/metadata/md5-cache/app-misc/gcal-3.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
-DESCRIPTION=The GNU Calendar - a replacement for cal
-EAPI=5
-HOMEPAGE=http://www.gnu.org/software/gcal/
-IUSE=ncurses nls unicode
-KEYWORDS=amd64 ~arm ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/gcal/gcal-3.6.2.tar.xz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=02e68b2cea4836cb7549ba7a4cf485e7
diff --git a/metadata/md5-cache/app-misc/gcal-3.6.3 b/metadata/md5-cache/app-misc/gcal-3.6.3
index d4554da0abbe..bb4f9f64e02d 100644
--- a/metadata/md5-cache/app-misc/gcal-3.6.3
+++ b/metadata/md5-cache/app-misc/gcal-3.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Calendar - a replacement for cal
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gcal/
 IUSE=ncurses nls unicode
-KEYWORDS=amd64 ~arm ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/gcal/gcal-3.6.3.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9fc0dec608e62edce5e71775e6667276
+_md5_=544554e0ee5b71efe96f4111097c6cfa
diff --git a/metadata/md5-cache/app-misc/gourmet-0.17.4 b/metadata/md5-cache/app-misc/gourmet-0.17.4
index e4c3a192fd58..679e4deee7c3 100644
--- a/metadata/md5-cache/app-misc/gourmet-0.17.4
+++ b/metadata/md5-cache/app-misc/gourmet-0.17.4
@@ -4,11 +4,11 @@ DESCRIPTION=Recipe Organizer and Shopping List Generator for Gnome
 EAPI=5
 HOMEPAGE=http://thinkle.github.com/gourmet/
 IUSE=-i18n -ipython pdf print spell sound web python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/pygtk-2.22.0:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.9-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] i18n? ( dev-python/elib-intl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ipython? ( >=dev-python/ipython-0.13.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdf? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) print? ( >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-poppler-0.12.1-r4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) spell? ( >=dev-python/gtkspell-python-2.25.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sound? ( >=dev-python/gst-python-0.10.22-r1:0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz -> gourmet-0.17.4.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4060d0f4892a330d1bd0cdae3df2037b
+_md5_=7d0f9ae54f8dd4712f5783afa52f9cbf
diff --git a/metadata/md5-cache/app-misc/gtypist-2.9.5 b/metadata/md5-cache/app-misc/gtypist-2.9.5
index bb4a83a43261..13661a1620dc 100644
--- a/metadata/md5-cache/app-misc/gtypist-2.9.5
+++ b/metadata/md5-cache/app-misc/gtypist-2.9.5
@@ -4,10 +4,10 @@ DESCRIPTION=Universal typing tutor
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gtypist/
 IUSE=nls emacs xemacs
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs ) xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
 SLOT=0
 SRC_URI=mirror://gnu/gtypist/gtypist-2.9.5.tar.xz http://colemak.com/pub/learn/colemak.typ
 _eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e4478a614c3f50ca6f25447895562866
+_md5_=1b73fa57862007c45671ad30fb28f044
diff --git a/metadata/md5-cache/app-misc/nut-20.1 b/metadata/md5-cache/app-misc/nut-20.1
index f9a754e75056..3f53fa97aa59 100644
--- a/metadata/md5-cache/app-misc/nut-20.1
+++ b/metadata/md5-cache/app-misc/nut-20.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Record what you eat and analyze your nutrient levels
 EAPI=5
 HOMEPAGE=http://nut.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ~ppc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/nut/nut-20.1.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2a4c8c2da18b6742af3df07de76c787f
+_md5_=35a725924d00d57287880ad690a2cad2
diff --git a/metadata/md5-cache/app-misc/wcd-5.2.5 b/metadata/md5-cache/app-misc/wcd-5.2.5
deleted file mode 100644
index 439ab0b8cfe6..000000000000
--- a/metadata/md5-cache/app-misc/wcd-5.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
-DESCRIPTION=Wherever Change Directory
-EAPI=5
-HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-IUSE=nls unicode
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring )
-SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd-5.2.5.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=aa8a12608f63d39e6d21381a441fd3d7
diff --git a/metadata/md5-cache/app-misc/when-1.1.33 b/metadata/md5-cache/app-misc/when-1.1.33
deleted file mode 100644
index 485db3af4df5..000000000000
--- a/metadata/md5-cache/app-misc/when-1.1.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic
-EAPI=5
-HOMEPAGE=http://www.lightandmatter.com/when/when.html
-KEYWORDS=amd64 ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Artistic
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.33.tar.gz
-_md5_=7b5c768f0b48b8f12bb0ac82716e7e55
diff --git a/metadata/md5-cache/app-mobilephone/anyremote-6.4 b/metadata/md5-cache/app-mobilephone/anyremote-6.4
index 141bfe420ef6..2019f68831d0 100644
--- a/metadata/md5-cache/app-mobilephone/anyremote-6.4
+++ b/metadata/md5-cache/app-mobilephone/anyremote-6.4
@@ -4,9 +4,9 @@ DESCRIPTION=Anyremote provides wireless bluetooth, infrared or cable remote cont
 EAPI=5
 HOMEPAGE=http://anyremote.sourceforge.net/
 IUSE=bluetooth dbus
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus ) x11-libs/libXtst
 SLOT=0
 SRC_URI=mirror://sourceforge/anyremote/anyremote-6.4.tar.gz
-_md5_=d56668e7ede18be478873dbdad472c24
+_md5_=33a46c87159cab2ecbc83229389b0990
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.17 b/metadata/md5-cache/app-office/gnumeric-1.12.19
similarity index 94%
rename from metadata/md5-cache/app-office/gnumeric-1.12.17
rename to metadata/md5-cache/app-office/gnumeric-1.12.19
index 098537372717..26619d5e7a21 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.17
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.19
@@ -4,12 +4,12 @@ DESCRIPTION=The GNOME Spreadsheet
 EAPI=5
 HOMEPAGE=http://www.gnumeric.org/
 IUSE=+introspection libgda perl python python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.24:= >=x11-libs/goffice-0.10.14:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) libgda? ( gnome-extra/libgda:5[gtk] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.17.tar.xz
+SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.19.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=17a5225a4f78cc19ec4b53b949c6bce9
+_md5_=5b08265d431c981cc8b46f19b0fb1886
diff --git a/metadata/md5-cache/app-office/skrooge-1.8.0 b/metadata/md5-cache/app-office/skrooge-1.8.0
deleted file mode 100644
index 04e1b3a52376..000000000000
--- a/metadata/md5-cache/app-office/skrooge-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop(+)] app-crypt/qca:2 dev-db/sqlite:3 dev-libs/grantlee:0 >=dev-libs/libofx-0.9.1 dev-qt/qtsql:4[sqlite] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=personal finances manager for KDE4, aiming at being simple and intuitive
-EAPI=5
-HOMEPAGE=http://www.skrooge.org/
-IUSE=debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop(+)] app-crypt/qca:2 dev-db/sqlite:3 dev-libs/grantlee:0 >=dev-libs/libofx-0.9.1 dev-qt/qtsql:4[sqlite] >=kde-base/kde-dev-scripts-4.4:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_ko? ( || ( kde-apps/kde-l10n[linguas_ko(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-RESTRICT=test
-SLOT=4
-SRC_URI=mirror://kde/stable/skrooge/skrooge-1.8.0.tar.bz2
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=235020da0e35a1cc00fa1ff0ebd0aeed
diff --git a/metadata/md5-cache/app-office/skrooge-1.9.0 b/metadata/md5-cache/app-office/skrooge-1.9.0
index 0d5233b461bb..ba4923723705 100644
--- a/metadata/md5-cache/app-office/skrooge-1.9.0
+++ b/metadata/md5-cache/app-office/skrooge-1.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=personal finances manager for KDE4, aiming at being simple and intui
 EAPI=5
 HOMEPAGE=http://www.skrooge.org/
 IUSE=debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_ko linguas_lt linguas_mr linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] app-crypt/qca:2 dev-db/sqlite:3 dev-libs/grantlee:0 >=dev-libs/libofx-0.9.1 dev-libs/qjson dev-qt/qtsql:4[sqlite] >=kde-base/kde-dev-scripts-4.4:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_eo? ( || ( kde-apps/kde-l10n[linguas_eo(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_fi? ( || ( kde-apps/kde-l10n[linguas_fi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_ia? ( || ( kde-apps/kde-l10n[linguas_ia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ia(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_ko? ( || ( kde-apps/kde-l10n[linguas_ko(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mr? ( || ( kde-apps/kde-l10n[linguas_mr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) ) linguas_ms? ( || ( kde-apps/kde-l10n[linguas_ms(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ms(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sk? ( || ( kde-apps/kde-l10n[linguas_sk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_ug? ( || ( kde-apps/kde-l10n[linguas_ug(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/skrooge/skrooge-1.9.0.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cd526f01bd26ea7ddd12f76f0a15f1e9
+_md5_=45458990a93ceca925750a4f239b40a4
diff --git a/metadata/md5-cache/app-portage/eix-0.25.5 b/metadata/md5-cache/app-portage/eix-0.25.5
deleted file mode 100644
index 350cd274afb2..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.25.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=app-shells/push sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
-EAPI=4
-HOMEPAGE=http://eix.berlios.de
-IUSE=debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/push sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://berlios/eix/eix-0.25.5.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7cd88cc1c3ca1f3f314df081f518805a
diff --git a/metadata/md5-cache/app-portage/eix-0.29.3 b/metadata/md5-cache/app-portage/eix-0.29.3
deleted file mode 100644
index e7699695f6cf..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.29.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils clang? ( sys-devel/clang ) nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
-EAPI=5
-HOMEPAGE=http://eix.berlios.de
-IUSE=clang debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools zsh-completion linguas_de linguas_ru
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
-SLOT=0
-SRC_URI=mirror://berlios/eix/eix-0.29.3.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bd7470599ab71365508773c89ea1481f
diff --git a/metadata/md5-cache/app-portage/eix-0.30.3 b/metadata/md5-cache/app-portage/eix-0.30.3
deleted file mode 100644
index 71622df8d1b6..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.30.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
-EAPI=5
-HOMEPAGE=http://github.com/vaeth/eix/
-IUSE=debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~axs/distfiles/eix-0.30.3.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ea6fdf32f9d176835844f49df0a131a7
diff --git a/metadata/md5-cache/app-portage/epm-1.40 b/metadata/md5-cache/app-portage/epm-1.40
index 801b1c2534f9..35e674603e1a 100644
--- a/metadata/md5-cache/app-portage/epm-1.40
+++ b/metadata/md5-cache/app-portage/epm-1.40
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/perl-5
 DESCRIPTION=rpm workalike for Gentoo Linux
 EAPI=4
 HOMEPAGE=https://github.com/fuzzyray/epm
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5
 SLOT=0
 SRC_URI=http://www.gentoo.org/~fuzzyray/distfiles/epm-1.40.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6d5095108b96efb49dd6e1bb979afc78
+_md5_=ebe91406880ea203b77e8dbdeb145df0
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.3 b/metadata/md5-cache/app-portage/overlint-0.5.3
index f0dbd83dc97d..3b9e7467112c 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.3
+++ b/metadata/md5-cache/app-portage/overlint-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Simple tool for static analysis of overlays
 EAPI=5
 HOMEPAGE=http://git.overlays.gentoo.org/gitweb/?p=proj/overlint.git;a=summary
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=sys-apps/portage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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=http://www.hartwork.org/public/overlint-0.5.3.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=57adb2813cad609e0aae9be10fe63960
+_md5_=d52bbc259f1fae7c4becca578aa8e718
diff --git a/metadata/md5-cache/app-text/diction-1.13 b/metadata/md5-cache/app-text/diction-1.13
index aa622643723f..6c127ae20bcc 100644
--- a/metadata/md5-cache/app-text/diction-1.13
+++ b/metadata/md5-cache/app-text/diction-1.13
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gettext virtual/libintl
 DESCRIPTION=Diction and style checkers for english and german texts
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/diction/diction.html
-KEYWORDS=amd64 hppa ~mips ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 hppa ~mips ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://www.moria.de/~michael/diction/diction-1.13.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1a5ccdee714666cc41a8aa6aa81cfbd2
+_md5_=93cf3a302293fa7c2b2f07e50ee6bc4e
diff --git a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0-r1 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0-r1
index f3447d246e68..703d495d3414 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0-r1
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.78.0-r1
@@ -3,10 +3,10 @@ DESCRIPTION=XSL Stylesheets for Docbook
 EAPI=5
 HOMEPAGE=http://wiki.docbook.org/topic/DocBookXslStylesheets
 IUSE=ruby
-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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:2.0 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.78.0.tar.bz2
-_md5_=8dcff758bcb0c0922ecf7895d148cdbd
+_md5_=2d9f5a1cd7c8456aef2b5a6b0c989481
diff --git a/metadata/md5-cache/app-text/dvipdfmx-20110311-r1 b/metadata/md5-cache/app-text/dvipdfmx-20110311-r1
index 155b009886c6..6cbb66438826 100644
--- a/metadata/md5-cache/app-text/dvipdfmx-20110311-r1
+++ b/metadata/md5-cache/app-text/dvipdfmx-20110311-r1
@@ -3,10 +3,10 @@ DEPEND=app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib dev-libs/kpaths
 DESCRIPTION=DVI to PDF translator with multi-byte character support
 EAPI=3
 HOMEPAGE=http://project.ktug.or.kr/dvipdfmx/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib dev-libs/kpathsea app-text/libpaper virtual/tex-base >=app-text/poppler-0.12.3-r3 app-text/poppler-data
 SLOT=0
 SRC_URI=http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110311.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	texlive-common	8bd0f2143e4bb5fa3bb0bb56aa08006f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b11ea4cb6edc7dc40fa01d04e0092a03
+_md5_=cb99b6be5d60593b0a91770f54772945
diff --git a/metadata/md5-cache/app-text/html-xml-utils-6.8 b/metadata/md5-cache/app-text/html-xml-utils-6.8
index 6a5590e9b101..a9ad1028a3c1 100644
--- a/metadata/md5-cache/app-text/html-xml-utils-6.8
+++ b/metadata/md5-cache/app-text/html-xml-utils-6.8
@@ -3,9 +3,9 @@ DEPEND=net-misc/curl
 DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
 EAPI=5
 HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
-KEYWORDS=amd64 ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=W3C
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-6.8.tar.gz
-_md5_=6c077b38e46015bbef43b7d0640de3f6
+_md5_=23397c74963a91bdc09f47aabf590379
diff --git a/metadata/md5-cache/app-text/hunspell-1.3.3 b/metadata/md5-cache/app-text/hunspell-1.3.3
index 361f00f7d5c0..6127296eae8c 100644
--- a/metadata/md5-cache/app-text/hunspell-1.3.3
+++ b/metadata/md5-cache/app-text/hunspell-1.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Hunspell spell checker - an improved replacement for myspell in OOo
 EAPI=5
 HOMEPAGE=http://hunspell.sourceforge.net/
 IUSE=ncurses nls readline static-libs linguas_af linguas_bg linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_eo linguas_es linguas_et linguas_fo linguas_fr linguas_ga linguas_gl linguas_he linguas_hr linguas_hu linguas_ia linguas_id linguas_is linguas_it linguas_km linguas_ku linguas_lt linguas_lv linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sq linguas_sv linguas_sw linguas_tn linguas_uk linguas_zu
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 PDEPEND=app-dicts/myspell-en linguas_af? ( app-dicts/myspell-af ) linguas_bg? ( app-dicts/myspell-bg ) linguas_ca? ( app-dicts/myspell-ca ) linguas_cs? ( app-dicts/myspell-cs ) linguas_cy? ( app-dicts/myspell-cy ) linguas_da? ( app-dicts/myspell-da ) linguas_de? ( || ( app-dicts/myspell-de app-dicts/myspell-de-alt ) ) linguas_el? ( app-dicts/myspell-el ) linguas_en? ( app-dicts/myspell-en ) linguas_eo? ( app-dicts/myspell-eo ) linguas_es? ( app-dicts/myspell-es ) linguas_et? ( app-dicts/myspell-et ) linguas_fo? ( app-dicts/myspell-fo ) linguas_fr? ( app-dicts/myspell-fr ) linguas_ga? ( app-dicts/myspell-ga ) linguas_gl? ( app-dicts/myspell-gl ) linguas_he? ( app-dicts/myspell-he ) linguas_hr? ( app-dicts/myspell-hr ) linguas_hu? ( app-dicts/myspell-hu ) linguas_ia? ( app-dicts/myspell-ia ) linguas_id? ( app-dicts/myspell-id ) linguas_is? ( app-dicts/myspell-is ) linguas_it? ( app-dicts/myspell-it ) linguas_km? ( app-dicts/myspell-km ) linguas_ku? ( app-dicts/myspell-ku ) linguas_lt? ( app-dicts/myspell-lt ) linguas_lv? ( app-dicts/myspell-lv ) linguas_mk? ( app-dicts/myspell-mk ) linguas_ms? ( app-dicts/myspell-ms ) linguas_nb? ( app-dicts/myspell-nb ) linguas_nl? ( app-dicts/myspell-nl ) linguas_nn? ( app-dicts/myspell-nn ) linguas_pl? ( app-dicts/myspell-pl ) linguas_pt? ( app-dicts/myspell-pt ) linguas_pt_BR? ( app-dicts/myspell-pt-br ) linguas_ro? ( app-dicts/myspell-ro ) linguas_ru? ( app-dicts/myspell-ru ) linguas_sk? ( app-dicts/myspell-sk ) linguas_sl? ( app-dicts/myspell-sl ) linguas_sq? ( app-dicts/myspell-sq ) linguas_sv? ( app-dicts/myspell-sv ) linguas_sw? ( app-dicts/myspell-sw ) linguas_tn? ( app-dicts/myspell-tn ) linguas_uk? ( app-dicts/myspell-uk ) linguas_zu? ( app-dicts/myspell-zu )
 RDEPEND=ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hunspell-1.3.3.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c67d0ae1fbbd8f8094d34fe38d64f781
+_md5_=0021230d6a51cb81a4e4efca9523c4e2
diff --git a/metadata/md5-cache/app-text/pdftk-1.44 b/metadata/md5-cache/app-text/pdftk-1.44
deleted file mode 100644
index 0e5c53620f90..000000000000
--- a/metadata/md5-cache/app-text/pdftk-1.44
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-devel/gcc-4.3.1[gcj]
-DESCRIPTION=A tool for manipulating PDF documents
-EAPI=2
-HOMEPAGE=http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/gcc-4.3.1[gcj]
-SLOT=0
-SRC_URI=http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-1.44-src.zip
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=def61b289c0a8fcb551bbe9c0cfb007f
diff --git a/metadata/md5-cache/app-text/pdftk-1.45 b/metadata/md5-cache/app-text/pdftk-1.45
deleted file mode 100644
index 9cfd5eab5c55..000000000000
--- a/metadata/md5-cache/app-text/pdftk-1.45
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/gcc[gcj]
-DESCRIPTION=A tool for manipulating PDF documents
-EAPI=5
-HOMEPAGE=http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=sys-devel/gcc[gcj]
-SLOT=0
-SRC_URI=http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-1.45-src.zip
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4b045fb592d0a7fe10cbec7e40414e77
diff --git a/metadata/md5-cache/app-text/pdftk-2.02 b/metadata/md5-cache/app-text/pdftk-2.02
index 195acd09ed9c..b3341ae16d6b 100644
--- a/metadata/md5-cache/app-text/pdftk-2.02
+++ b/metadata/md5-cache/app-text/pdftk-2.02
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gcc[gcj]
 DESCRIPTION=A tool for manipulating PDF documents
 EAPI=5
 HOMEPAGE=http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
-KEYWORDS=amd64 ~arm ppc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=sys-devel/gcc[gcj]
 SLOT=0
 SRC_URI=http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1b9ac56a111a06a58ce4edeae66a2556
+_md5_=14a773210f9d8c2778cd371343a1d833
diff --git a/metadata/md5-cache/app-text/t1utils-1.38 b/metadata/md5-cache/app-text/t1utils-1.38
index 5f1d7fa3fd8d..e8c7febb75a1 100644
--- a/metadata/md5-cache/app-text/t1utils-1.38
+++ b/metadata/md5-cache/app-text/t1utils-1.38
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Type 1 Font utilities
 HOMEPAGE=http://www.lcdf.org/type/#t1utils
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.38.tar.gz
-_md5_=ca01c8d3d048340f00285bd3bd964dc9
+_md5_=aa95bb0c78d82782d07fc67cf9e10869
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2 b/metadata/md5-cache/app-text/wdiff-1.2.2
index 3e6fef4e9607..b507f062c639 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2
@@ -4,9 +4,9 @@ DESCRIPTION=Create a diff disregarding formatting
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/wdiff/
 IUSE=experimental test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=95a641b9e1605e74f9e05881f5f91413
+_md5_=3870b073745ef126db78208b42115b6d
diff --git a/metadata/md5-cache/app-text/xmlstarlet-1.6.1 b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
index e7b29dfaa722..a68137e7836d 100644
--- a/metadata/md5-cache/app-text/xmlstarlet-1.6.1
+++ b/metadata/md5-cache/app-text/xmlstarlet-1.6.1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt:0 v
 DESCRIPTION=A set of tools to transform, query, validate, and edit XML documents
 EAPI=4
 HOMEPAGE=http://xmlstar.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt:0 virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/xmlstar/xmlstarlet-1.6.1.tar.gz
-_md5_=9a2f90bede3abcf09fbb292c1de3dedb
+_md5_=2c0ee2e8ccf4e42b5d5ee38ce4716d2b
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.26 b/metadata/md5-cache/app-text/xmlto-0.0.26
index 9f14227d8bb4..3366d996ab9a 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.26
+++ b/metadata/md5-cache/app-text/xmlto-0.0.26
@@ -4,10 +4,10 @@ DESCRIPTION=script for converting XML and DocBook formatted documents to a varie
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/xmlto/
 IUSE=latex
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.26.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=93ef669fbc40332a4b5406afbfa13db6
+_md5_=3c5562dd646f97397a71eaeb485c3d19
diff --git a/metadata/md5-cache/dev-db/ctdb-1.13-r1 b/metadata/md5-cache/dev-db/ctdb-1.13-r1
index 32d11c6125c5..97ad6b1d090c 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.13-r1
+++ b/metadata/md5-cache/dev-db/ctdb-1.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A cluster implementation of the TDB database used to store temporary
 EAPI=5
 HOMEPAGE=http://ctdb.samba.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.16-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/ctdb-1.13.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=08df76ed1baa729f5f9f87bd069bc19a
+_md5_=69c4fa3aca786991b254c0e21f621bb2
diff --git a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76 b/metadata/md5-cache/dev-db/kyotocabinet-1.2.76
deleted file mode 100644
index 0fd37e3ca760..000000000000
--- a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/zlib app-arch/xz-utils
-DESCRIPTION=A straightforward implementation of DBM
-EAPI=2
-HOMEPAGE=http://fallabs.com/kyotocabinet/
-IUSE=debug doc examples static-libs
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=sys-libs/zlib app-arch/xz-utils
-SLOT=0
-SRC_URI=http://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bdef8b42df438f577c2a09ce4e84cb48
diff --git a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1 b/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
index da2ef409a470..0eb93bdd017b 100644
--- a/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
+++ b/metadata/md5-cache/dev-db/kyotocabinet-1.2.76-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A straightforward implementation of DBM
 EAPI=5
 HOMEPAGE=http://fallabs.com/kyotocabinet/
 IUSE=debug doc examples static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib app-arch/xz-utils
 SLOT=0
 SRC_URI=http://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b4cc77ea46762f9b700db75107d49df2
+_md5_=ad77ca67bcf9e8573104dc16b78243ff
diff --git a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2 b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
deleted file mode 100644
index e9942b933595..000000000000
--- a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.4* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL
-EAPI=2
-HOMEPAGE=http://vegan.net/tony/supersmack/
-IUSE=+mysql postgres
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] )
-SLOT=0
-SRC_URI=http://vegan.net/tony/supersmack/super-smack-1.3.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7026bb24973283970e5be7a396774c25
diff --git a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r3 b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r3
index f7aa20c60e6a..fb37827b1e32 100644
--- a/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r3
+++ b/metadata/md5-cache/dev-db/mysql-super-smack-1.3-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Benchmarking, stress testing, and load generation tool for MySQL & P
 EAPI=5
 HOMEPAGE=http://vegan.net/tony/supersmack/
 IUSE=+mysql postgres
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] )
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=http://vegan.net/tony/supersmack/super-smack-1.3.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a917c4e0428ff722f81954d459df9606
+_md5_=1c60979a75c00c7335998ba3d321221c
diff --git a/metadata/md5-cache/dev-db/pgagent-3.4.0 b/metadata/md5-cache/dev-db/pgagent-3.4.0
index 836f82a5a557..fe2d8bee1d19 100644
--- a/metadata/md5-cache/dev-db/pgagent-3.4.0
+++ b/metadata/md5-cache/dev-db/pgagent-3.4.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-db/postgresql-9.0.0 x11-libs/wxGTK:2.8 >=dev-util/cmake-2.6 sys-dev
 DESCRIPTION=pgAgent is a job scheduler for PostgreSQL
 EAPI=5
 HOMEPAGE=http://www.pgadmin.org/download/pgagent.php
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=dev-db/postgresql-9.0.0 x11-libs/wxGTK:2.8
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin3/release/pgagent/pgAgent-3.4.0-Source.tar.gz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=2ae98ecb4233539a728430423afa671d
+_md5_=b282b07e5a72955a84af8831364aabfe
diff --git a/metadata/md5-cache/dev-db/pygresql-4.1.1-r1 b/metadata/md5-cache/dev-db/pygresql-4.1.1-r1
index d4dd2f38c367..4ae66e6a803c 100644
--- a/metadata/md5-cache/dev-db/pygresql-4.1.1-r1
+++ b/metadata/md5-cache/dev-db/pygresql-4.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python interface for the PostgreSQL database
 EAPI=5
 HOMEPAGE=http://www.pygresql.org/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~sparc x86
 LICENSE=POSTGRESQL
 RDEPEND=|| ( dev-db/postgresql:9.3 dev-db/postgresql:9.2 dev-db/postgresql:9.1 dev-db/postgresql:9.0 ) 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/P/PyGreSQL/PyGreSQL-4.1.1.tgz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=664baba9c16557b33f14cd39d595f474
+_md5_=8a0272365189ee6e328f8fad0d2bd014
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4
deleted file mode 100644
index 356aa695b403..000000000000
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=<dev-haskell/ansi-terminal-0.6[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=The Wadler/Leijen Pretty Printer for colored ANSI terminal output
-EAPI=4
-HOMEPAGE=http://github.com/batterseapower/ansi-wl-pprint
-IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=<dev-haskell/ansi-terminal-0.6[profile?] >=dev-lang/ghc-6.8.2
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.4/ansi-wl-pprint-0.6.4.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cb3ca32544195fc7c0e190b20431859d
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1
index 21836fecba76..adf77ef92982 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=The Wadler/Leijen Pretty Printer for colored ANSI terminal output
 EAPI=5
 HOMEPAGE=http://github.com/batterseapower/ansi-wl-pprint
 IUSE=example doc hscolour profile
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD
-RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.7.1
 SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.7.1/ansi-wl-pprint-0.6.7.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=174aedfd6f73233c0060a3d2222079d0
+_md5_=0d313219e89b0c4418c249b534696d96
diff --git a/metadata/md5-cache/dev-haskell/boxes-0.1.3 b/metadata/md5-cache/dev-haskell/boxes-0.1.4
similarity index 51%
rename from metadata/md5-cache/dev-haskell/boxes-0.1.3
rename to metadata/md5-cache/dev-haskell/boxes-0.1.4
index 671cc8f4803b..a24e53980db4 100644
--- a/metadata/md5-cache/dev-haskell/boxes-0.1.3
+++ b/metadata/md5-cache/dev-haskell/boxes-0.1.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND==dev-haskell/split-0.2*:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.9.2 test? ( dev-haskell/quickcheck ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=2D text pretty-printing library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/boxes
-IUSE=doc hscolour profile
+IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND==dev-haskell/split-0.2*:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/0.1.3
-SRC_URI=mirror://hackage/packages/archive/boxes/0.1.3/boxes-0.1.3.tar.gz
+RDEPEND=>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.1.4
+SRC_URI=mirror://hackage/packages/archive/boxes/0.1.4/boxes-0.1.4.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c4d99d63d96d75b358f8900f270fa32c
+_md5_=b1eaf59ed0a7d801175b4237c74f4f96
diff --git a/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.3-r1 b/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.3-r1
index b8731b32208b..c30f44acf810 100644
--- a/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/cabal-install-1.18.0.3-r1
@@ -4,9 +4,9 @@ DESCRIPTION=The command-line interface for Cabal and Hackage
 EAPI=5
 HOMEPAGE=http://www.haskell.org/cabal/
 IUSE=+noprefs test
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/cabal-install/1.18.0.3/cabal-install-1.18.0.3.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=166d85d9050a2d5a123bb2e84f37e804
+_md5_=f0349edd444e078de5eae1e9a1b0561b
diff --git a/metadata/md5-cache/dev-haskell/css-text-0.1.2.1 b/metadata/md5-cache/dev-haskell/css-text-0.1.2.1
index 29890d1f4169..3cb8553aa914 100644
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.2.1
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=CSS parser and renderer
 EAPI=5
 HOMEPAGE=http://www.yesodweb.com/
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.2.1
 SRC_URI=mirror://hackage/packages/archive/css-text/0.1.2.1/css-text-0.1.2.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=06699e0c956c3021665779008ae3a563
+_md5_=2df6c26b0a3c3658c978fad0c3e7713a
diff --git a/metadata/md5-cache/dev-haskell/email-validate-2.0.1 b/metadata/md5-cache/dev-haskell/email-validate-2.0.1
index 5ab28d7e2171..82eee8a0f27a 100644
--- a/metadata/md5-cache/dev-haskell/email-validate-2.0.1
+++ b/metadata/md5-cache/dev-haskell/email-validate-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Validating an email address string against RFC 5322
 EAPI=5
 HOMEPAGE=http://porg.es/blog/email-address-validation-simpler-faster-more-correct
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.0.1
 SRC_URI=mirror://hackage/packages/archive/email-validate/2.0.1/email-validate-2.0.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ebe777d5329d9d76a889e599951c045d
+_md5_=069ab57e124d8838388b81b5e3fd9f84
diff --git a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5 b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
index e07881ec224d..17f29d1d3c94 100644
--- a/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
+++ b/metadata/md5-cache/dev-haskell/libxml-sax-0.7.5
@@ -4,10 +4,10 @@ DESCRIPTION=Bindings for the libXML2 SAX interface
 EAPI=5
 HOMEPAGE=https://john-millikin.com/software/haskell-libxml/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/xml-types-0.3:=[profile?] <dev-haskell/xml-types-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.7.5
 SRC_URI=mirror://hackage/packages/archive/libxml-sax/0.7.5/libxml-sax-0.7.5.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=541f73c376109999f6f4737aef4b68a3
+_md5_=a7ad33e7038999f96d80f4fc7dd17c19
diff --git a/metadata/md5-cache/dev-haskell/nats-0.2 b/metadata/md5-cache/dev-haskell/nats-0.2
index 8a320b458954..c7d209b8cedd 100644
--- a/metadata/md5-cache/dev-haskell/nats-0.2
+++ b/metadata/md5-cache/dev-haskell/nats-0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Natural numbers
 EAPI=5
 HOMEPAGE=http://github.com/ekmett/nats/
 IUSE=+hashable doc hscolour profile
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] )
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/nats/0.2/nats-0.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b73841e078809f45a14c2fed57d49b25
+_md5_=9e56cdffdffb2ed224e99b5d36b00bfe
diff --git a/metadata/md5-cache/dev-haskell/pem-0.2.2 b/metadata/md5-cache/dev-haskell/pem-0.2.2
index b4be4ed1a9a4..321315f955b3 100644
--- a/metadata/md5-cache/dev-haskell/pem-0.2.2
+++ b/metadata/md5-cache/dev-haskell/pem-0.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Privacy Enhanced Mail (PEM) format reader and writer
 EAPI=5
 HOMEPAGE=http://github.com/vincenthz/hs-pem
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0.0:=[profile?] dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/pem/0.2.2/pem-0.2.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=319c9432d432f600f50a60e011eebd56
+_md5_=4548ec8d92916156b571b02dfec38a4d
diff --git a/metadata/md5-cache/dev-haskell/setenv-0.1.1.1 b/metadata/md5-cache/dev-haskell/setenv-0.1.1.1
index 6d2ef57d6597..25e1fc6b0d78 100644
--- a/metadata/md5-cache/dev-haskell/setenv-0.1.1.1
+++ b/metadata/md5-cache/dev-haskell/setenv-0.1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A cross-platform library for setting environment variables
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/setenv
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.1.1.1
 SRC_URI=mirror://hackage/packages/archive/setenv/0.1.1.1/setenv-0.1.1.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4bf4352ef623b7d027b23acc52225fac
+_md5_=f828e50d9825f90c2b9f0f361514b494
diff --git a/metadata/md5-cache/dev-haskell/stringable-0.1.3 b/metadata/md5-cache/dev-haskell/stringable-0.1.3
index d3645dba1f62..3aca2fb78418 100644
--- a/metadata/md5-cache/dev-haskell/stringable-0.1.3
+++ b/metadata/md5-cache/dev-haskell/stringable-0.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=A Stringable type class, in the spirit of Foldable and Traversable
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/stringable
 IUSE=doc hscolour profile
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/system-filepath-0.4.7:=[profile?] >=dev-haskell/text-0.11.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.3
 SRC_URI=mirror://hackage/packages/archive/stringable/0.1.3/stringable-0.1.3.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bd1289eb963cb0479eab820c1c30f1d8
+_md5_=fb3c36a45d884e3ec5105e921cb712a5
diff --git a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5 b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5
index 2f11935f4604..8cfb5a1e5d8e 100644
--- a/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5
+++ b/metadata/md5-cache/dev-haskell/stringsearch-0.3.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=Fast searching, splitting and replacing of ByteStrings
 EAPI=5
 HOMEPAGE=https://bitbucket.org/dafis/stringsearch
 IUSE=doc hscolour profile
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.6.5
 SRC_URI=mirror://hackage/packages/archive/stringsearch/0.3.6.5/stringsearch-0.3.6.5.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5df38475e36528bfb0855869ba642320
+_md5_=bd9aae342417d6c1a1745078c20de1fb
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.3 b/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.3
index 81a374b35ec5..75cb6a850f4b 100644
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.3
+++ b/metadata/md5-cache/dev-haskell/unix-compat-0.4.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=Portable POSIX-compatibility layer
 EAPI=5
 HOMEPAGE=http://github.com/jystic/unix-compat
 IUSE=old-time doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.1.3
 SRC_URI=mirror://hackage/packages/archive/unix-compat/0.4.1.3/unix-compat-0.4.1.3.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=157630ae70343e63d86c2c596ffce87e
+_md5_=a62165ff61406fee0222a439269674b2
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-0.3.8 b/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
index 7f601ec62fc2..e41123e2b60d 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
+++ b/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=Support for reading and writing UTF8 Strings
 EAPI=5
 HOMEPAGE=http://github.com/glguy/utf8-string/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.8
 SRC_URI=mirror://hackage/packages/archive/utf8-string/0.3.8/utf8-string-0.3.8.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=aee81753306b0ac35a807ee15d872813
+_md5_=aeb630a3c75120167f904383ff886547
diff --git a/metadata/md5-cache/dev-haskell/uulib-0.9.16 b/metadata/md5-cache/dev-haskell/uulib-0.9.16
index 31e068dcb91c..0b6f95a9e932 100644
--- a/metadata/md5-cache/dev-haskell/uulib-0.9.16
+++ b/metadata/md5-cache/dev-haskell/uulib-0.9.16
@@ -4,10 +4,10 @@ DESCRIPTION=Haskell Utrecht Tools Library
 EAPI=5
 HOMEPAGE=http://www.cs.uu.nl/wiki/HUT/WebHome
 IUSE=doc hscolour profile
-KEYWORDS=amd64 ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.9.16
 SRC_URI=mirror://hackage/packages/archive/uulib/0.9.16/uulib-0.9.16.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c27e1dfb5f7794e9d59d61e829dd50cd
+_md5_=fd45c8c3ab57d626fe6c4e0324557f32
diff --git a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5 b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
index 35d992688126..d970c061b06b 100644
--- a/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
+++ b/metadata/md5-cache/dev-haskell/zlib-bindings-0.1.1.5
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level bindings to the zlib package. (deprecated)
 EAPI=5
 HOMEPAGE=http://github.com/snoyberg/zlib-bindings
 IUSE=doc hscolour profile test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/zlib-0.5.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1.5
 SRC_URI=mirror://hackage/packages/archive/zlib-bindings/0.1.1.5/zlib-bindings-0.1.1.5.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	ghc-package	29f14cf665461bc19b8724d1842b0b3a	haskell-cabal	f398638b447d3821846f2e2abbc33c1b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b6becf750ad779f3a8b7821e945f879a
+_md5_=1833652524d2e39e0387685208419cc2
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.1.3 b/metadata/md5-cache/dev-libs/ding-libs-0.1.3
deleted file mode 100644
index 1e8157be8ed3..000000000000
--- a/metadata/md5-cache/dev-libs/ding-libs-0.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!!dev-libs/libcollection !!dev-libs/libdhash !!dev-libs/libini_config !!dev-libs/libpath_utils !!dev-libs/libref_array test? ( dev-libs/check )
-DESCRIPTION=Library set needed for build sssd
-EAPI=4
-HOMEPAGE=https://fedorahosted.org/sssd
-IUSE=test static-libs
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=LGPL-3
-RDEPEND=!!dev-libs/libcollection !!dev-libs/libdhash !!dev-libs/libini_config !!dev-libs/libpath_utils !!dev-libs/libref_array
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.1.3.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ab9dafcf2ec444b03f49c7f42c4bcb2f
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.2.91 b/metadata/md5-cache/dev-libs/ding-libs-0.2.91
deleted file mode 100644
index fc0b3a9b7b0b..000000000000
--- a/metadata/md5-cache/dev-libs/ding-libs-0.2.91
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!!dev-libs/libcollection !!dev-libs/libdhash !!dev-libs/libini_config !!dev-libs/libpath_utils !!dev-libs/libref_array test? ( dev-libs/check )
-DESCRIPTION=Library set needed for build sssd
-EAPI=4
-HOMEPAGE=https://fedorahosted.org/sssd
-IUSE=test static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=LGPL-3 GPL-3
-RDEPEND=!!dev-libs/libcollection !!dev-libs/libdhash !!dev-libs/libini_config !!dev-libs/libpath_utils !!dev-libs/libref_array
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.2.91.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=35d4852314322104271b036b6331af35
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.3.0.1 b/metadata/md5-cache/dev-libs/ding-libs-0.3.0.1
deleted file mode 100644
index 8f1ed42f9851..000000000000
--- a/metadata/md5-cache/dev-libs/ding-libs-0.3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig test? ( dev-libs/check )
-DESCRIPTION=Library set needed for build sssd
-EAPI=5
-HOMEPAGE=https://fedorahosted.org/sssd
-IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=LGPL-3 GPL-3
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.3.0.1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6921d4951ccc1a5646b5b430c6187f8a
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.4.0 b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
index 76c5fcaed700..44bf12d3343d 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.4.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
@@ -4,9 +4,9 @@ DESCRIPTION=Library set needed for build sssd
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/sssd
 IUSE=test static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86 ~amd64-linux
+KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.4.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ba75239a39ec8a4bf4a9be7ca1dd24d2
+_md5_=f7af7519b1e77f50f9f9c1d9959ac7f5
diff --git a/metadata/md5-cache/dev-libs/grantlee-0.4.0 b/metadata/md5-cache/dev-libs/grantlee-0.4.0
index 32e5ab5ad5ac..0c11b381e819 100644
--- a/metadata/md5-cache/dev-libs/grantlee-0.4.0
+++ b/metadata/md5-cache/dev-libs/grantlee-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=C++ string template engine based on the Django template system
 EAPI=5
 HOMEPAGE=http://www.gitorious.org/grantlee/pages/Home
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.grantlee.org/grantlee-0.4.0.tar.gz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bdefc65f5c3d242ec8935825cdcca4be
+_md5_=277ed01dd1a2a5fd6d53bdfba3b14479
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41 b/metadata/md5-cache/dev-libs/libcgroup-0.41
index a5c8121e220e..7a414e66b061 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41
@@ -4,11 +4,11 @@ DESCRIPTION=Tools and libraries to configure and manage kernel control groups
 EAPI=5
 HOMEPAGE=http://libcg.sourceforge.net/
 IUSE=+daemon debug pam static-libs +tools debug
-KEYWORDS=amd64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=pam? ( virtual/pam )
 REQUIRED_USE=daemon? ( tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=357e25be611642550ddfa40f42d4224a
+_md5_=8ec752094b6a533f08f97e533155b8b1
diff --git a/metadata/md5-cache/dev-libs/liblinear-196-r1 b/metadata/md5-cache/dev-libs/liblinear-196-r1
index 530dcc1da718..d19289fc971a 100644
--- a/metadata/md5-cache/dev-libs/liblinear-196-r1
+++ b/metadata/md5-cache/dev-libs/liblinear-196-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Library for Large Linear Classification
 EAPI=5
 HOMEPAGE=http://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/cjlin1/liblinear/archive/v196.tar.gz -> liblinear-196.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c0f2291c797b03336bd4f7b9cd7ecb0c
+_md5_=2ffc6ecaab1f397f164c95f19a435a6f
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.4 b/metadata/md5-cache/dev-libs/libltdl-2.4.4
index d63551432824..c515aad5d5eb 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.4
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/libtool/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!<sys-devel/libtool-2.4.3-r2:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.4.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d11761615c9cf1ea0a4ff9d666df343f
+_md5_=f9e992ab767cb57aaa56fe355c49ebda
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18
index ac0e2b96e7e5..defce6d65235 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18
@@ -4,11 +4,11 @@ DESCRIPTION=a C client library to the memcached server
 EAPI=5
 HOMEPAGE=http://libmemcached.org/libMemcached.html
 IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1c797e1b59cb12e27f64f07267553c66
+_md5_=535379d1977e4ace6fbd7feed75d9542
diff --git a/metadata/md5-cache/dev-libs/libmix-2.05-r7 b/metadata/md5-cache/dev-libs/libmix-2.05-r7
index 6529acc68354..6abf781916a6 100644
--- a/metadata/md5-cache/dev-libs/libmix-2.05-r7
+++ b/metadata/md5-cache/dev-libs/libmix-2.05-r7
@@ -4,9 +4,9 @@ DESCRIPTION=Programs Crypto/Network/Multipurpose Library
 EAPI=5
 HOMEPAGE=http://mixter.void.ru/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://mixter.void.ru/libmix-205.tgz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2fef0761b6039bbeab94fef7925bab5b
+_md5_=87dff3e36275de94548fee7305e3abc3
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.4.0 b/metadata/md5-cache/dev-libs/libpipeline-1.4.0
index b560f32d8f04..2c1145589fb0 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.4.0
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.4.0
@@ -4,9 +4,9 @@ DESCRIPTION=a pipeline manipulation library
 EAPI=5
 HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.4.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6de745b193a1e59d3bd967d02b3c0439
+_md5_=6152d7862fc250c61ce10e70c23a9c98
diff --git a/metadata/md5-cache/dev-libs/libwbxml-0.11.2 b/metadata/md5-cache/dev-libs/libwbxml-0.11.2
index 67e937941d41..8922b7ca5f3e 100644
--- a/metadata/md5-cache/dev-libs/libwbxml-0.11.2
+++ b/metadata/md5-cache/dev-libs/libwbxml-0.11.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library and tools to parse, encode and handle WBXML documents
 EAPI=5
 HOMEPAGE=http://libwbxml.opensync.org/
 IUSE=test
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat virtual/libiconv
 SLOT=0
 SRC_URI=mirror://sourceforge/libwbxml/libwbxml-0.11.2.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3722e2522efe7e14435ddfabd493bb15
+_md5_=2c051eacd6624cdd3526ab8f5405a02b
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
index 220b5cd50565..fe31156f5d04 100644
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Small library to access XDG Base Directories Specification paths
 EAPI=5
 HOMEPAGE=http://repo.or.cz/w/libxdg-basedir.git
 IUSE=doc static-libs
-KEYWORDS=amd64 arm hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8fe0df435c05a345c85c116c2e924c29
+_md5_=75a8413dca3882fe34d0b0c6ae8ce7cc
diff --git a/metadata/md5-cache/dev-libs/maloc-0.2.1-r3 b/metadata/md5-cache/dev-libs/maloc-0.2.1-r3
deleted file mode 100644
index d8e2b6fa7b00..000000000000
--- a/metadata/md5-cache/dev-libs/maloc-0.2.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/readline mpi? ( virtual/mpi ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
-EAPI=3
-HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
-IUSE=mpi static-libs
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=http://cam.ucsd.edu/~mholst/codes/maloc/maloc-0.2-1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cbf4e37fb1b74dfb2094fea91d94f531
diff --git a/metadata/md5-cache/dev-libs/maloc-1.5-r1 b/metadata/md5-cache/dev-libs/maloc-1.5-r1
index 5a29c035cc39..0ce5aba9ab61 100644
--- a/metadata/md5-cache/dev-libs/maloc-1.5-r1
+++ b/metadata/md5-cache/dev-libs/maloc-1.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Minimal Abstraction Layer for Object-oriented C/C++ programs
 EAPI=5
 HOMEPAGE=http://www.fetk.org/codes/maloc/index.html
 IUSE=doc mpi static-libs
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/maloc-1.5.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=65684594a18d3042f2beae5637b0b9c7
+_md5_=3d4632eb6f1feb1dd8301a3b30076bed
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2 b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
index bf2069cc0caa..94b4bf84fee8 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structu
 EAPI=5
 HOMEPAGE=http://code.google.com/p/protobuf/
 IUSE=emacs examples java python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 elibc_FreeBSD source java
-KEYWORDS=amd64 arm -hppa ~ia64 ~mips -ppc -ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm -hppa ~ia64 ~mips -ppc -ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( 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(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f570bffb20795054201e6b61ee1fc2c3
+_md5_=69f025b2698f311ac6595d2738a65793
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.4 b/metadata/md5-cache/dev-libs/pugixml-1.4
index 7345cc5fc4d1..32678afd661e 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.4
+++ b/metadata/md5-cache/dev-libs/pugixml-1.4
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/finduti
 DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=5
 HOMEPAGE=http://pugixml.org/ https://github.com/zeux/pugixml/
-KEYWORDS=amd64 ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.4/pugixml-1.4.tar.gz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=34cfc186cc14277a21b91949503d54d9
+_md5_=978907e7a3391d820f630c9f2ccd6672
diff --git a/metadata/md5-cache/dev-ml/dose3-3.3 b/metadata/md5-cache/dev-ml/dose3-3.3
new file mode 100644
index 000000000000..22d3500a2406
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dose3-3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure prepare
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= dev-ml/extlib:= dev-ml/ocaml-re:= || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.5:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm ) dev-ml/findlib test? ( dev-python/pyyaml[libyaml] )
+DESCRIPTION=Library and a collection of tools to perform la large spectrum of analysis on package repositories
+EAPI=5
+HOMEPAGE=http://dose.gforge.inria.fr/public_html/
+IUSE=+ocamlopt +parmap zip bzip2 xml curl rpm4 test
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= dev-ml/extlib:= dev-ml/ocaml-re:= || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.5:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
+RESTRICT=test
+SLOT=0/3.3
+SRC_URI=https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz
+_md5_=4dbbeb2ad31c22860d34d2af1ef0e3ca
diff --git a/metadata/md5-cache/dev-ml/uutf-0.9.4 b/metadata/md5-cache/dev-ml/uutf-0.9.4
new file mode 100644
index 000000000000..be83b381809e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/uutf-0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] utftrip? ( dev-ml/cmdliner:= ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
+EAPI=5
+HOMEPAGE=http://erratique.ch/software/uutf
+IUSE=utftrip +ocamlopt doc
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] utftrip? ( dev-ml/cmdliner:= )
+SLOT=0/0.9.4
+SRC_URI=http://erratique.ch/software/uutf/releases/uutf-0.9.4.tbz
+_eclasses_=findlib	9cf6020ee5481f39f1aa566a323f9868
+_md5_=f9b9a7fb440a81232b281825628a2ad5
diff --git a/metadata/md5-cache/dev-ml/xml-light-2.2-r3 b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
index 65ba0b593c62..e20ec953f237 100644
--- a/metadata/md5-cache/dev-ml/xml-light-2.2-r3
+++ b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Minimal Xml parser and printer for OCaml
 EAPI=5
 HOMEPAGE=http://tech.motion-twin.com/xmllight.html
 IUSE=doc +ocamlopt
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.2
 SRC_URI=http://tech.motion-twin.com/zip/xml-light-2.2.zip
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=44ee2b44ce4ead9ce668004574b7e0d6
+_md5_=0d5bc787e35e8b1f90dbd827f43dec11
diff --git a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0 b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
index 7bc983087a37..bc2e9fd5205a 100644
--- a/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
+++ b/metadata/md5-cache/dev-perl/Geo-IP-1.450.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 DESCRIPTION=Look up country by IP Address
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Geo-IP/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/geoip dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.45.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=ee5e612a0f59ee7a65a409cbca008bdb
+_md5_=4bd0b413d337be23146e36919c03e21b
diff --git a/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.967.0 b/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.967.0
index d491f3bb4559..62a01316c08b 100644
--- a/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.967.0
+++ b/metadata/md5-cache/dev-perl/IO-Socket-SSL-1.967.0
@@ -4,10 +4,10 @@ DESCRIPTION=Nearly transparent SSL encapsulation for IO::Socket::INET
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/IO-Socket-SSL/
 IUSE=idn
-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
+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
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Net-SSLeay-1.330.0 virtual/perl-Scalar-List-Utils idn? ( || ( >=dev-perl/URI-1.50 dev-perl/Net-LibIDN ) ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.967.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=ce4a4ff3e02064dab092d3a24813dc3b
+_md5_=f2db475c837de576441e04fb4c42d110
diff --git a/metadata/md5-cache/dev-perl/Net-DNS-0.740.0 b/metadata/md5-cache/dev-perl/Net-DNS-0.740.0
index 8ad54b2a0477..262f1648f8c9 100644
--- a/metadata/md5-cache/dev-perl/Net-DNS-0.740.0
+++ b/metadata/md5-cache/dev-perl/Net-DNS-0.740.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl Net::DNS - Perl DNS Resolver Module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Net-DNS/
 IUSE=ipv6 test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 dev-perl/Digest-HMAC virtual/perl-Digest-SHA dev-perl/Net-IP virtual/perl-MIME-Base64 ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-0.74.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=ade363fcb2c38c1fbbf1c555b46775b3
+_md5_=df7a8acb1c17fb66529124c061bf0f00
diff --git a/metadata/md5-cache/dev-php/pecl-event-1.11.1 b/metadata/md5-cache/dev-php/pecl-event-1.11.1
index 3ea94a11aa3b..36b996417571 100644
--- a/metadata/md5-cache/dev-php/pecl-event-1.11.1
+++ b/metadata/md5-cache/dev-php/pecl-event-1.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=PHP wrapper for libevent2
 EAPI=5
 HOMEPAGE=http://pecl.php.net/event
 IUSE=debug +extra +ssl threads +sockets examples php_targets_php5-4 php_targets_php5-5 php_targets_php5-6
-KEYWORDS=amd64 ~ia64 ~x86
+KEYWORDS=amd64 ~ia64 x86
 LICENSE=PHP-3
 RDEPEND=>=dev-libs/libevent-2.0.2 !dev-php/pecl-libevent sockets? ( dev-lang/php[sockets] ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 REQUIRED_USE=|| ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/event-1.11.1.tgz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=655d114b892e694eda1a3132c0f6efc7
+_md5_=2aadd6644e3a4eaef44767da6bf60e0a
diff --git a/metadata/md5-cache/dev-python/apsw-3.8.5_p1 b/metadata/md5-cache/dev-python/apsw-3.8.5_p1
index 8e5dd1461b5a..7456740c48c1 100644
--- a/metadata/md5-cache/dev-python/apsw-3.8.5_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.8.5_p1
@@ -4,11 +4,11 @@ DESCRIPTION=APSW - Another Python SQLite Wrapper
 EAPI=5
 HOMEPAGE=https://github.com/rogerbinns/apsw/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=ZLIB
 RDEPEND=>=dev-db/sqlite-3.8.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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=https://github.com/rogerbinns/apsw/archive/3.8.5-r1.tar.gz -> apsw-3.8.5_p1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8ea04aabc2c0593b8071a5d39ea0a23c
+_md5_=d25df5b04c3fb31b7768e70d77b1557b
diff --git a/metadata/md5-cache/dev-python/argh-0.26.1 b/metadata/md5-cache/dev-python/argh-0.26.1
index d5ad153d57b9..669a036e17dc 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.1
+++ b/metadata/md5-cache/dev-python/argh-0.26.1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple argparse wrapper
 EAPI=5
 HOMEPAGE=http://packages.python.org/argh/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.26.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f11b42989d02c807536e80ab5fe30b86
+_md5_=a25ee86ab5f9c092ec8793bad82077af
diff --git a/metadata/md5-cache/dev-python/authres-0.701 b/metadata/md5-cache/dev-python/authres-0.701
index 33452586bbad..3157915f3519 100644
--- a/metadata/md5-cache/dev-python/authres-0.701
+++ b/metadata/md5-cache/dev-python/authres-0.701
@@ -4,11 +4,11 @@ DESCRIPTION=Authentication Results Header Module
 EAPI=5
 HOMEPAGE=https://launchpad.net/authentication-results-python http://pypi.python.org/pypi/authres
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/a/authres/authres-0.701.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8ffa654991d4d1e52b543669cd196031
+_md5_=cd38fdda6c87ccd1a950b96f54206ebf
diff --git a/metadata/md5-cache/dev-python/beanstalkc-0.3.0 b/metadata/md5-cache/dev-python/beanstalkc-0.3.0
deleted file mode 100644
index 5b449490988f..000000000000
--- a/metadata/md5-cache/dev-python/beanstalkc-0.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/pyyaml dev-python/setuptools dev-lang/python
-DESCRIPTION=A simple beanstalkd client library
-EAPI=2
-HOMEPAGE=http://github.com/earl/beanstalkc http://pypi.python.org/pypi/beanstalkc
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/b/beanstalkc/beanstalkc-0.3.0.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=af7da4800058363f7e0a65f0cb544146
diff --git a/metadata/md5-cache/dev-python/beanstalkc-0.4.0 b/metadata/md5-cache/dev-python/beanstalkc-0.4.0
index a9138b812522..9f18e54d378c 100644
--- a/metadata/md5-cache/dev-python/beanstalkc-0.4.0
+++ b/metadata/md5-cache/dev-python/beanstalkc-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=A simple beanstalkd client library
 EAPI=5
 HOMEPAGE=http://github.com/earl/beanstalkc http://pypi.python.org/pypi/beanstalkc
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beanstalkc/beanstalkc-0.4.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8391787b68c05a9a139baf836951bce8
+_md5_=11ed20927b68892435edfdda64cdfd70
diff --git a/metadata/md5-cache/dev-python/bpython-0.12 b/metadata/md5-cache/dev-python/bpython-0.12
deleted file mode 100644
index 311434613bfc..000000000000
--- a/metadata/md5-cache/dev-python/bpython-0.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/pygments dev-python/setuptools gtk? ( dev-python/pygobject:2 dev-python/pygtk ) urwid? ( dev-python/urwid ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.3*[ncurses] =dev-lang/python-3.2*[ncurses] =dev-lang/python-3.1*[ncurses] =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] )
-DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
-EAPI=3
-HOMEPAGE=http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython
-IUSE=gtk urwid
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pygments dev-python/setuptools gtk? ( dev-python/pygobject:2 dev-python/pygtk ) urwid? ( dev-python/urwid ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-3.3*[ncurses] =dev-lang/python-3.2*[ncurses] =dev-lang/python-3.1*[ncurses] =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] )
-SLOT=0
-SRC_URI=http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1c057bc16d7748ff711e1131948bc8dc
diff --git a/metadata/md5-cache/dev-python/bpython-0.13 b/metadata/md5-cache/dev-python/bpython-0.13
deleted file mode 100644
index 32024d4b1d6e..000000000000
--- a/metadata/md5-cache/dev-python/bpython-0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[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[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Syntax highlighting and autocompletion for the Python interpreter
-EAPI=5
-HOMEPAGE=http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython
-IUSE=doc gtk python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/urwid[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) 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=http://www.bpython-interpreter.org/releases/bpython-0.13.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bb4059a1e1778c999ae9cbefb9e9521a
diff --git a/metadata/md5-cache/dev-python/chardet-2.0.1 b/metadata/md5-cache/dev-python/chardet-2.0.1
deleted file mode 100644
index 69d96269ce35..000000000000
--- a/metadata/md5-cache/dev-python/chardet-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=dev-lang/python
-DESCRIPTION=Character encoding auto-detection in Python
-EAPI=2
-HOMEPAGE=http://chardet.feedparser.org/ http://code.google.com/p/chardet/
-KEYWORDS=amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=http://chardet.feedparser.org/download/python2-chardet-2.0.1.tgz http://chardet.feedparser.org/download/python3-chardet-2.0.1.tgz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c0998b817c34aa6c5cf627a48f62fe42
diff --git a/metadata/md5-cache/dev-python/chardet-2.0.1-r1 b/metadata/md5-cache/dev-python/chardet-2.0.1-r1
deleted file mode 100644
index 6161cc49d10d..000000000000
--- a/metadata/md5-cache/dev-python/chardet-2.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Character encoding auto-detection in Python
-EAPI=5
-HOMEPAGE=http://chardet.feedparser.org/ http://code.google.com/p/chardet/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=http://chardet.feedparser.org/download/python2-chardet-2.0.1.tgz http://chardet.feedparser.org/download/python3-chardet-2.0.1.tgz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3fed0df97c9cab1f79270caf7e0c2af2
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.2 b/metadata/md5-cache/dev-python/colorama-0.3.2
index 9f578da8f2cb..3016502e1837 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.2
+++ b/metadata/md5-cache/dev-python/colorama-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Makes ANSI escape character sequences for producing colored terminal
 EAPI=5
 HOMEPAGE=http://code.google.com/p/colorama/
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.2.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2e3a3e0a20b185ac6721d27f2d7ff801
+_md5_=9c881e1c9647e1eccdba556fc7da4c50
diff --git a/metadata/md5-cache/dev-python/decorator-3.3.1 b/metadata/md5-cache/dev-python/decorator-3.3.1
deleted file mode 100644
index 02a8c4204d07..000000000000
--- a/metadata/md5-cache/dev-python/decorator-3.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Simplifies the usage of decorators for the average programmer
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/decorator http://code.google.com/p/micheles/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/d/decorator/decorator-3.3.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d3b3b38a1336322a46290d8478e6f08e
diff --git a/metadata/md5-cache/dev-python/dnspython-1.10.0 b/metadata/md5-cache/dev-python/dnspython-1.10.0
deleted file mode 100644
index 1cdf5e0ca501..000000000000
--- a/metadata/md5-cache/dev-python/dnspython-1.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/pycrypto =dev-lang/python-2*
-DESCRIPTION=DNS toolkit for Python
-EAPI=3
-HOMEPAGE=http://www.dnspython.org/ http://pypi.python.org/pypi/dnspython
-IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=ISC
-RDEPEND=dev-python/pycrypto =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f3b7ab5da23b98e576624e3ea0ca90f1
diff --git a/metadata/md5-cache/dev-python/dnspython-1.10.0-r1 b/metadata/md5-cache/dev-python/dnspython-1.10.0-r1
deleted file mode 100644
index 34a307c113a7..000000000000
--- a/metadata/md5-cache/dev-python/dnspython-1.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=DNS toolkit for Python
-EAPI=5
-HOMEPAGE=http://www.dnspython.org/ http://pypi.python.org/pypi/dnspython
-IUSE=examples test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=ISC
-RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5b8180f0be88f3238bd735ebc3f9889a
diff --git a/metadata/md5-cache/dev-python/dnspython-1.9.4 b/metadata/md5-cache/dev-python/dnspython-1.9.4
deleted file mode 100644
index d0834d3751f5..000000000000
--- a/metadata/md5-cache/dev-python/dnspython-1.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/pycrypto =dev-lang/python-2*
-DESCRIPTION=DNS toolkit for Python
-EAPI=3
-HOMEPAGE=http://www.dnspython.org/ http://pypi.python.org/pypi/dnspython
-IUSE=examples
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=ISC
-RDEPEND=dev-python/pycrypto =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.dnspython.org/kits/1.9.4/dnspython-1.9.4.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6ece748b6b8e06872161bae112913834
diff --git a/metadata/md5-cache/dev-python/drpython-3.11.3 b/metadata/md5-cache/dev-python/drpython-3.11.3
deleted file mode 100644
index 29d092ab71e5..000000000000
--- a/metadata/md5-cache/dev-python/drpython-3.11.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=dev-python/wxpython-2.6 app-arch/unzip =dev-lang/python-2*
-DESCRIPTION=A powerful cross-platform IDE for Python
-EAPI=3
-HOMEPAGE=http://drpython.sourceforge.net/
-KEYWORDS=~amd64 ~ia64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/wxpython-2.6 =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/drpython/DrPython_3.11.3.zip
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ad2918b3904d70fd27c23e1d04746ce3
diff --git a/metadata/md5-cache/dev-python/elementtree-1.2.6-r2 b/metadata/md5-cache/dev-python/elementtree-1.2.6-r2
deleted file mode 100644
index 95326420e38c..000000000000
--- a/metadata/md5-cache/dev-python/elementtree-1.2.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=A light-weight XML object model for Python
-EAPI=3
-HOMEPAGE=http://effbot.org/zone/element-index.htm http://pypi.python.org/pypi/elementtree
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=ElementTree
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f407ede386ac82571ae77eb7eca61a08
diff --git a/metadata/md5-cache/dev-python/empy-3.3 b/metadata/md5-cache/dev-python/empy-3.3
deleted file mode 100644
index df6b15cbade0..000000000000
--- a/metadata/md5-cache/dev-python/empy-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A powerful and robust templating system for Python
-EAPI=3
-HOMEPAGE=http://www.alcyone.com/software/empy/
-IUSE=doc
-KEYWORDS=amd64 ia64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1a827b0f9472027a1a1156dfe396bb03
diff --git a/metadata/md5-cache/dev-python/envoy-0.0.2 b/metadata/md5-cache/dev-python/envoy-0.0.2
deleted file mode 100644
index 24d12eb219f9..000000000000
--- a/metadata/md5-cache/dev-python/envoy-0.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=Simple API for running external processes
-EAPI=3
-HOMEPAGE=https://github.com/kennethreitz/envoy http://pypi.python.org/pypi/envoy
-KEYWORDS=~x86 ~amd64
-LICENSE=MIT
-RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/e/envoy/envoy-0.0.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ef8597efd0aeb34275706767aff22e0e
diff --git a/metadata/md5-cache/dev-python/envoy-0.0.2-r1 b/metadata/md5-cache/dev-python/envoy-0.0.2-r1
deleted file mode 100644
index 6206119230d8..000000000000
--- a/metadata/md5-cache/dev-python/envoy-0.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools 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(-)]
-DESCRIPTION=Simple API for running external processes
-EAPI=5
-HOMEPAGE=https://github.com/kennethreitz/envoy http://pypi.python.org/pypi/envoy
-IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=~x86 ~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/e/envoy/envoy-0.0.2.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2af13be46f1f4cb4df050a42dbd0bfc0
diff --git a/metadata/md5-cache/dev-python/eunuchs-20050320.1 b/metadata/md5-cache/dev-python/eunuchs-20050320.1
deleted file mode 100644
index 3b7d545cfd5a..000000000000
--- a/metadata/md5-cache/dev-python/eunuchs-20050320.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Missing manly parts of UNIX API for Python
-EAPI=3
-HOMEPAGE=http://www.inoi.fi/open/trac/eunuchs http://pypi.python.org/pypi/python-eunuchs
-KEYWORDS=~amd64 ~ia64 ~x86
-LICENSE=LGPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://debian/pool/main/e/eunuchs/eunuchs_20050320.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1c3023641f6d5f23866b278678a129a7
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.2.1 b/metadata/md5-cache/dev-python/feedgenerator-1.2.1
deleted file mode 100644
index a2dec6912366..000000000000
--- a/metadata/md5-cache/dev-python/feedgenerator-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Standalone version of django.utils.feedgenerator
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/feedgenerator
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.2.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=02890acd76a98c9935ae739925c2bfde
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.5 b/metadata/md5-cache/dev-python/feedgenerator-1.5
deleted file mode 100644
index 22085b0ddcac..000000000000
--- a/metadata/md5-cache/dev-python/feedgenerator-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Standalone version of django.utils.feedgenerator
-EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/feedgenerator
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.5.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=18329142d7260e6ac1eeaf447ae43809
diff --git a/metadata/md5-cache/dev-python/flup-1.0.2 b/metadata/md5-cache/dev-python/flup-1.0.2
deleted file mode 100644
index bae934942ffd..000000000000
--- a/metadata/md5-cache/dev-python/flup-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Random assortment of WSGI servers
-EAPI=2
-HOMEPAGE=http://trac.saddi.com/flup http://pypi.python.org/pypi/flup
-KEYWORDS=amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=http://www.saddi.com/software/flup/dist/flup-1.0.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=022099933d91461a60d96d958a54ed7c
diff --git a/metadata/md5-cache/dev-python/fpconst-0.7.3 b/metadata/md5-cache/dev-python/fpconst-0.7.3
deleted file mode 100644
index ee432a514e07..000000000000
--- a/metadata/md5-cache/dev-python/fpconst-0.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Python Module for handling IEEE 754 floating point special values
-EAPI=3
-HOMEPAGE=http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ http://pypi.python.org/pypi/fpconst http://sourceforge.net/projects/rsoap/files/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/rsoap/fpconst-0.7.3.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2a1c0d444ec6480f46c4ce9ea8c13ad4
diff --git a/metadata/md5-cache/dev-python/fudge-0.9.6 b/metadata/md5-cache/dev-python/fudge-0.9.6
deleted file mode 100644
index 2ad1c0a5b4af..000000000000
--- a/metadata/md5-cache/dev-python/fudge-0.9.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=doc? ( dev-python/sphinx ) dev-lang/python test? ( dev-python/nose )
-DESCRIPTION=Replace real objects with fakes (mocks, stubs, etc) while testing
-EAPI=3
-HOMEPAGE=http://farmdev.com/projects/fudge/ http://pypi.python.org/pypi/fudge
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/f/fudge/fudge-0.9.6.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=62ceef456d982acff30946f0484762b6
diff --git a/metadata/md5-cache/dev-python/genshi-0.6 b/metadata/md5-cache/dev-python/genshi-0.6
deleted file mode 100644
index 368400938721..000000000000
--- a/metadata/md5-cache/dev-python/genshi-0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=Python toolkit for stream-based generation of output for the web
-EAPI=3
-HOMEPAGE=http://genshi.edgewall.org/ http://pypi.python.org/pypi/Genshi
-IUSE=doc examples
-KEYWORDS=amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/setuptools =dev-lang/python-2*
-SLOT=0
-SRC_URI=ftp://ftp.edgewall.com/pub/genshi/Genshi-0.6.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8421b57f15761afbbb06dec7af004b4b
diff --git a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1 b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
index c9c8bf6e78d7..fa936424e823 100644
--- a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
+++ b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A python wrapper for Gnuplot
 EAPI=5
 HOMEPAGE=http://gnuplot-py.sourceforge.net/
 IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-visualization/gnuplot 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://sourceforge/gnuplot-py/gnuplot-py-1.8.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a65f51de67b86f7a1d8d06bec1e4d065
+_md5_=9c890f80ef2500288ea32168d47c9efb
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.5 b/metadata/md5-cache/dev-python/greenlet-0.4.5
index 76a56f591396..4b5403048aa8 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.5
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.5
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/greenlet/
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/g/greenlet/greenlet-0.4.5.zip
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=27a461e20276adbfa7c87e7b7b3e41b5
+_md5_=ca31d0fc9df3bcfa8cfe576ee881f0a5
diff --git a/metadata/md5-cache/dev-python/icalendar-3.8.4 b/metadata/md5-cache/dev-python/icalendar-3.8.4
index 6e9ba11411f6..19eb8d4d8bf6 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.8.4
+++ b/metadata/md5-cache/dev-python/icalendar-3.8.4
@@ -4,11 +4,11 @@ DESCRIPTION=Package used for parsing and generating iCalendar files (RFC 2445)
 EAPI=5
 HOMEPAGE=http://github.com/collective/icalendar
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.8.4.zip
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a6c9bb1c977c98b5e796bc0c9951822d
+_md5_=a9be77d41b1d0bdca8d70c82294fb573
diff --git a/metadata/md5-cache/dev-python/ipy-0.81 b/metadata/md5-cache/dev-python/ipy-0.81
index 84380d8e71a6..6bccbdc900b5 100644
--- a/metadata/md5-cache/dev-python/ipy-0.81
+++ b/metadata/md5-cache/dev-python/ipy-0.81
@@ -4,11 +4,11 @@ DESCRIPTION=Class and tools for handling of IPv4 and IPv6 addresses and networks
 EAPI=5
 HOMEPAGE=https://github.com/haypo/python-ipy/wiki http://pypi.python.org/pypi/IPy
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-0.81.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b28dbc19394df9018c05f551753359a6
+_md5_=9a297df3585a37bea1f14b0624077571
diff --git a/metadata/md5-cache/dev-python/isodate-0.5.1 b/metadata/md5-cache/dev-python/isodate-0.5.1
index 24689a4faef7..6e8efecef516 100644
--- a/metadata/md5-cache/dev-python/isodate-0.5.1
+++ b/metadata/md5-cache/dev-python/isodate-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=ISO 8601 date/time/duration parser and formater
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/isodate
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.5.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=60c20e475b535e3dbd584133634fe275
+_md5_=17ce7c80c09cd808e9caa6ee2b7d70de
diff --git a/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1 b/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1
index bdb45794c540..5893400df541 100644
--- a/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/kaa-base-0.6.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basic Framework for all Kaa Python Modules
 EAPI=5
 HOMEPAGE=http://freevo.sourceforge.net/kaa/
 IUSE=avahi sqlite tls lirc python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.4.0 avahi? ( net-dns/avahi[python] ) sqlite? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pynotifier[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] lirc? ( dev-python/pylirc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tls? ( dev-python/tlslite[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freevo/kaa-base-0.6.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=07d08bf7af81b354a0b9f3fe65f17eda
+_md5_=62d0e8bd6ed6a7fbff9427e15be691a6
diff --git a/metadata/md5-cache/dev-python/markdown-2.1.1 b/metadata/md5-cache/dev-python/markdown-2.1.1
deleted file mode 100644
index bca1d02ac528..000000000000
--- a/metadata/md5-cache/dev-python/markdown-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=test? ( dev-python/nose ) dev-lang/python
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=3
-HOMEPAGE=http://www.freewisdom.org/projects/python-markdown http://pypi.python.org/pypi/Markdown
-IUSE=doc test pygments
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~ppc-macos ~x86-macos
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=pygments? ( dev-python/pygments ) dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-2.1.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=714c2a312f38499df3375ba247023d86
diff --git a/metadata/md5-cache/dev-python/markdown-2.3.1 b/metadata/md5-cache/dev-python/markdown-2.3.1
deleted file mode 100644
index 0640f680e6f4..000000000000
--- a/metadata/md5-cache/dev-python/markdown-2.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Python implementation of the markdown markup language
-EAPI=5
-HOMEPAGE=http://www.freewisdom.org/projects/python-markdown http://pypi.python.org/pypi/Markdown
-IUSE=doc test pygments python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=alpha amd64 ~arm ia64 ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=pygments? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/M/Markdown/Markdown-2.3.1.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dac9d20baf4f16633c9be2482157172f
diff --git a/metadata/md5-cache/dev-python/minimock-1.2.6 b/metadata/md5-cache/dev-python/minimock-1.2.6
deleted file mode 100644
index ef271c8d1a12..000000000000
--- a/metadata/md5-cache/dev-python/minimock-1.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=The simplest possible mock library
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/MiniMock
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/M/MiniMock/MiniMock-1.2.6.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=474f4b04bc00c45a14004558a05ba6c6
diff --git a/metadata/md5-cache/dev-python/minimock-1.2.7 b/metadata/md5-cache/dev-python/minimock-1.2.7
deleted file mode 100644
index 24b5539e51a3..000000000000
--- a/metadata/md5-cache/dev-python/minimock-1.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=The simplest possible mock library
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/MiniMock
-KEYWORDS=amd64 arm ppc x86
-LICENSE=MIT
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/M/MiniMock/MiniMock-1.2.7.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=aee5d65293e250de6f5a87fed2cbe683
diff --git a/metadata/md5-cache/dev-python/minimock-1.2.8 b/metadata/md5-cache/dev-python/minimock-1.2.8
deleted file mode 100644
index e10b8deb311f..000000000000
--- a/metadata/md5-cache/dev-python/minimock-1.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=The simplest possible mock library
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/MiniMock
-KEYWORDS=amd64 arm ppc x86
-LICENSE=MIT
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/M/MiniMock/MiniMock-1.2.8.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2b2dd92e1328784f5d65521cc79d89b4
diff --git a/metadata/md5-cache/dev-python/mkpythonproj-1.7 b/metadata/md5-cache/dev-python/mkpythonproj-1.7
deleted file mode 100644
index 02f9d3877bb2..000000000000
--- a/metadata/md5-cache/dev-python/mkpythonproj-1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Creates the framework for a new Python project or script
-EAPI=3
-HOMEPAGE=http://www.seanet.com/~hgg9140/comp/mkpythonproj/doc/index.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.seanet.com/~hgg9140/comp/download/mkpythonproj-1.7.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=77325c84c33c2d2e0b25ae0266b8dd86
diff --git a/metadata/md5-cache/dev-python/mkpythonproj-1.8 b/metadata/md5-cache/dev-python/mkpythonproj-1.8
deleted file mode 100644
index 16117ffcb114..000000000000
--- a/metadata/md5-cache/dev-python/mkpythonproj-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Creates the framework for a new Python project or script
-EAPI=3
-HOMEPAGE=http://www.seanet.com/~hgg9140/comp/mkpythonproj/doc/index.html
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.seanet.com/~hgg9140/comp/download/mkpythonproj-1.8.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ea23f9fc19d9c560b4c2b493a5103660
diff --git a/metadata/md5-cache/dev-python/nltk-2.0.1 b/metadata/md5-cache/dev-python/nltk-2.0.1
deleted file mode 100644
index d86781537b79..000000000000
--- a/metadata/md5-cache/dev-python/nltk-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/numpy dev-python/pyyaml app-arch/unzip =dev-lang/python-2* =dev-lang/python-2*[tk(+),xml(+)]
-DESCRIPTION=Natural Language Toolkit
-EAPI=4
-HOMEPAGE=http://nltk.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-python/numpy dev-python/pyyaml =dev-lang/python-2* =dev-lang/python-2*[tk(+),xml(+)]
-SLOT=0
-SRC_URI=mirror://pypi/n/nltk/nltk-2.0.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2185a50c2f2c7b0eeea486cfcb9c1ff1
diff --git a/metadata/md5-cache/dev-python/nltk-2.0.1_rc1 b/metadata/md5-cache/dev-python/nltk-2.0.1_rc1
deleted file mode 100644
index 7afff118d378..000000000000
--- a/metadata/md5-cache/dev-python/nltk-2.0.1_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/numpy dev-python/pyyaml app-arch/unzip =dev-lang/python-2*
-DESCRIPTION=Natural Language Toolkit
-EAPI=3
-HOMEPAGE=http://nltk.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-python/numpy dev-python/pyyaml =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://nltk.googlecode.com/files/nltk-2.0.1rc1.zip
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a4b78527f78294dd1bdc4dfd900fe280
diff --git a/metadata/md5-cache/dev-python/nose-exclude-0.2.0 b/metadata/md5-cache/dev-python/nose-exclude-0.2.0
index 754e931bf2b2..65f5a1acfc30 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.2.0
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Exclude specific directories from nosetests runs
 EAPI=5
 HOMEPAGE=http://bitbucket.org/kgrandis/nose-exclude
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[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/n/nose-exclude/nose-exclude-0.2.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=05383b69d74f00ac4370d0ff42dbf911
+_md5_=5aff723a6838ea49da910a60431ce11b
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.10 b/metadata/md5-cache/dev-python/nosexcover-1.0.10
index 4d050ec33e2d..0e8d5de2df1e 100644
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.10
+++ b/metadata/md5-cache/dev-python/nosexcover-1.0.10
@@ -4,11 +4,11 @@ DESCRIPTION=Extends nose.plugins.cover to add Cobertura-style XML reports
 EAPI=5
 HOMEPAGE=https://github.com/cmheisel/nose-xcover/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/coverage-3.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/n/nosexcover/nosexcover-1.0.10.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bb93ce42cfa2c3266844ea848b83ac84
+_md5_=ac40a4e4bb71771ac893bc87c686ddb5
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.7 b/metadata/md5-cache/dev-python/nosexcover-1.0.7
deleted file mode 100644
index 64d8a80506b4..000000000000
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-python/nose dev-python/coverage =dev-lang/python-2*
-DESCRIPTION=Extends nose.plugins.cover to add Cobertura-style XML reports
-EAPI=3
-HOMEPAGE=https://github.com/cmheisel/nose-xcover/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools dev-python/nose dev-python/coverage =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.7.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a001b74bb83bab6865671d31c39e3f84
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.7-r1 b/metadata/md5-cache/dev-python/nosexcover-1.0.7-r1
deleted file mode 100644
index 19d33dfd4d3a..000000000000
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/coverage[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(-)]
-DESCRIPTION=Extends nose.plugins.cover to add Cobertura-style XML reports
-EAPI=5
-HOMEPAGE=https://github.com/cmheisel/nose-xcover/
-IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/coverage[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/nosexcover/nosexcover-1.0.7.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=459a85622ce598bc2436c1981d61ccce
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.8 b/metadata/md5-cache/dev-python/nosexcover-1.0.8
deleted file mode 100644
index 78887a2be218..000000000000
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] >=dev-python/coverage-3.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Extends nose.plugins.cover to add Cobertura-style XML reports
-EAPI=5
-HOMEPAGE=https://github.com/cmheisel/nose-xcover/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] >=dev-python/coverage-3.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.8.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=58fe8c588a129349d25836fcf86336a6
diff --git a/metadata/md5-cache/dev-python/notify-python-0.1.1-r2 b/metadata/md5-cache/dev-python/notify-python-0.1.1-r2
deleted file mode 100644
index 42305da0ef4b..000000000000
--- a/metadata/md5-cache/dev-python/notify-python-0.1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-python/pygtk-2.24:2 >=x11-libs/libnotify-0.7 virtual/pkgconfig =dev-lang/python-2*
-DESCRIPTION=Python bindings for libnotify
-EAPI=3
-HOMEPAGE=http://www.galago-project.org/
-IUSE=examples
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/pygtk-2.24:2 >=x11-libs/libnotify-0.7 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c811396c1d661083b7cdc4fe1e263c20
diff --git a/metadata/md5-cache/dev-python/optcomplete-1.2 b/metadata/md5-cache/dev-python/optcomplete-1.2
deleted file mode 100644
index 1c7746d0e5b1..000000000000
--- a/metadata/md5-cache/dev-python/optcomplete-1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Shell completion self-generator for Python
-EAPI=3
-HOMEPAGE=http://furius.ca/optcomplete/ http://pypi.python.org/pypi/optcomplete
-IUSE=examples
-KEYWORDS=amd64 ppc x86 ~x86-linux
-LICENSE=BSD
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://furius.ca/downloads/optcomplete/releases/optcomplete-1.2.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f690c637b830b8b23f72766c02f6ff46
diff --git a/metadata/md5-cache/dev-python/pathlib-1.0 b/metadata/md5-cache/dev-python/pathlib-1.0
deleted file mode 100644
index 82e8429cf531..000000000000
--- a/metadata/md5-cache/dev-python/pathlib-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Object-oriented filesystem paths
-EAPI=5
-HOMEPAGE=https://pathlib.readthedocs.org/
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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/pathlib/pathlib-1.0.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d199f84760278301119f9bcfc91efd44
diff --git a/metadata/md5-cache/dev-python/pathlib-1.0.1 b/metadata/md5-cache/dev-python/pathlib-1.0.1
index 81354f0f72cc..f312080060d3 100644
--- a/metadata/md5-cache/dev-python/pathlib-1.0.1
+++ b/metadata/md5-cache/dev-python/pathlib-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Object-oriented filesystem paths
 EAPI=5
 HOMEPAGE=https://pathlib.readthedocs.org/
 IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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/pathlib/pathlib-1.0.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=559f2fb7017477207a86501ecb55525a
+_md5_=bf88a930443043f6cf14c09ed58953b6
diff --git a/metadata/md5-cache/dev-python/pp-1.6.1 b/metadata/md5-cache/dev-python/pp-1.6.1
deleted file mode 100644
index 226bfb32d1e0..000000000000
--- a/metadata/md5-cache/dev-python/pp-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Parallel and distributed programming for Python
-EAPI=3
-HOMEPAGE=http://www.parallelpython.com/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.parallelpython.com/downloads/pp/pp-1.6.1.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0c64af08171635deb64a16bdeb4f3a54
diff --git a/metadata/md5-cache/dev-python/pp-1.6.2 b/metadata/md5-cache/dev-python/pp-1.6.2
deleted file mode 100644
index 7f42d2fe482c..000000000000
--- a/metadata/md5-cache/dev-python/pp-1.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Parallel and distributed programming for Python
-EAPI=3
-HOMEPAGE=http://www.parallelpython.com/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.parallelpython.com/downloads/pp/pp-1.6.2.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a4877b9f987acd3376a1e1bb0f058c55
diff --git a/metadata/md5-cache/dev-python/pp-1.6.3 b/metadata/md5-cache/dev-python/pp-1.6.3
deleted file mode 100644
index 558060aeaa35..000000000000
--- a/metadata/md5-cache/dev-python/pp-1.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Parallel and distributed programming for Python
-EAPI=3
-HOMEPAGE=http://www.parallelpython.com/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.parallelpython.com/downloads/pp/pp-1.6.3.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=50c6cbc9f4943b86c03513e42b28abe7
diff --git a/metadata/md5-cache/dev-python/pp-1.6.4 b/metadata/md5-cache/dev-python/pp-1.6.4
deleted file mode 100644
index 2204ea8b0301..000000000000
--- a/metadata/md5-cache/dev-python/pp-1.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Parallel and distributed programming for Python
-EAPI=3
-HOMEPAGE=http://www.parallelpython.com/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.parallelpython.com/downloads/pp/pp-1.6.4.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=df07a276464dc47a7cca3e7b612d099f
diff --git a/metadata/md5-cache/dev-python/progressbar-2.3 b/metadata/md5-cache/dev-python/progressbar-2.3
deleted file mode 100644
index e891ccf2305f..000000000000
--- a/metadata/md5-cache/dev-python/progressbar-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Text progressbar library for python
-EAPI=3
-HOMEPAGE=http://code.google.com/p/python-progressbar/ http://pypi.python.org/pypi/progressbar
-IUSE=examples
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( LGPL-2.1 BSD )
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=http://python-progressbar.googlecode.com/files/progressbar-2.3.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=72e3522509931bd2031da4cda599c5ac
diff --git a/metadata/md5-cache/dev-python/py-notify-0.2.1 b/metadata/md5-cache/dev-python/py-notify-0.2.1
deleted file mode 100644
index 647a2ce7bc48..000000000000
--- a/metadata/md5-cache/dev-python/py-notify-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Tools for implementing the Observer programming pattern in Python
-EAPI=2
-HOMEPAGE=http://home.gna.org/py-notify
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://download.gna.org/py-notify/py-notify-0.2.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ef7a544b4b46ee1adf39e15c1c9597be
diff --git a/metadata/md5-cache/dev-python/py-notify-0.3.1-r1 b/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
index 058435234e0f..ff263b1a752f 100644
--- a/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/py-notify-0.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for implementing the Observer programming pattern in Python
 EAPI=5
 HOMEPAGE=http://home.gna.org/py-notify
 IUSE=examples test python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=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=http://download.gna.org/py-notify/py-notify-0.3.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=eb7fa8d1b948771ec576c5c72fd5cb4f
+_md5_=0c0c095185bf0d14934480872f1daa72
diff --git a/metadata/md5-cache/dev-python/pyPdf-1.13 b/metadata/md5-cache/dev-python/pyPdf-1.13
deleted file mode 100644
index 65e5d23bbd8f..000000000000
--- a/metadata/md5-cache/dev-python/pyPdf-1.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/python
-DESCRIPTION=Python library to work with pdf files
-EAPI=2
-HOMEPAGE=http://pybrary.net/pyPdf/ http://pypi.python.org/pypi/pyPdf
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=http://pybrary.net/pyPdf/pyPdf-1.13.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1b5e0d0d262b8a986d0136281853d86b
diff --git a/metadata/md5-cache/dev-python/pyamg-2.0.5 b/metadata/md5-cache/dev-python/pyamg-2.0.5
deleted file mode 100644
index e276a6c87ef9..000000000000
--- a/metadata/md5-cache/dev-python/pyamg-2.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Algebraic multigrid solvers in Python
-EAPI=5
-HOMEPAGE=http://code.google.com/p/pyamg/
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://pyamg.googlecode.com/files/pyamg-2.0.5.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a9001759295eaded39bb13ef9965b207
diff --git a/metadata/md5-cache/dev-python/pychecker-0.8.18 b/metadata/md5-cache/dev-python/pychecker-0.8.18
deleted file mode 100644
index 991bfe187d33..000000000000
--- a/metadata/md5-cache/dev-python/pychecker-0.8.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/python
-DESCRIPTION=Tool for finding common bugs in python source code
-EAPI=2
-HOMEPAGE=http://pychecker.sourceforge.net/
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://sourceforge/pychecker/pychecker-0.8.18.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a9eb3f7d5e7383fc324b68e6f01b8db1
diff --git a/metadata/md5-cache/dev-python/pygtkglext-1.1.0-r1 b/metadata/md5-cache/dev-python/pygtkglext-1.1.0-r1
index 8819d431d9b3..9ea196fc3fae 100644
--- a/metadata/md5-cache/dev-python/pygtkglext-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/pygtkglext-1.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings to GtkGLExt
 EAPI=5
 HOMEPAGE=http://gtkglext.sourceforge.net/
 IUSE=examples python_targets_python2_7
-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=LGPL-2.1 GPL-2
 RDEPEND=>=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.0:2 >=x11-libs/gtk+-2.0:2 >=x11-libs/gtkglext-1.0.0 dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkglext/pygtkglext-1.1.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=53f3f792742c8e85c6bfb897d9385599
+_md5_=b3f9af78f7a7438d5b3e06a5b3b087c1
diff --git a/metadata/md5-cache/dev-python/pylirc-0.0.5 b/metadata/md5-cache/dev-python/pylirc-0.0.5
deleted file mode 100644
index 6554a1bf5368..000000000000
--- a/metadata/md5-cache/dev-python/pylirc-0.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-misc/lirc =dev-lang/python-2*
-DESCRIPTION=lirc module for Python
-EAPI=3
-HOMEPAGE=http://sourceforge.net/projects/pylirc/ http://pypi.python.org/pypi/pylirc
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-misc/lirc =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/pylirc/pylirc-0.0.5.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f0f31371643d17875dd26b774b07afbd
diff --git a/metadata/md5-cache/dev-python/pymtp-0.0.4 b/metadata/md5-cache/dev-python/pymtp-0.0.4
deleted file mode 100644
index e423a207e1c3..000000000000
--- a/metadata/md5-cache/dev-python/pymtp-0.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=>=media-libs/libmtp-1.1.0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=LibMTP bindings for Python
-EAPI=4
-HOMEPAGE=http://libmtp.sourceforge.net/ http://pypi.python.org/pypi/PyMTP
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libmtp-1.1.0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://gentoo/pymtp-0.0.4.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=216dd4dda8e86b1c6f29d78d0be2ad36
diff --git a/metadata/md5-cache/dev-python/pynut-1.1 b/metadata/md5-cache/dev-python/pynut-1.1
deleted file mode 100644
index 1626113aaa7e..000000000000
--- a/metadata/md5-cache/dev-python/pynut-1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=An abstraction class written in Python to access NUT (Network UPS Tools) server
-EAPI=2
-HOMEPAGE=http://www.lestat.st/informatique/projets/pynut-en/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://www.lestat.st/_media/informatique/projets/pynut/python-pynut-1.1.tar.gz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dba081ebc424a9adb261e9ebac4f11c6
diff --git a/metadata/md5-cache/dev-python/pynzb-0.1.0 b/metadata/md5-cache/dev-python/pynzb-0.1.0
deleted file mode 100644
index 67f112830144..000000000000
--- a/metadata/md5-cache/dev-python/pynzb-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Unified API for parsing NZB files
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/pynzb/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/p/pynzb/pynzb-0.1.0.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=09254fc0b9b2b3af1bd5f555ce88b126
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.0.1 b/metadata/md5-cache/dev-python/pyopengl-3.0.1
deleted file mode 100644
index 0828f6b42212..000000000000
--- a/metadata/md5-cache/dev-python/pyopengl-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) dev-python/setuptools tk? ( dev-lang/python[tk] ) dev-lang/python
-DESCRIPTION=Python OpenGL bindings
-EAPI=3
-HOMEPAGE=http://pyopengl.sourceforge.net/ http://pypi.python.org/pypi/PyOpenGL
-IUSE=tk
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) tk? ( dev-lang/python[tk] ) dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.0.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1140a3a29e07775dc004206c69abb8ac
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.0.2 b/metadata/md5-cache/dev-python/pyopengl-3.0.2
deleted file mode 100644
index 12e399a0e0c9..000000000000
--- a/metadata/md5-cache/dev-python/pyopengl-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) dev-python/setuptools tk? ( dev-lang/python[tk] ) dev-lang/python
-DESCRIPTION=Python OpenGL bindings
-EAPI=3
-HOMEPAGE=http://pyopengl.sourceforge.net/ http://pypi.python.org/pypi/PyOpenGL
-IUSE=tk
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) tk? ( dev-lang/python[tk] ) dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.0.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7887ad07c8e0a524ebac4fc2ffc2b642
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.0.3 b/metadata/md5-cache/dev-python/pyparsing-2.0.3
index 7eecf9ae57b6..4f1083aeb5f9 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.0.3
+++ b/metadata/md5-cache/dev-python/pyparsing-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=pyparsing is an easy-to-use Python module for text parsing
 EAPI=5
 HOMEPAGE=http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!dev-python/pyparsing:py2 !dev-python/pyparsing:py3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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://sourceforge/pyparsing/pyparsing-2.0.3.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=41b6c1374f2a9bd0c416a907ac881c8d
+_md5_=26f582283163078b274925f6d694f7d5
diff --git a/metadata/md5-cache/dev-python/pyrex-0.9.9 b/metadata/md5-cache/dev-python/pyrex-0.9.9
deleted file mode 100644
index 72ba36858232..000000000000
--- a/metadata/md5-cache/dev-python/pyrex-0.9.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A language for writing Python extension modules
-EAPI=3
-HOMEPAGE=http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
-IUSE=examples
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-0.9.9.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=80275267b5399e53541def08c893d021
diff --git a/metadata/md5-cache/dev-python/pyro-4.25 b/metadata/md5-cache/dev-python/pyro-4.25
index ee8f01ae14db..e23e020266b0 100644
--- a/metadata/md5-cache/dev-python/pyro-4.25
+++ b/metadata/md5-cache/dev-python/pyro-4.25
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced and powerful Distributed Object Technology system written e
 EAPI=5
 HOMEPAGE=http://www.xs4all.nl/~irmen/pyro/ http://pypi.python.org/pypi/Pyro4
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!dev-python/pyro:0 >=dev-python/serpent-1.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[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=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.25.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0fa96a1a318ac9e736c3d3416003b3bc
+_md5_=ee664cf66be69dc1a5d796b890c57fb4
diff --git a/metadata/md5-cache/dev-python/pytest-runner-2.1.2 b/metadata/md5-cache/dev-python/pytest-runner-2.1.2
index 16ff3b4d11bf..fc846b6f494f 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-2.1.2
+++ b/metadata/md5-cache/dev-python/pytest-runner-2.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Adds support for tests durring installation of setup.py files
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/pytest-runner
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-2.1.2.zip
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=da3f4e9968879f7692e596d1a57dfafc
+_md5_=0572653a8023a2cd4e7918c11b5f4a87
diff --git a/metadata/md5-cache/dev-python/python-bibtex-1.2.4 b/metadata/md5-cache/dev-python/python-bibtex-1.2.4
deleted file mode 100644
index 798b65ae1b2f..000000000000
--- a/metadata/md5-cache/dev-python/python-bibtex-1.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 >=app-text/recode-3.6-r1 virtual/pkgconfig =dev-lang/python-2*
-DESCRIPTION=A Python extension to parse BibTeX files
-EAPI=3
-HOMEPAGE=http://pybliographer.org/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=app-text/recode-3.6-r1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/pybliographer/python-bibtex-1.2.4.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c09014bb2099563843c70940377badd3
diff --git a/metadata/md5-cache/dev-python/python-bibtex-1.2.7 b/metadata/md5-cache/dev-python/python-bibtex-1.2.7
deleted file mode 100644
index 7acdb4f9d03b..000000000000
--- a/metadata/md5-cache/dev-python/python-bibtex-1.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 >=app-text/recode-3.6-r1 virtual/pkgconfig =dev-lang/python-2*
-DESCRIPTION=A Python extension to parse BibTeX files
-EAPI=3
-HOMEPAGE=http://pybliographer.org/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=app-text/recode-3.6-r1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/pybliographer/python-bibtex-1.2.7.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b8c23fa161d9b677fa71431cf529789e
diff --git a/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1 b/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
index 8e808e451927..06a6bde4ebbe 100644
--- a/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python module to find the checksum of files
 EAPI=5
 HOMEPAGE=http://code.fluffytapeworm.com/projects
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib 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=http://code.fluffytapeworm.com/projects/python-fchksum-1.7.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5fc1c83432ecba6c4fef4cbac152f9ba
+_md5_=74c838be5a209717424f7b260c5f71ea
diff --git a/metadata/md5-cache/dev-python/python-mhash-1.4 b/metadata/md5-cache/dev-python/python-mhash-1.4
deleted file mode 100644
index a0158f298911..000000000000
--- a/metadata/md5-cache/dev-python/python-mhash-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-crypt/mhash =dev-lang/python-2*
-DESCRIPTION=Python interface to libmhash
-EAPI=3
-HOMEPAGE=http://mhash.sourceforge.net/
-KEYWORDS=~amd64 ~ia64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-crypt/mhash =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/mhash/python-mhash-1.4.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bb561378b5c50e10900bbd69d10bcc63
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.5.1 b/metadata/md5-cache/dev-python/python-nbxmpp-0.5.1
index f28f0edad82a..606790eac30b 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.5.1
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
 EAPI=5
 HOMEPAGE=http://python-nbxmpp.gajim.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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=http://python-nbxmpp.gajim.org/downloads/6 -> python-nbxmpp-0.5.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9362f221ed27cd24280a118b180736c2
+_md5_=858379ae354d5799a404059c3adff54f
diff --git a/metadata/md5-cache/dev-python/python-poppler-0.12.1-r3 b/metadata/md5-cache/dev-python/python-poppler-0.12.1-r3
deleted file mode 100644
index fe473f022f19..000000000000
--- a/metadata/md5-cache/dev-python/python-poppler-0.12.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/poppler-0.15.0[cairo] >=dev-python/pycairo-1.8.4 dev-python/pygobject:2 dev-python/pygtk:2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Python bindings to the Poppler PDF library
-EAPI=3
-HOMEPAGE=http://launchpad.net/poppler-python
-IUSE=examples
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.15.0[cairo] >=dev-python/pycairo-1.8.4 dev-python/pygobject:2 dev-python/pygtk:2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://launchpad.net/poppler-python/trunk/development/+download/pypoppler-0.12.1.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=053d2682d3a781f5153283f92572b0d5
diff --git a/metadata/md5-cache/dev-python/pytz-2014.10 b/metadata/md5-cache/dev-python/pytz-2014.10
index 9e56ade4dcd8..2d5a6b8c243a 100644
--- a/metadata/md5-cache/dev-python/pytz-2014.10
+++ b/metadata/md5-cache/dev-python/pytz-2014.10
@@ -4,11 +4,11 @@ DESCRIPTION=World timezone definitions for Python
 EAPI=5
 HOMEPAGE=http://pythonhosted.org/pytz/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=sys-libs/timezone-data-2014i python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/p/pytz/pytz-2014.10.tar.bz2
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fce4c759074c27b30f55dea8d3d66c86
+_md5_=933f1c0c4785f510b5128086c59bc866
diff --git a/metadata/md5-cache/dev-python/pyusb-0.4.2 b/metadata/md5-cache/dev-python/pyusb-0.4.2
deleted file mode 100644
index d6cd81b394e3..000000000000
--- a/metadata/md5-cache/dev-python/pyusb-0.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/libusb:0 dev-lang/python
-DESCRIPTION=USB support for Python
-EAPI=2
-HOMEPAGE=http://pyusb.sourceforge.net/
-IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/libusb:0 dev-lang/python
-SLOT=0
-SRC_URI=mirror://sourceforge/pyusb/pyusb-0.4.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f078ef96cd4ddd6061b90251b0b3acba
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.0_alpha1 b/metadata/md5-cache/dev-python/pyusb-1.0.0_alpha1
deleted file mode 100644
index f105438dd3e1..000000000000
--- a/metadata/md5-cache/dev-python/pyusb-1.0.0_alpha1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=virtual/libusb:1 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=USB support for Python
-EAPI=3
-HOMEPAGE=http://pyusb.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/libusb:1 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyusb/pyusb-1.0.0-a1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0d010e6c76c1d9c2066bd2a1baeaac75
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.0_alpha3 b/metadata/md5-cache/dev-python/pyusb-1.0.0_alpha3
deleted file mode 100644
index c7b7cd170170..000000000000
--- a/metadata/md5-cache/dev-python/pyusb-1.0.0_alpha3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=virtual/libusb:1 dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=USB support for Python
-EAPI=3
-HOMEPAGE=http://pyusb.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/libusb:1 dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyusb/pyusb-1.0.0a3.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d9a84de995dfaa2c0dc829b25455a6c6
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.0_beta1 b/metadata/md5-cache/dev-python/pyusb-1.0.0_beta1
deleted file mode 100644
index 076edffd7485..000000000000
--- a/metadata/md5-cache/dev-python/pyusb-1.0.0_beta1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libusb dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=USB support for Python
-EAPI=5
-HOMEPAGE=http://pyusb.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=virtual/libusb dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyusb/pyusb-1.0.0b1.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=46135a0fa678976759bfa98d23ee48c9
diff --git a/metadata/md5-cache/dev-python/pyutil-2.0.0 b/metadata/md5-cache/dev-python/pyutil-2.0.0
index 01b7bfeb6d1b..39c7cf131f8e 100644
--- a/metadata/md5-cache/dev-python/pyutil-2.0.0
+++ b/metadata/md5-cache/dev-python/pyutil-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of utilities for Python programmers
 EAPI=5
 HOMEPAGE=https://tahoe-lafs.org/trac/pyutil https://pypi.python.org/pypi/pyutil
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyutil/pyutil-2.0.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e796211ed78c0e06030b97c0a0c430fc
+_md5_=2d0d1ead641d55fc4a8bd0f231d1c882
diff --git a/metadata/md5-cache/dev-python/pyvorbis-1.4-r4 b/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
index eec606dcde99..1edc1621883b 100644
--- a/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
+++ b/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the ogg.vorbis library
 EAPI=5
 HOMEPAGE=http://ekyo.nerim.net/software/pyogg/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-python/pyogg-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-libs/libogg-1.0 >=media-libs/libvorbis-1.0 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=http://ekyo.nerim.net/software/pyogg/pyvorbis-1.4.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0726c9a99c62c85a030528ef6592a343
+_md5_=d642fecfeeaeeff0eaeca8e2f341f1e0
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.3 b/metadata/md5-cache/dev-python/pyxattr-0.5.3
index f1119b9c438a..8ada7918838f 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.3
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to xattr
 EAPI=5
 HOMEPAGE=http://pyxattr.k1024.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/attr python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.5.3.tar.gz http://pyxattr.k1024.org/downloads/pyxattr-0.5.3.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=58d030c6f2b9aab7f4a35e27a63beee6
+_md5_=0d3ec04e9e0e66d05353f565db2f26cc
diff --git a/metadata/md5-cache/dev-python/pyzor-0.5.0-r1 b/metadata/md5-cache/dev-python/pyzor-0.5.0-r1
deleted file mode 100644
index 9a9845dc1fa5..000000000000
--- a/metadata/md5-cache/dev-python/pyzor-0.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND==dev-lang/python-2* pyzord? ( =dev-lang/python-2*[gdbm] )
-DESCRIPTION=A distributed, collaborative spam detection and filtering network
-EAPI=3
-HOMEPAGE=http://pyzor.sourceforge.net/
-IUSE=pyzord
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/python-2* pyzord? ( =dev-lang/python-2*[gdbm] )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyzor/pyzor-0.5.0.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=add74a89521b1b0866ae9df0e734e61a
diff --git a/metadata/md5-cache/dev-python/quixote-2.8 b/metadata/md5-cache/dev-python/quixote-2.8
index 5cf5e6da2ee8..2db26ea983ab 100644
--- a/metadata/md5-cache/dev-python/quixote-2.8
+++ b/metadata/md5-cache/dev-python/quixote-2.8
@@ -4,7 +4,7 @@ DESCRIPTION=Python HTML templating framework for developing web applications
 EAPI=5
 HOMEPAGE=http://quixote.ca
 IUSE=doc test python_targets_python2_7
-KEYWORDS=amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ia64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=CNRI-QUIXOTE-2.4
 RDEPEND=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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://quixote.ca/releases/Quixote-2.8.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6e3c2793c1b7562eb52b74d6dee3e6b1
+_md5_=580456d5cd0c52e351d01a4b864b80d0
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.5 b/metadata/md5-cache/dev-python/repoze-lru-0.5
deleted file mode 100644
index 89984c5f20f4..000000000000
--- a/metadata/md5-cache/dev-python/repoze-lru-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-lang/python
-DESCRIPTION=A tiny LRU cache implementation and decorator
-EAPI=3
-HOMEPAGE=http://www.repoze.org
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.5.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1d6924a21a20acccd35f35d619e6dba4
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.6 b/metadata/md5-cache/dev-python/repoze-lru-0.6
deleted file mode 100644
index f738da70a23e..000000000000
--- a/metadata/md5-cache/dev-python/repoze-lru-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-lang/python
-DESCRIPTION=A tiny LRU cache implementation and decorator
-EAPI=3
-HOMEPAGE=http://www.repoze.org
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.6.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=78f88e74903bcd68d5016506ad146b29
diff --git a/metadata/md5-cache/dev-python/ropemacs-0.6 b/metadata/md5-cache/dev-python/ropemacs-0.6
deleted file mode 100644
index 3800440ef186..000000000000
--- a/metadata/md5-cache/dev-python/ropemacs-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/rope dev-python/ropemode || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=Rope in Emacs
-EAPI=3
-HOMEPAGE=http://rope.sourceforge.net/ropemacs.html http://pypi.python.org/pypi/ropemacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/rope dev-python/ropemode || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=http://bitbucket.org/agr/ropemacs/get/8b277a188d00.gz -> ropemacs-0.6.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c33fd4d674ff9d19c42cdc68b53a45be
diff --git a/metadata/md5-cache/dev-python/ropemode-0.1_rc2 b/metadata/md5-cache/dev-python/ropemode-0.1_rc2
deleted file mode 100644
index 0c6eeff00411..000000000000
--- a/metadata/md5-cache/dev-python/ropemode-0.1_rc2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=A helper for using rope refactoring library in IDEs
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/ropemode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/rope-0.9.2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=mirror://pypi/r/ropemode/ropemode-0.1-rc2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=23956b6cc49c199ca92fa40cd1eab8e3
diff --git a/metadata/md5-cache/dev-python/ropemode-0.2 b/metadata/md5-cache/dev-python/ropemode-0.2
deleted file mode 100644
index 9baac680b8ab..000000000000
--- a/metadata/md5-cache/dev-python/ropemode-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=A helper for using rope refactoring library in IDEs
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/ropemode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/rope-0.9.2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=mirror://pypi/r/ropemode/ropemode-0.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9b6cda6abdbdc12457c5d502a0f323b9
diff --git a/metadata/md5-cache/dev-python/rpyc-3.2.1 b/metadata/md5-cache/dev-python/rpyc-3.2.1
deleted file mode 100644
index ab98bd3a4dc0..000000000000
--- a/metadata/md5-cache/dev-python/rpyc-3.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Remote Python Call (RPyC), a transparent and symmetric RPC library
-EAPI=3
-HOMEPAGE=http://rpyc.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://sourceforge/rpyc/rpyc-3.2.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=085132194f2489c8a7505b16dc4b85b6
diff --git a/metadata/md5-cache/dev-python/rpyc-3.2.2 b/metadata/md5-cache/dev-python/rpyc-3.2.2
deleted file mode 100644
index 292aa4c44d4c..000000000000
--- a/metadata/md5-cache/dev-python/rpyc-3.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Remote Python Call (RPyC), a transparent and symmetric RPC library
-EAPI=3
-HOMEPAGE=http://rpyc.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://sourceforge/rpyc/rpyc-3.2.2.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a0a7e234b8d1cc14631684a7da2b13c0
diff --git a/metadata/md5-cache/dev-python/rpyc-3.2.3 b/metadata/md5-cache/dev-python/rpyc-3.2.3
deleted file mode 100644
index 79d3dce4c187..000000000000
--- a/metadata/md5-cache/dev-python/rpyc-3.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Remote Python Call (RPyC), a transparent and symmetric RPC library
-EAPI=3
-HOMEPAGE=http://rpyc.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://sourceforge/rpyc/rpyc-3.2.3.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=615a8a1d24ed84a9dab7ce4e713bece3
diff --git a/metadata/md5-cache/dev-python/rsa-3.1.1 b/metadata/md5-cache/dev-python/rsa-3.1.1
deleted file mode 100644
index d413824d8778..000000000000
--- a/metadata/md5-cache/dev-python/rsa-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=>=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
-DESCRIPTION=Pure-Python RSA implementation
-EAPI=4
-HOMEPAGE=http://stuvel.eu/rsa http://pypi.python.org/pypi/rsa
-IUSE=test
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyasn1-0.0.13 >=dev-python/setuptools-0.6.10 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/r/rsa/rsa-3.1.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6f3b7d192592cc6b24d3267ea6702e48
diff --git a/metadata/md5-cache/dev-python/rsa-3.1.4-r1 b/metadata/md5-cache/dev-python/rsa-3.1.4-r1
index ef4a458c5829..981803ce50b5 100644
--- a/metadata/md5-cache/dev-python/rsa-3.1.4-r1
+++ b/metadata/md5-cache/dev-python/rsa-3.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Pure-Python RSA implementation
 EAPI=5
 HOMEPAGE=http://stuvel.eu/rsa http://pypi.python.org/pypi/rsa
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pyasn1-0.0.13[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.1.4.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=49103d9991e59326daa1a55e4c25ffd2
+_md5_=50ea6f857d2c286a537b966a3da1e560
diff --git a/metadata/md5-cache/dev-python/runsnakerun-2.0.1 b/metadata/md5-cache/dev-python/runsnakerun-2.0.1
deleted file mode 100644
index 3f8550272906..000000000000
--- a/metadata/md5-cache/dev-python/runsnakerun-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* )
-DESCRIPTION=GUI Viewer for Python profiling runs
-EAPI=4
-HOMEPAGE=http://www.vrplumber.com/programming/runsnakerun/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/squaremap dev-python/wxpython || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* )
-SLOT=0
-SRC_URI=mirror://pypi/R/RunSnakeRun/RunSnakeRun-2.0.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c43218700de86cb7121461c0d6ddb913
diff --git a/metadata/md5-cache/dev-python/sepolgen-1.2.1-r1 b/metadata/md5-cache/dev-python/sepolgen-1.2.1-r1
index f17c1ccd2840..bec0ff144fd0 100644
--- a/metadata/md5-cache/dev-python/sepolgen-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/sepolgen-1.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux policy generation library
 EAPI=5
 HOMEPAGE=http://userspace.selinuxproject.org
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libselinux-2.0[python] app-admin/setools[python] 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(-)]
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/sepolgen-1.2.1.tar.gz http://dev.gentoo.org/~swift/patches/sepolgen/patchbundle-sepolgen-1.2.1-r1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9a7135f090c90f88a2af064b65f40b67
+_md5_=337b3e38c2e40c7f7b69eb965042a563
diff --git a/metadata/md5-cache/dev-python/six-1.8.0 b/metadata/md5-cache/dev-python/six-1.8.0
index 910b336fb57f..7a407d658023 100644
--- a/metadata/md5-cache/dev-python/six-1.8.0
+++ b/metadata/md5-cache/dev-python/six-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python 2 and 3 compatibility library
 EAPI=5
 HOMEPAGE=https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.8.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a95ef9d9543a0e181e83b3bec6ce0033
+_md5_=be47fca17033cdf608bf0125238ba48a
diff --git a/metadata/md5-cache/dev-python/snappy-0.5 b/metadata/md5-cache/dev-python/snappy-0.5
deleted file mode 100644
index 00319f72f73e..000000000000
--- a/metadata/md5-cache/dev-python/snappy-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/python
-DESCRIPTION=Python library for the snappy compression library from Google
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/python-snappy
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-arch/snappy-1.0.2 dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2f6963782514e3efbdc04aabbaa41418
diff --git a/metadata/md5-cache/dev-python/snappy-0.5-r1 b/metadata/md5-cache/dev-python/snappy-0.5-r1
deleted file mode 100644
index 0f6b2b360d4c..000000000000
--- a/metadata/md5-cache/dev-python/snappy-0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-arch/snappy-1.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Python library for the snappy compression library from Google
-EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/python-snappy
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-arch/snappy-1.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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/python-snappy/python-snappy-0.5.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=56a5df139a6a0b2318851d4b90d4fb99
diff --git a/metadata/md5-cache/dev-python/stomper-0.2.7 b/metadata/md5-cache/dev-python/stomper-0.2.7
deleted file mode 100644
index 720c73eec167..000000000000
--- a/metadata/md5-cache/dev-python/stomper-0.2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/setuptools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=Transport neutral client implementation of the STOMP protocol
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/stomper
-IUSE=examples
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=mirror://pypi/s/stomper/stomper-0.2.7.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9c1ee30b7f035afee71756b7d3f6faf5
diff --git a/metadata/md5-cache/dev-python/stomper-0.2.8 b/metadata/md5-cache/dev-python/stomper-0.2.8
deleted file mode 100644
index 8f3a81d72c50..000000000000
--- a/metadata/md5-cache/dev-python/stomper-0.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
-DESCRIPTION=Transport neutral client implementation of the STOMP protocol
-EAPI=5
-HOMEPAGE=http://pypi.python.org/pypi/stomper
-IUSE=examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/s/stomper/stomper-0.2.8.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3423a4fba57577f12e43548ba0792c80
diff --git a/metadata/md5-cache/dev-python/stomper-0.3.0 b/metadata/md5-cache/dev-python/stomper-0.3.0
index c04e30f61f2a..0c870c929b2d 100644
--- a/metadata/md5-cache/dev-python/stomper-0.3.0
+++ b/metadata/md5-cache/dev-python/stomper-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Transport neutral client implementation of the STOMP protocol
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/stomper
 IUSE=examples python_targets_python2_7 python_targets_pypy
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/s/stomper/stomper-0.3.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3d585484e28dee959307f4e199806a8a
+_md5_=fbed8f507423307f6c217faf5f06c54a
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3 b/metadata/md5-cache/dev-python/tempita-0.5.3
index fb819df8009f..e463f4c4be74 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=A very small text templating language
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/tempita http://pypi.python.org/pypi/Tempita
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/Tempita/Tempita-0.5.3dev.tar.gz -> tempita-0.5.3.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=039c864abfeb3c554e6cb853b32d5377
+_md5_=269bd83170df866c51d1995dfc2d75a1
diff --git a/metadata/md5-cache/dev-python/tlslite-0.4.3 b/metadata/md5-cache/dev-python/tlslite-0.4.3
deleted file mode 100644
index e88dc0444afe..000000000000
--- a/metadata/md5-cache/dev-python/tlslite-0.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=>=dev-libs/cryptlib-3.3.3[python] || ( dev-python/m2crypto dev-python/pycrypto ) gmp? ( dev-python/gmpy ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1
-EAPI=4
-HOMEPAGE=http://trevp.net/tlslite/ http://pypi.python.org/pypi/tlslite
-IUSE=doc gmp
-KEYWORDS=amd64 x86
-LICENSE=BSD public-domain
-RDEPEND=>=dev-libs/cryptlib-3.3.3[python] || ( dev-python/m2crypto dev-python/pycrypto ) gmp? ( dev-python/gmpy ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://github.com/trevp/tlslite/downloads/tlslite-0.4.3.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cf1a1a0286f43ea522248babf82192df
diff --git a/metadata/md5-cache/dev-python/tox-1.8.1 b/metadata/md5-cache/dev-python/tox-1.8.1
index 5333a3f3fd38..468828e5e12f 100644
--- a/metadata/md5-cache/dev-python/tox-1.8.1
+++ b/metadata/md5-cache/dev-python/tox-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=virtualenv-based automation of test activities
 EAPI=5
 HOMEPAGE=http://tox.testrun.org http://pypi.python.org/pypi/tox
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/virtualenv-1.11.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pip[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/py-1.4.17[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/tox/tox-1.8.1.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e8313aeea70d0cdd24006eb43119dc23
+_md5_=cce2e12be6b87f257325ed88d94abd8f
diff --git a/metadata/md5-cache/dev-python/translationstring-1.3 b/metadata/md5-cache/dev-python/translationstring-1.3
index 6168a0eb6542..488d24253beb 100644
--- a/metadata/md5-cache/dev-python/translationstring-1.3
+++ b/metadata/md5-cache/dev-python/translationstring-1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Utility library for i18n relied on by various Repoze packages
 EAPI=5
 HOMEPAGE=https://github.com/Pylons/translationstring http://pypi.python.org/pypi/translationstring
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=repoze
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/t/translationstring/translationstring-1.3.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e05f557f14054c0e2b262cbed8e95fe3
+_md5_=d777b14d2ef3a131cb848b1be025803f
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.9.0 b/metadata/md5-cache/dev-python/xmltodict-0.9.0
deleted file mode 100644
index cb86261c9930..000000000000
--- a/metadata/md5-cache/dev-python/xmltodict-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
-DESCRIPTION=Makes working with XML feel like you are working with JSON
-EAPI=5
-HOMEPAGE=https://github.com/martinblech/xmltodict/ https://pypi.python.org/pypi/xmltodict/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.9.0.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=378db150f73a815d664d67f337cb36a7
diff --git a/metadata/md5-cache/dev-ruby/color-1.4.1-r1 b/metadata/md5-cache/dev-ruby/color-1.4.1-r1
deleted file mode 100644
index dd7aaa8715eb..000000000000
--- a/metadata/md5-cache/dev-ruby/color-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.5.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Colour management with Ruby
-EAPI=2
-HOMEPAGE=http://color.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-SLOT=0
-SRC_URI=mirror://rubygems/color-1.4.1.gem
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f4edd03a254886c383c675ce8625e287
diff --git a/metadata/md5-cache/dev-ruby/color-1.7.1 b/metadata/md5-cache/dev-ruby/color-1.7.1
index 4179f755b862..0f22d7012fc6 100644
--- a/metadata/md5-cache/dev-ruby/color-1.7.1
+++ b/metadata/md5-cache/dev-ruby/color-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Colour management with Ruby
 EAPI=5
 HOMEPAGE=http://color.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.7.1.tar.gz -> color-1.7.1.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=465f2f96e2d6dff416e5cbcb17ff6a58
+_md5_=7f95d44a86c59ab8df364ad4b098184d
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
index fc88fdda80ff..789b4579ade3 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/thread_safe[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/thread_safe[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/thread_safe[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Module that adds descendant tracking to a class
 EAPI=5
 HOMEPAGE=https://github.com/dkubb/descendants_tracker
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/thread_safe[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/thread_safe[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/thread_safe[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/descendants_tracker-0.0.4.gem
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3b2b1e402647cabd8d66551b3a755313
+_md5_=0361a310e537f41ac6da0d23f1d893fc
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1 b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
index e0d09b8deb9e..f1f715ec9b55 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=http://wiki.github.com/ffi/ffi
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://github.com/ffi/ffi/archive/v1.9.6.tar.gz -> ffi-git-1.9.6.tgz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4e4296b6db9b0496ee61b5abcb0297b4
+_md5_=94855a3ed23bc9f1016a0f9f88369520
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
index e25812021aed..2f89004a63ef 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/niceogiri-1.1.2.gem
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=34997a3c6d3bf3c60594f091393764ab
+_md5_=a16f9c3036c5e2be0c47966f426e1d8c
diff --git a/metadata/md5-cache/dev-util/anjuta-3.14.1 b/metadata/md5-cache/dev-util/anjuta-3.14.1
new file mode 100644
index 000000000000..c6d47c002831
--- /dev/null
+++ b/metadata/md5-cache/dev-util/anjuta-3.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.34:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.26 ) ) >=dev-lang/perl-5 >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.1 sys-devel/bison sys-devel/flex >=sys-devel/gettext-0.17 virtual/pkgconfig !!dev-libs/gnome-build test? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) app-text/yelp-tools dev-libs/gobject-introspection-common gnome-base/gnome-common app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A versatile IDE for GNOME
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Anjuta
+IUSE=debug devhelp glade +introspection packagekit subversion terminal test vala python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.34:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.26 ) ) gnome-base/gsettings-desktop-schemas packagekit? ( app-admin/packagekit-base )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gnome/sources/anjuta/3.14/anjuta-3.14.1.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=fb5bb2d994b4c31dde8c77d09833aa55
diff --git a/metadata/md5-cache/dev-util/bam-0.4.0 b/metadata/md5-cache/dev-util/bam-0.4.0
deleted file mode 100644
index 1f2747cc65c2..000000000000
--- a/metadata/md5-cache/dev-util/bam-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-lang/lua doc? ( dev-lang/python ) test? ( dev-lang/python ) =dev-lang/python-2*
-DESCRIPTION=Fast and flexible Lua-based build system
-EAPI=4
-HOMEPAGE=http://matricks.github.com/bam/
-IUSE=doc test
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-RDEPEND=dev-lang/lua =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://github.com/downloads/matricks/bam/bam-0.4.0.tar.bz2
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7eefe7a4dbe9f27809f634ab2dda6c65
diff --git a/metadata/md5-cache/dev-util/bam-0.4.0-r1 b/metadata/md5-cache/dev-util/bam-0.4.0-r1
index d0e2a0547bc2..9c59afff41b9 100644
--- a/metadata/md5-cache/dev-util/bam-0.4.0-r1
+++ b/metadata/md5-cache/dev-util/bam-0.4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Fast and flexible Lua-based build system
 EAPI=5
 HOMEPAGE=http://matricks.github.com/bam/
 IUSE=doc test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZLIB
 RDEPEND=dev-lang/lua:=
 SLOT=0
 SRC_URI=http://github.com/downloads/matricks/bam/bam-0.4.0.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2992c442b2885ad4f798f1e164cc455d
+_md5_=0f70feafbeb28987b9aa270a4a1e5d7e
diff --git a/metadata/md5-cache/dev-util/cdiff-0.9.3 b/metadata/md5-cache/dev-util/cdiff-0.9.3
deleted file mode 100644
index c3ce0e257871..000000000000
--- a/metadata/md5-cache/dev-util/cdiff-0.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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(-)]
-DESCRIPTION=Colored, side-by-side diff terminal viewer
-EAPI=5
-HOMEPAGE=https://github.com/ymattw/cdiff
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/c/cdiff/cdiff-0.9.3.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=432e9ed2b2751803666df73adfde445c
diff --git a/metadata/md5-cache/dev-util/cdiff-0.9.6 b/metadata/md5-cache/dev-util/cdiff-0.9.6
index 32fd94ac8606..2b938bc74fc4 100644
--- a/metadata/md5-cache/dev-util/cdiff-0.9.6
+++ b/metadata/md5-cache/dev-util/cdiff-0.9.6
@@ -4,11 +4,11 @@ DESCRIPTION=Colored, side-by-side diff terminal viewer
 EAPI=5
 HOMEPAGE=https://github.com/ymattw/cdiff
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/c/cdiff/cdiff-0.9.6.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bbff4c174031a5e0f4ff5305fc1c5a22
+_md5_=c9c45a5313c6fc348b5bd184541aa9a1
diff --git a/metadata/md5-cache/dev-util/cmake-fedora-1.3.0 b/metadata/md5-cache/dev-util/cmake-fedora-1.3.0
index d6f53a6140e4..c9d0989ccc4b 100644
--- a/metadata/md5-cache/dev-util/cmake-fedora-1.3.0
+++ b/metadata/md5-cache/dev-util/cmake-fedora-1.3.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/finduti
 DESCRIPTION=cmake modules that provides helper macros and targets for linux, especially fedora developers
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/cmake-fedora/#Getcmake-fedora
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-1.3.0-Source.tar.gz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e33c532ec5edc7d384d91bcba1996871
+_md5_=16f9ec6688386d1b69782cfa01df670c
diff --git a/metadata/md5-cache/dev-util/comparator-2.10 b/metadata/md5-cache/dev-util/comparator-2.10
index 2782924794ef..0359170a8fea 100644
--- a/metadata/md5-cache/dev-util/comparator-2.10
+++ b/metadata/md5-cache/dev-util/comparator-2.10
@@ -4,11 +4,11 @@ DESCRIPTION=ESR's utility for making fast comparisons among large source trees
 EAPI=5
 HOMEPAGE=http://www.catb.org/~esr/comparator/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=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=http://www.catb.org/~esr/comparator/comparator-2.10.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7c176918c414156bb852078d61fd7384
+_md5_=f6aafcee2bb4dcf8d1682e025115defa
diff --git a/metadata/md5-cache/dev-util/diffuse-0.4.8 b/metadata/md5-cache/dev-util/diffuse-0.4.8
index c23d35e8822c..f9693e33ffbb 100644
--- a/metadata/md5-cache/dev-util/diffuse-0.4.8
+++ b/metadata/md5-cache/dev-util/diffuse-0.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical tool to compare and merge text files
 EAPI=5
 HOMEPAGE=http://diffuse.sourceforge.net/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~x64-solaris
+KEYWORDS=amd64 x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/diffuse/diffuse-0.4.8.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=82ec3b91c25a9c7a1d1cf5aa21e8bde6
+_md5_=3e4b746b09bc003c047de9051b5eb4a6
diff --git a/metadata/md5-cache/dev-util/gnome-devel-docs-3.14.4 b/metadata/md5-cache/dev-util/gnome-devel-docs-3.14.4
new file mode 100644
index 000000000000..ad842b1ff289
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-devel-docs-3.14.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 dev-libs/libxslt sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Documentation for developing for the GNOME desktop environment
+EAPI=5
+HOMEPAGE=http://developer.gnome.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-devel-docs/3.14/gnome-devel-docs-3.14.4.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=06a0b68a009a5778856ce66b8cc47864
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r1 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r1
deleted file mode 100644
index 7ff2a755f863..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/bison sys-devel/flex >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=A LL(1) parser generator used mainly by KDevelop language plugins
-EAPI=5
-HOMEPAGE=http://www.kdevelop.org
-IUSE=debug aqua
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=0
-SRC_URI=mirror://kde/stable/kdevelop-pg-qt/1.0.0/src/kdevelop-pg-qt-1.0.0.tar.bz2
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=45950555f710bec3773f5d30d5fc6bdc
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2
index 1cc0cf6947ad..f1b5f37af676 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-1.0.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A LL(1) parser generator used mainly by KDevelop language plugins
 EAPI=5
 HOMEPAGE=http://www.kdevelop.org
 IUSE=debug aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=0
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/1.0.0/src/kdevelop-pg-qt-1.0.0.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d60c4cdcd423e4319acacd00da3f8df4
+_md5_=d9b381706bbce8f7fb9c1bce0692ac71
diff --git a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1 b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
index 5caa4914aa10..d0f18a8b391e 100644
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A transparent low-overhead system-wide profiler
 EAPI=5
 HOMEPAGE=http://oprofile.sourceforge.net
 IUSE=java pch qt4 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3 >=sys-libs/glibc-2.3.2-r1 qt4? ( dev-qt/qtgui:4[qt3support] ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=302059762b4b86c69056d0263dd5cca3
+_md5_=71ff576f2bb86eb582a218d4e83babb3
diff --git a/metadata/md5-cache/dev-util/rbtools-0.6.2 b/metadata/md5-cache/dev-util/rbtools-0.6.2
deleted file mode 100644
index 2fc0bfd58bde..000000000000
--- a/metadata/md5-cache/dev-util/rbtools-0.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Command line tools for use with Review Board
-EAPI=5
-HOMEPAGE=http://www.reviewboard.org/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=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=http://downloads.reviewboard.org/releases/RBTools/0.6/RBTools-0.6.2.tar.gz
-_eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=92779328dd54a78bdb1566084754f8c0
diff --git a/metadata/md5-cache/dev-util/rbtools-0.6.3 b/metadata/md5-cache/dev-util/rbtools-0.6.3
index 106546796fe0..e56920f4ebf6 100644
--- a/metadata/md5-cache/dev-util/rbtools-0.6.3
+++ b/metadata/md5-cache/dev-util/rbtools-0.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Command line tools for use with Review Board
 EAPI=5
 HOMEPAGE=http://www.reviewboard.org/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://downloads.reviewboard.org/releases/RBTools/0.6/RBTools-0.6.3.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8c21f77bbdf7498b1ad7086431f5b055
+_md5_=810ebc85ca6bd7791d7f8bb733ebc89c
diff --git a/metadata/md5-cache/dev-util/re2c-0.13.7.5 b/metadata/md5-cache/dev-util/re2c-0.13.7.5
index fd97ce967e2d..22b4a2dfd801 100644
--- a/metadata/md5-cache/dev-util/re2c-0.13.7.5
+++ b/metadata/md5-cache/dev-util/re2c-0.13.7.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=5
 HOMEPAGE=http://re2c.sourceforge.net/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/re2c/re2c-0.13.7.5.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=53acd34d366e6d53e28aa02b81fa7fcc
+_md5_=f7962f5ddd78dbfc781b6a6553063441
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.7.0 b/metadata/md5-cache/dev-vcs/hg-git-0.7.0
index 382a137f5733..dd156fe84b09 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.7.0
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=push to and pull from a Git repository using Mercurial
 EAPI=5
 HOMEPAGE=http://hg-git.github.io https://pypi.python.org/pypi/hg-git
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/mercurial-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.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/h/hg-git/hg-git-0.7.0.tar.gz
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=01df5f04da8ec24a772e667f0ca8ab8b
+_md5_=71f15b20573b7ea88b152f56f52c0258
diff --git a/metadata/md5-cache/dev-vcs/mr-1.20141024 b/metadata/md5-cache/dev-vcs/mr-1.20141024
index 3c34eea8a3b4..538ac071481b 100644
--- a/metadata/md5-cache/dev-vcs/mr-1.20141024
+++ b/metadata/md5-cache/dev-vcs/mr-1.20141024
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Multiple Repository management tool
 EAPI=5
 HOMEPAGE=https://github.com/joeyh/myrepos
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/libwww-perl dev-perl/HTML-Parser
 SLOT=0
 SRC_URI=https://github.com/joeyh/myrepos/archive/1.20141024.tar.gz -> mr-1.20141024.tar.gz
-_md5_=8c33217c26776c81825f80c8633b4ada
+_md5_=16799469684920f59ff82d4b4a26a11a
diff --git a/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r1 b/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r1
index 73166b7de9fe..ac1dd01b2723 100644
--- a/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r1
+++ b/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng:0= virtual/opengl v
 DESCRIPTION=Arcade game with elements of economy and adventure
 EAPI=5
 HOMEPAGE=http://gamediameter.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng:0= virtual/opengl virtual/glu media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[mod] || ( >=dev-lang/python-2.7.5-r2:2.7 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/gamediameter/diameter-0.4.0.3.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=23ea09a96bf7bcf67274f58aceb36d9c
+_md5_=6fa4e5e185ea176232e970fdee173969
diff --git a/metadata/md5-cache/games-arcade/digger-20140423 b/metadata/md5-cache/games-arcade/digger-20140423
index 6104fd22c7eb..febbc2a80e62 100644
--- a/metadata/md5-cache/games-arcade/digger-20140423
+++ b/metadata/md5-cache/games-arcade/digger-20140423
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[X,video] x11-libs/libX11
 DESCRIPTION=Digger Remastered
 EAPI=5
 HOMEPAGE=http://www.digger.org/
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,video] x11-libs/libX11 games-misc/games-envd
 SLOT=0
 SRC_URI=https://gitorious.org/digger/digger/archive/8d5769c59d68b37a5b30aa7a9cbfa5a9e15e7ed3.tar.gz -> digger-20140423.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=824498c86571b15c72d286fe2fe25d14
+_md5_=c85b3ededd72b9ef7aae444ee1760521
diff --git a/metadata/md5-cache/games-arcade/watermelons-1.1.1-r1 b/metadata/md5-cache/games-arcade/watermelons-1.1.1-r1
index bca4acfa4c94..a59973cad9c0 100644
--- a/metadata/md5-cache/games-arcade/watermelons-1.1.1-r1
+++ b/metadata/md5-cache/games-arcade/watermelons-1.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A thrilling watermelon bouncing game
 EAPI=5
 HOMEPAGE=http://www.imitationpickles.org/melons/index.html
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/melons-1.1.1.tgz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=160201855a16b37a316df452aa6e4c81
+_md5_=d2123dd011b2ff67e276a7ab31d761fe
diff --git a/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r1 b/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r1
index 5008c2987d24..558e8bbd0d7a 100644
--- a/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r1
+++ b/metadata/md5-cache/games-arcade/whichwayisup-0.7.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A traditional and challenging 2D platformer game with a slight rotat
 EAPI=5
 HOMEPAGE=http://hectigo.net/puskutraktori/whichwayisup/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2 CC-BY-3.0
 RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://hectigo.net/puskutraktori/whichwayisup/whichwayisup_b079.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=8312fbbffb3772dc9fa7118939e47b8e
+_md5_=6450dbb7eac397d0ef2835bb039ba864
diff --git a/metadata/md5-cache/games-board/xboard-4.8.0 b/metadata/md5-cache/games-board/xboard-4.8.0
index 1f5f5c984bee..b4619842afa2 100644
--- a/metadata/md5-cache/games-board/xboard-4.8.0
+++ b/metadata/md5-cache/games-board/xboard-4.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=GUI for gnuchess and for internet chess servers
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/xboard/
 IUSE=Xaw3d +default-font gtk nls zippy
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x11-libs/libXpm default-font? ( media-fonts/font-adobe-100dpi[nls?] media-fonts/font-misc-misc[nls?] ) !gtk? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) gtk? ( x11-libs/gtk+:2 ) games-misc/games-envd
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/xboard/xboard-4.8.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=832e41c28d81f4a8ee1bfab00d370512
+_md5_=51c69b7a51c2e6597d223fc5c66db898
diff --git a/metadata/md5-cache/games-emulation/stella-4.0 b/metadata/md5-cache/games-emulation/stella-4.0
index 962ccb931e7d..fd2ebc57934f 100644
--- a/metadata/md5-cache/games-emulation/stella-4.0
+++ b/metadata/md5-cache/games-emulation/stella-4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Stella Atari 2600 VCS Emulator
 EAPI=5
 HOMEPAGE=http://stella.sourceforge.net/
 IUSE=joystick
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0 sys-libs/zlib games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/stella/stella-4.0-src.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=95f77c0d99812f03a8ad2b80fca96626
+_md5_=e391199d6c318db4e2b71ae936b0ae48
diff --git a/metadata/md5-cache/games-fps/doomsday-1.14.5 b/metadata/md5-cache/games-fps/doomsday-1.14.5
index 0a56e7ad268e..f549528f1df2 100644
--- a/metadata/md5-cache/games-fps/doomsday-1.14.5
+++ b/metadata/md5-cache/games-fps/doomsday-1.14.5
@@ -4,7 +4,7 @@ DESCRIPTION=A modern gaming engine for Doom, Heretic, and Hexen
 EAPI=5
 HOMEPAGE=http://www.dengine.net/
 IUSE=dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=!dedicated? ( demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom ) resources? ( games-fps/doomsday-resources ) )
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtopengl:4 dev-qt/qtgui:4 net-misc/curl sys-libs/zlib !dedicated? ( media-libs/libsdl[joystick,sound] media-libs/sdl-mixer media-libs/libpng:0 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses ) !dedicated? ( snowberry? ( 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(-)] dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) games-misc/games-envd
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) demo? ( doom ) freedoom? ( doom ) r
 SLOT=0
 SRC_URI=mirror://sourceforge/deng/Doomsday%20Engine/1.14.5/doomsday-1.14.5.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=5bd817a90cd63abcbdcd0b3db18eb8e2
+_md5_=12efebbe59efa4d17f81f0ed693e3cb8
diff --git a/metadata/md5-cache/games-misc/openmsx-0.3.1-r1 b/metadata/md5-cache/games-misc/openmsx-0.3.1-r1
index 00a95f41410d..9ee8ec115b63 100644
--- a/metadata/md5-cache/games-misc/openmsx-0.3.1-r1
+++ b/metadata/md5-cache/games-misc/openmsx-0.3.1-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 )
 DESCRIPTION=An ambiguously named music replacement set for OpenTTD
 EAPI=5
 HOMEPAGE=http://bundles.openttdcoop.org/openmsx/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://bundles.openttdcoop.org/openmsx/releases/0.3.1/openmsx-0.3.1-source.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0488f832a9bd3daab24ba42a13e8ca1a
+_md5_=7520df809388c48448fd52cd24ebc104
diff --git a/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r1 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r1
index 4e6a98c3f317..752969e9c73b 100644
--- a/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r1
+++ b/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Figh
 EAPI=5
 HOMEPAGE=http://www.sacredchao.net/~piman/angrydd/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=568d9ac31f9ece3ad5f719621f50ae7b
+_md5_=39a9f1a180995180ebf8e5ea950327ba
diff --git a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6 b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6
index a79d6ab165f5..31110a8f8618 100644
--- a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6
+++ b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6
@@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
 DESCRIPTION=Trap and capture penguins on Antarctica
 EAPI=5
 HOMEPAGE=http://www.mattdm.org/icebreaker/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.mattdm.org/icebreaker/1.9.x/icebreaker-1.9.6.tgz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9662536b3e39e1a6d1d68e9300275656
+_md5_=7c01c5d523b7140267959d962df96bfc
diff --git a/metadata/md5-cache/games-puzzle/jools-0.20-r2 b/metadata/md5-cache/games-puzzle/jools-0.20-r2
index c1c6657412f6..11bae9e5dd30 100644
--- a/metadata/md5-cache/games-puzzle/jools-0.20-r2
+++ b/metadata/md5-cache/games-puzzle/jools-0.20-r2
@@ -4,11 +4,11 @@ DESCRIPTION=clone of Bejeweled, a popular pattern-matching game
 EAPI=5
 HOMEPAGE=http://pessimization.com/software/jools/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://pessimization.com/software/jools/jools-0.20.tar.gz http://pessimization.com/software/jools/jools-musicpack-1.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b8b3574d37c5e7ce0f573a9c27c2cf4d
+_md5_=1a76ed388ec439ca15eaec1f345c6713
diff --git a/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1 b/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1
index 1d95cc9f6781..405b0d0c3eeb 100644
--- a/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1
+++ b/metadata/md5-cache/games-rpg/dragonhunt-3.56-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple graphical RPG
 EAPI=5
 HOMEPAGE=http://emhsoft.com/dh.html
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 CC-SA-1.0
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://emhsoft.com/dh/Dragon_Hunt-3.56.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=290b4b7625b4246ddf04b190dd5282ce
+_md5_=41dfb3428e39cb87c18d976eea0d51cd
diff --git a/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1 b/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1
index e9f3a0c30ca9..3d5bc12752b3 100644
--- a/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1
+++ b/metadata/md5-cache/games-rpg/freedroidrpg-0.15.1
@@ -4,10 +4,10 @@ DESCRIPTION=A modification of the classical Freedroid engine into an RPG
 EAPI=5
 HOMEPAGE=http://freedroid.sourceforge.net/
 IUSE=opengl vorbis
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/libpng:0 media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis?] >=media-libs/sdl-gfx-2.0.21 vorbis? ( media-libs/libogg media-libs/libvorbis ) x11-libs/libX11 opengl? ( virtual/opengl ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freedroid/freedroidRPG-0.15.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=67ad85e2fa1510e7e264797b6a85047b
+_md5_=9b7036c0428922abf7064b5f6a27b7d2
diff --git a/metadata/md5-cache/games-rpg/wastesedge-0.3.5 b/metadata/md5-cache/games-rpg/wastesedge-0.3.5
index 6f116bf54044..3dd1ac51e877 100644
--- a/metadata/md5-cache/games-rpg/wastesedge-0.3.5
+++ b/metadata/md5-cache/games-rpg/wastesedge-0.3.5
@@ -4,11 +4,11 @@ DESCRIPTION=role playing game to showcase the adonthell engine
 EAPI=5
 HOMEPAGE=http://adonthell.linuxgames.com/
 IUSE=nls python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=games-rpg/adonthell-0.3.5-r1[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] nls? ( virtual/libintl ) games-misc/games-envd
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=http://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.5.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=33f377725bfac110eb73ca5909961d5e
+_md5_=b28688e8ec5d66b7d3083efd531faf7b
diff --git a/metadata/md5-cache/games-server/cyphesis-0.6.2 b/metadata/md5-cache/games-server/cyphesis-0.6.2
index 3b39ce44ff34..88dee67e3da8 100644
--- a/metadata/md5-cache/games-server/cyphesis-0.6.2
+++ b/metadata/md5-cache/games-server/cyphesis-0.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=WorldForge server running small games
 EAPI=5
 HOMEPAGE=http://worldforge.org/index.php/components/cyphesis/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/skstream-0.3.9 >=dev-games/wfmath-1.0.1 >=dev-games/mercator-0.3.3 dev-libs/libgcrypt:0 dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline >=media-libs/atlas-c++-0.6.3 >=media-libs/varconf-0.6.4 dev-db/postgresql games-misc/games-envd
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/worldforge/cyphesis-0.6.2.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=21400cd0f8c9904bc1a3f491c782aa38
+_md5_=f7549817472f6001464c1c7583d72ccf
diff --git a/metadata/md5-cache/games-server/monopd-0.9.7 b/metadata/md5-cache/games-server/monopd-0.9.7
index a68ba708eff7..af5085b3826c 100644
--- a/metadata/md5-cache/games-server/monopd-0.9.7
+++ b/metadata/md5-cache/games-server/monopd-0.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=server for atlantik games
 EAPI=5
 HOMEPAGE=http://gtkatlantic.gradator.net/
 IUSE=systemd
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=systemd? ( sys-apps/systemd ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/gtkatlantic/monopd/monopd-0.9.7.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c5ecde4270822417354635b0efc2d500
+_md5_=5040b93e9753165bf86537efa9188823
diff --git a/metadata/md5-cache/games-simulation/qct-0.7-r1 b/metadata/md5-cache/games-simulation/qct-0.7-r1
index f5ae7b35f32c..73ddc82163b4 100644
--- a/metadata/md5-cache/games-simulation/qct-0.7-r1
+++ b/metadata/md5-cache/games-simulation/qct-0.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Quiet Console Town puts you in the place of the mayor of a budding n
 EAPI=5
 HOMEPAGE=http://packages.gentoo.org/package/games-simulation/qct
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.sourcefiles.org/Games/Role_Play/qct-0.7.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=31aae41701f41631a42c68869ec3b8f6
+_md5_=91a2fa2e3a23a354d9a4070b464da3a3
diff --git a/metadata/md5-cache/games-sports/ski-6.8 b/metadata/md5-cache/games-sports/ski-6.8
index bce30fd7750f..0ea19e65ba29 100644
--- a/metadata/md5-cache/games-sports/ski-6.8
+++ b/metadata/md5-cache/games-sports/ski-6.8
@@ -3,10 +3,10 @@ DESCRIPTION=A simple text-mode skiing game
 EAPI=5
 HOMEPAGE=http://www.catb.org/~esr/ski/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/ski/ski-6.8.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a1b1f092830a63172e58aa833a15af14
+_md5_=4c39892dbf7ebc369ef6a711a74d6ffc
diff --git a/metadata/md5-cache/games-strategy/lightyears-1.4-r1 b/metadata/md5-cache/games-strategy/lightyears-1.4-r1
index 75e6f98dc696..e8f5b2fdec32 100644
--- a/metadata/md5-cache/games-strategy/lightyears-1.4-r1
+++ b/metadata/md5-cache/games-strategy/lightyears-1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=a single-player game with a science-fiction theme
 EAPI=5
 HOMEPAGE=http://www.jwhitham.org.uk/20kly/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] games-misc/games-envd
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.jwhitham.org.uk/20kly/lightyears-1.4.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c5d5ba701aae19862a84e840cfb57836
+_md5_=f39ddd72e4ad22ee60457197205d6773
diff --git a/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r2 b/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r2
deleted file mode 100644
index beebb5a55b27..000000000000
--- a/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gconf-2.24:2 >=gnome-base/gnome-settings-daemon-2.28 >=x11-libs/libXi-1.2 >=x11-libs/libX11-1.2.0 !<=x11-base/xorg-server-1.6.0 !gnome-extra/gsynaptics virtual/pkgconfig >=dev-util/intltool-0.35.5 >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A GTK+ based configuration utility for the synaptics driver
-EAPI=2
-HOMEPAGE=http://live.gnome.org/GPointingDeviceSettings
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gconf-2.24:2 >=gnome-base/gnome-settings-daemon-2.28 >=x11-libs/libXi-1.2 >=x11-libs/libX11-1.2.0 !<=x11-base/xorg-server-1.6.0 !gnome-extra/gsynaptics
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/gsynaptics/45812/gpointing-device-settings-1.5.1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cb95a6c80f1c5bceac30a59469ec7ae2
diff --git a/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r3 b/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r3
index c5858cea472a..df037e2ea0e7 100644
--- a/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r3
+++ b/metadata/md5-cache/gnome-extra/gpointing-device-settings-1.5.1-r3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gconf-2.24:2
 DESCRIPTION=A GTK+ based configuration utility for the synaptics driver
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Attic/GPointingDeviceSettings
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gconf-2.24:2 >=gnome-base/gnome-settings-daemon-2.28 >=x11-libs/libXi-1.2 >=x11-libs/libX11-1.2.0 !<=x11-base/xorg-server-1.6.0 !gnome-extra/gsynaptics
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/gsynaptics/45812/gpointing-device-settings-1.5.1.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9ee4e97a129e7d2b7a15dd26643d7db5
+_md5_=f1bbb43f680202bba410bf315c19f732
diff --git a/metadata/md5-cache/kde-misc/customizable-weather-1.11.1 b/metadata/md5-cache/kde-misc/customizable-weather-1.11.1
deleted file mode 100644
index 84614e8e031e..000000000000
--- a/metadata/md5-cache/kde-misc/customizable-weather-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=KDE4 weather plasmoid. It aims to be highly customizable, but is a little harder to setup
-EAPI=5
-HOMEPAGE=http://www.kde-look.org/content/show.php/Customizable+Weather+Plasmoid?content=98925
-IUSE=debug linguas_br linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@Latn linguas_tr linguas_zh_CN aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_br? ( || ( kde-apps/kde-l10n[linguas_br(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@Latn? ( || ( kde-apps/kde-l10n[linguas_sr@Latn(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=http://www.kde-look.org/CONTENT/content-files/98925-cwp-1.11.1.tar.bz2
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f3b213b65c5a2dd589c1e937d9eec9b0
diff --git a/metadata/md5-cache/kde-misc/customizable-weather-1.12.0 b/metadata/md5-cache/kde-misc/customizable-weather-1.12.0
index 3c2929249972..2839c4235b15 100644
--- a/metadata/md5-cache/kde-misc/customizable-weather-1.12.0
+++ b/metadata/md5-cache/kde-misc/customizable-weather-1.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=KDE4 weather plasmoid. It aims to be highly customizable, but is a l
 EAPI=5
 HOMEPAGE=http://www.kde-look.org/content/show.php/Customizable+Weather+Plasmoid?content=98925
 IUSE=debug linguas_br linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_it linguas_nb linguas_nl linguas_pl linguas_ro linguas_ru linguas_sr linguas_sr@Latn linguas_tr linguas_zh_CN aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_br? ( || ( kde-apps/kde-l10n[linguas_br(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_br(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@Latn? ( || ( kde-apps/kde-l10n[linguas_sr@Latn(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=http://www.kde-look.org/CONTENT/content-files/98925-cwp-1.12.0.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=60e72ef399a3bde1a0367edd0737367a
+_md5_=019f27808761450da82fd2831ece341d
diff --git a/metadata/md5-cache/kde-misc/kanyremote-6.3.2 b/metadata/md5-cache/kde-misc/kanyremote-6.3.2
deleted file mode 100644
index 7977d2a00987..000000000000
--- a/metadata/md5-cache/kde-misc/kanyremote-6.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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(-)] >=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] kde-base/pykde4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=KDE frontend to Anyremote
-EAPI=5
-HOMEPAGE=http://anyremote.sourceforge.net/
-IUSE=bluetooth python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=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(-)] >=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] kde-base/pykde4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=4
-SRC_URI=mirror://sourceforge/anyremote/kanyremote-6.3.2.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7b2c98ee0f1118117a4b9fd2a00c2b40
diff --git a/metadata/md5-cache/kde-misc/kanyremote-6.3.3 b/metadata/md5-cache/kde-misc/kanyremote-6.3.3
deleted file mode 100644
index 5ac6ea216f7c..000000000000
--- a/metadata/md5-cache/kde-misc/kanyremote-6.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=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(-)] >=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] kde-base/pykde4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=KDE frontend to Anyremote
-EAPI=5
-HOMEPAGE=http://anyremote.sourceforge.net/
-IUSE=bluetooth python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=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(-)] >=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] kde-base/pykde4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=4
-SRC_URI=mirror://sourceforge/anyremote/kanyremote-6.3.3.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=56c0b97f56cd49ce6adc90e66f985eb0
diff --git a/metadata/md5-cache/kde-misc/kanyremote-6.3.4 b/metadata/md5-cache/kde-misc/kanyremote-6.3.4
index 9f58afee8837..7b272c778892 100644
--- a/metadata/md5-cache/kde-misc/kanyremote-6.3.4
+++ b/metadata/md5-cache/kde-misc/kanyremote-6.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=KDE frontend to Anyremote
 EAPI=5
 HOMEPAGE=http://anyremote.sourceforge.net/
 IUSE=bluetooth python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-mobilephone/anyremote-6.0[bluetooth?] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] kde-base/pykde4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=4
 SRC_URI=mirror://sourceforge/anyremote/kanyremote-6.3.4.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5c50b32558beb0853f13311921202234
+_md5_=9cf91eb712e4b0e03f91d2e226aab8b3
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.2-r1 b/metadata/md5-cache/media-gfx/geeqie-1.2-r1
index 835f20678352..0097f9a3c703 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.2-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=5
 HOMEPAGE=http://geeqie.sourceforge.net/
 IUSE=doc exif jpeg lcms lirc lua tiff xmp
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 virtual/libintl doc? ( app-text/gnome-doc-utils ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) tiff? ( media-libs/tiff:0 )
 SLOT=0
 SRC_URI=https://gitorious.org/geeqie/geeqie/archive/v1.2.tar.gz -> geeqie-1.2.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3b933eed94cd960f3396c3a71852dccb
+_md5_=51f5594d75b3bb9207e1e994fa8dd66a
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.3 b/metadata/md5-cache/media-gfx/gphoto2-2.5.3
deleted file mode 100644
index 7ff7298a30b7..000000000000
--- a/metadata/md5-cache/media-gfx/gphoto2-2.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.2[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk ) readline? ( sys-libs/readline ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.14.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Free, redistributable digital camera software application
-EAPI=5
-HOMEPAGE=http://www.gphoto.org/
-IUSE=aalib exif ncurses nls readline
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.2[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk ) readline? ( sys-libs/readline )
-SLOT=0
-SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.3.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1cbc01697b31186c87ba26937e7a57cb
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.4 b/metadata/md5-cache/media-gfx/gphoto2-2.5.6
similarity index 75%
rename from metadata/md5-cache/media-gfx/gphoto2-2.5.4
rename to metadata/md5-cache/media-gfx/gphoto2-2.5.6
index 66b96d0a0ff9..d88cb72349e1 100644
--- a/metadata/md5-cache/media-gfx/gphoto2-2.5.4
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.4[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk ) readline? ( sys-libs/readline ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.14.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.6[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk ) readline? ( sys-libs/readline ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.14.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Free, redistributable digital camera software application
 EAPI=5
 HOMEPAGE=http://www.gphoto.org/
 IUSE=aalib exif ncurses nls readline
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.4[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk ) readline? ( sys-libs/readline )
+RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.6[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk ) readline? ( sys-libs/readline )
 SLOT=0
-SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.4.tar.bz2
+SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.6.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=367ee1cbeaf346c7c97f918f05005c55
+_md5_=44d7f57ea94233ac05e8cff644ce3c4a
diff --git a/metadata/md5-cache/media-gfx/imageworsener-1.2.0 b/metadata/md5-cache/media-gfx/imageworsener-1.2.0
index 8645c9538f25..fea16cea8274 100644
--- a/metadata/md5-cache/media-gfx/imageworsener-1.2.0
+++ b/metadata/md5-cache/media-gfx/imageworsener-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Utility for image scaling and processing
 EAPI=5
 HOMEPAGE=http://entropymine.com/imageworsener/
 IUSE=jpeg png static-libs test webp zlib
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT-with-advertising
 RDEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=test? ( jpeg png webp zlib )
 SLOT=0
 SRC_URI=http://entropymine.com/imageworsener/imageworsener-1.2.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9339782191cf35ed225d000e903a0258
+_md5_=f0d9e1d0dcbb08990db222ab5805e778
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.91_pre3-r1 b/metadata/md5-cache/media-gfx/inkscape-0.91_pre4
similarity index 97%
rename from metadata/md5-cache/media-gfx/inkscape-0.91_pre3-r1
rename to metadata/md5-cache/media-gfx/inkscape-0.91_pre4
index 64fdadf93722..d7a94e05e469 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.91_pre3-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-0.91_pre4
@@ -10,6 +10,6 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] dev-lang/python-exec:=[python_target
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://sourceforge/inkscape/inkscape-0.91pre3.tar.bz2
+SRC_URI=mirror://sourceforge/inkscape/inkscape-0.91pre4.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a7193cd076899e1e37986dc2848a49c1
+_md5_=ffffeba3a08124720930c14a8d96533b
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.12.1-r1 b/metadata/md5-cache/media-gfx/simple-scan-3.14.2
similarity index 88%
rename from metadata/md5-cache/media-gfx/simple-scan-3.12.1-r1
rename to metadata/md5-cache/media-gfx/simple-scan-3.14.2
index 89e69aa4d93a..e18508dba273 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.12.1-r1
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.14.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib
 DESCRIPTION=Simple document scanning utility
 EAPI=5
 HOMEPAGE=https://launchpad.net/simple-scan
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= virtual/libgudev:= x11-libs/cairo:= >=x11-libs/gtk+-3:3 || ( >=x11-misc/colord-0.1.24:=[udev] x11-misc/colord:=[scanner] ) x11-misc/xdg-utils x11-themes/gnome-icon-theme
 SLOT=0
-SRC_URI=http://launchpad.net/simple-scan/3.12/3.12.1/+download/simple-scan-3.12.1.tar.xz
+SRC_URI=http://launchpad.net/simple-scan/3.14/3.14.2/+download/simple-scan-3.14.2.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=425a19b24f2be8cea7e913190e78c7ce
+_md5_=d927b8934121dbf211ab92680ab4dbc1
diff --git a/metadata/md5-cache/media-libs/allegro-5.0.8-r1 b/metadata/md5-cache/media-libs/allegro-5.0.8-r1
index f28015305142..17f7acc031de 100644
--- a/metadata/md5-cache/media-libs/allegro-5.0.8-r1
+++ b/metadata/md5-cache/media-libs/allegro-5.0.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A game programming library
 EAPI=5
 HOMEPAGE=http://alleg.sourceforge.net/
 IUSE=alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=BSD ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) physfs? ( >=dev-games/physfs-2.0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.5.18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gtk? ( >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=5
 SRC_URI=mirror://sourceforge/alleg/allegro-5.0.8.tar.gz
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9ff64ba04bae59365c901f273966b5eb
+_md5_=4b67462daae149bedb237a10d2b9b746
diff --git a/metadata/md5-cache/media-libs/clutter-gst-2.0.10 b/metadata/md5-cache/media-libs/clutter-gst-2.0.14
similarity index 56%
rename from metadata/md5-cache/media-libs/clutter-gst-2.0.10
rename to metadata/md5-cache/media-libs/clutter-gst-2.0.14
index 0cd72142cc22..8849438953f3 100644
--- a/metadata/md5-cache/media-libs/clutter-gst-2.0.10
+++ b/metadata/md5-cache/media-libs/clutter-gst-2.0.14
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.6.0:1.0=[introspection?] >=media-libs/cogl-1.10:1.0=[introspection?] >=media-libs/gstreamer-1.2.0:1.0[introspection?] >=media-libs/gst-plugins-bad-1.2.0:1.0 >=media-libs/gst-plugins-base-1.2.0:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig app-arch/xz-utils
+DEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.6.0:1.0=[introspection?] >=media-libs/cogl-1.10:1.0=[introspection?] >=media-libs/gstreamer-1.2.0:1.0[introspection?] >=media-libs/gst-plugins-bad-1.2.0:1.0 >=media-libs/gst-plugins-base-1.2.0:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GStreamer integration library for Clutter
 EAPI=5
 HOMEPAGE=http://www.clutter-project.org/
 IUSE=examples +introspection debug
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.6.0:1.0=[introspection?] >=media-libs/cogl-1.10:1.0=[introspection?] >=media-libs/gstreamer-1.2.0:1.0[introspection?] >=media-libs/gst-plugins-bad-1.2.0:1.0 >=media-libs/gst-plugins-base-1.2.0:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) media-libs/gst-plugins-good:1.0
+RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.6.0:1.0=[introspection?] >=media-libs/cogl-1.10:1.0=[introspection?] >=media-libs/gstreamer-1.2.0:1.0[introspection?] >=media-libs/gst-plugins-bad-1.2.0:1.0 >=media-libs/gst-plugins-base-1.2.0:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) >=media-libs/gst-plugins-good-1.2.0:1.0
 SLOT=2.0
-SRC_URI=mirror://gnome/sources/clutter-gst/2.0/clutter-gst-2.0.10.tar.xz
-_eclasses_=clutter	9f94a7b65d03649427777e9cd447f950	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d06dbff66ccbaace66689b4a6854b701
+SRC_URI=mirror://gnome/sources/clutter-gst/2.0/clutter-gst-2.0.14.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f14ddd4b2bfc66121a7b6b0e407a5e4a
diff --git a/metadata/md5-cache/media-libs/gavl-1.4.0-r1 b/metadata/md5-cache/media-libs/gavl-1.4.0-r1
index 5b0f37d46c34..aa04fb6f5560 100644
--- a/metadata/md5-cache/media-libs/gavl-1.4.0-r1
+++ b/metadata/md5-cache/media-libs/gavl-1.4.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=library for handling uncompressed audio and video data
 EAPI=5
 HOMEPAGE=http://gmerlin.sourceforge.net
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 hppa ppc ~ppc64 ~x86
+KEYWORDS=amd64 hppa ppc ~ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmerlin/gavl-1.4.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=47233f84104a693619781c078267ab49
+_md5_=24762ccd51aa27102e1197e7ba09a518
diff --git a/metadata/md5-cache/media-libs/herqq-1.0.0-r1 b/metadata/md5-cache/media-libs/herqq-1.0.0-r1
deleted file mode 100644
index ac9816e27367..000000000000
--- a/metadata/md5-cache/media-libs/herqq-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtxmlpatterns:4 !media-libs/hupnp-ng
-DESCRIPTION=A software library for building UPnP devices
-EAPI=4
-HOMEPAGE=http://www.herqq.org
-IUSE=doc
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtxmlpatterns:4 !media-libs/hupnp-ng
-SLOT=0
-SRC_URI=mirror://sourceforge/hupnp/herqq-1.0.0.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8fef91f6bd9a9bac4093b84bd0e7de19
diff --git a/metadata/md5-cache/media-libs/herqq-1.0.0-r2 b/metadata/md5-cache/media-libs/herqq-1.0.0-r2
index ddf5ed802f25..225f02e0ecab 100644
--- a/metadata/md5-cache/media-libs/herqq-1.0.0-r2
+++ b/metadata/md5-cache/media-libs/herqq-1.0.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A software library for building UPnP devices
 EAPI=5
 HOMEPAGE=http://www.herqq.org
 IUSE=doc
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4 !media-libs/hupnp-ng
 SLOT=0
 SRC_URI=mirror://sourceforge/hupnp/herqq-1.0.0.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3042a7b90c5fef7af605928ed7deea2f
+_md5_=9b4618c4c6c12a79fdfcb84829baa7fc
diff --git a/metadata/md5-cache/media-libs/libaacs-0.7.1 b/metadata/md5-cache/media-libs/libaacs-0.7.1
index 93d86caa9258..e1edd4901166 100644
--- a/metadata/md5-cache/media-libs/libaacs-0.7.1
+++ b/metadata/md5-cache/media-libs/libaacs-0.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Open implementation of the Advanced Access Content System (AACS) spe
 EAPI=5
 HOMEPAGE=http://www.videolan.org/developers/libaacs.html
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libaacs/0.7.1/libaacs-0.7.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=30252f521263e2c23dc2a32b9858f3b2
+_md5_=3388d872a583e370c0895e2c510d50cd
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.3.1 b/metadata/md5-cache/media-libs/libgphoto2-2.5.3.1
deleted file mode 100644
index 9be3e035ac84..000000000000
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=dev-libs/libxml2:2 sys-devel/libtool virtual/libusb:1 cameras_ax203? ( media-libs/gd:= ) cameras_st2205? ( media-libs/gd:= ) exif? ( >=media-libs/libexif-0.5.9:= ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg:0 ) serial? ( dev-libs/lockdev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) sys-devel/flex >=sys-devel/gettext-0.14.1 virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Library that implements support for numerous digital cameras
-EAPI=5
-HOMEPAGE=http://www.gphoto.org/
-IUSE=doc examples exif gd jpeg nls serial zeroconf cameras_adc65 cameras_agfa_cl20 cameras_aox cameras_ax203 cameras_barbie cameras_canon cameras_casio_qv cameras_clicksmart310 cameras_digigr8 cameras_digita cameras_dimagev cameras_dimera3500 cameras_directory cameras_enigma13 cameras_fuji cameras_gsmart300 cameras_hp215 cameras_iclick cameras_jamcam cameras_jd11 cameras_jl2005a cameras_jl2005c cameras_kodak_dc120 cameras_kodak_dc210 cameras_kodak_dc240 cameras_kodak_dc3200 cameras_kodak_ez200 cameras_konica cameras_konica_qm150 cameras_largan cameras_lg_gsm cameras_mars cameras_mustek cameras_panasonic_coolshot cameras_panasonic_l859 cameras_panasonic_dc1000 cameras_panasonic_dc1580 cameras_pccam300 cameras_pccam600 cameras_pentax cameras_polaroid_pdc320 cameras_polaroid_pdc640 cameras_polaroid_pdc700 cameras_ptp2 cameras_ricoh cameras_ricoh_g3 cameras_samsung cameras_sierra cameras_sipix_blink2 cameras_sipix_web2 cameras_smal cameras_sonix cameras_sony_dscf1 cameras_sony_dscf55 cameras_soundvision cameras_spca50x cameras_sq905 cameras_st2205 cameras_stv0674 cameras_stv0680 cameras_sx330z cameras_toshiba_pdrm11 cameras_topfield cameras_tp6801
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 sys-devel/libtool virtual/libusb:1 cameras_ax203? ( media-libs/gd:= ) cameras_st2205? ( media-libs/gd:= ) exif? ( >=media-libs/libexif-0.5.9:= ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg:0 ) serial? ( dev-libs/lockdev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !<sys-fs/udev-175
-SLOT=0/6
-SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.3.1.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=11e2c79d66774ddc047220a2b1b90b34
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.4 b/metadata/md5-cache/media-libs/libgphoto2-2.5.4
deleted file mode 100644
index cc06650d24ff..000000000000
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=dev-libs/libxml2:2 sys-devel/libtool virtual/libusb:1 cameras_ax203? ( media-libs/gd:= ) cameras_st2205? ( media-libs/gd:= ) exif? ( >=media-libs/libexif-0.5.9:= ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg:0 ) serial? ( dev-libs/lockdev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !<sys-fs/udev-175 dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Library that implements support for numerous digital cameras
-EAPI=5
-HOMEPAGE=http://www.gphoto.org/
-IUSE=doc examples exif gd jpeg nls serial zeroconf cameras_adc65 cameras_agfa_cl20 cameras_aox cameras_ax203 cameras_barbie cameras_canon cameras_casio_qv cameras_clicksmart310 cameras_digigr8 cameras_digita cameras_dimagev cameras_dimera3500 cameras_directory cameras_enigma13 cameras_fuji cameras_gsmart300 cameras_hp215 cameras_iclick cameras_jamcam cameras_jd11 cameras_jl2005a cameras_jl2005c cameras_kodak_dc120 cameras_kodak_dc210 cameras_kodak_dc240 cameras_kodak_dc3200 cameras_kodak_ez200 cameras_konica cameras_konica_qm150 cameras_largan cameras_lg_gsm cameras_mars cameras_mustek cameras_panasonic_coolshot cameras_panasonic_l859 cameras_panasonic_dc1000 cameras_panasonic_dc1580 cameras_pccam300 cameras_pccam600 cameras_pentax cameras_polaroid_pdc320 cameras_polaroid_pdc640 cameras_polaroid_pdc700 cameras_ptp2 cameras_ricoh cameras_ricoh_g3 cameras_samsung cameras_sierra cameras_sipix_blink2 cameras_sipix_web2 cameras_smal cameras_sonix cameras_sony_dscf1 cameras_sony_dscf55 cameras_soundvision cameras_spca50x cameras_sq905 cameras_st2205 cameras_stv0674 cameras_stv0680 cameras_sx330z cameras_toshiba_pdrm11 cameras_topfield cameras_tp6801
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 sys-devel/libtool virtual/libusb:1 cameras_ax203? ( media-libs/gd:= ) cameras_st2205? ( media-libs/gd:= ) exif? ( >=media-libs/libexif-0.5.9:= ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg:0 ) serial? ( dev-libs/lockdev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !<sys-fs/udev-175
-SLOT=0/6
-SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.4.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=870f8461d261cd322a00c2e5d5365018
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.4-r2 b/metadata/md5-cache/media-libs/libgphoto2-2.5.4-r2
deleted file mode 100644
index ed3e928215c1..000000000000
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[mdnsresponder-compat,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-175 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Library that implements support for numerous digital cameras
-EAPI=5
-HOMEPAGE=http://www.gphoto.org/
-IUSE=doc examples exif gd jpeg nls serial zeroconf cameras_adc65 cameras_agfa_cl20 cameras_aox cameras_ax203 cameras_barbie cameras_canon cameras_casio_qv cameras_clicksmart310 cameras_digigr8 cameras_digita cameras_dimagev cameras_dimera3500 cameras_directory cameras_enigma13 cameras_fuji cameras_gsmart300 cameras_hp215 cameras_iclick cameras_jamcam cameras_jd11 cameras_jl2005a cameras_jl2005c cameras_kodak_dc120 cameras_kodak_dc210 cameras_kodak_dc240 cameras_kodak_dc3200 cameras_kodak_ez200 cameras_konica cameras_konica_qm150 cameras_largan cameras_lg_gsm cameras_mars cameras_mustek cameras_panasonic_coolshot cameras_panasonic_l859 cameras_panasonic_dc1000 cameras_panasonic_dc1580 cameras_pccam300 cameras_pccam600 cameras_pentax cameras_polaroid_pdc320 cameras_polaroid_pdc640 cameras_polaroid_pdc700 cameras_ptp2 cameras_ricoh cameras_ricoh_g3 cameras_samsung cameras_sierra cameras_sipix_blink2 cameras_sipix_web2 cameras_smal cameras_sonix cameras_sony_dscf1 cameras_sony_dscf55 cameras_soundvision cameras_spca50x cameras_sq905 cameras_st2205 cameras_stv0674 cameras_stv0680 cameras_sx330z cameras_toshiba_pdrm11 cameras_topfield cameras_tp6801 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[mdnsresponder-compat,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-175 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-SLOT=0/6
-SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.4.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4a846843c95996a7c102410222911143
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.7 b/metadata/md5-cache/media-libs/libgphoto2-2.5.7
new file mode 100644
index 000000000000..5aeb1f7302bb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[mdnsresponder-compat,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-175 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( app-doc/doxygen ) virtual/pkgconfig
+DESCRIPTION=Library that implements support for numerous digital cameras
+EAPI=5
+HOMEPAGE=http://www.gphoto.org/
+IUSE=doc examples exif gd jpeg nls serial zeroconf cameras_adc65 cameras_agfa_cl20 cameras_aox cameras_ax203 cameras_barbie cameras_canon cameras_casio_qv cameras_clicksmart310 cameras_digigr8 cameras_digita cameras_dimagev cameras_dimera3500 cameras_directory cameras_enigma13 cameras_fuji cameras_gsmart300 cameras_hp215 cameras_iclick cameras_jamcam cameras_jd11 cameras_jl2005a cameras_jl2005c cameras_kodak_dc120 cameras_kodak_dc210 cameras_kodak_dc240 cameras_kodak_dc3200 cameras_kodak_ez200 cameras_konica cameras_konica_qm150 cameras_largan cameras_lg_gsm cameras_mars cameras_mustek cameras_panasonic_coolshot cameras_panasonic_l859 cameras_panasonic_dc1000 cameras_panasonic_dc1580 cameras_pccam300 cameras_pccam600 cameras_pentax cameras_polaroid_pdc320 cameras_polaroid_pdc640 cameras_polaroid_pdc700 cameras_ptp2 cameras_ricoh cameras_ricoh_g3 cameras_samsung cameras_sierra cameras_sipix_blink2 cameras_sipix_web2 cameras_smal cameras_sonix cameras_sony_dscf1 cameras_sony_dscf55 cameras_soundvision cameras_spca50x cameras_sq905 cameras_st2205 cameras_stv0674 cameras_stv0680 cameras_sx330z cameras_toshiba_pdrm11 cameras_topfield cameras_tp6801 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[mdnsresponder-compat,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-175 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+SLOT=0/6
+SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.7.tar.bz2
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=f2d21f6847e2611b18d2632fd0833060
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.8.2 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.8.2
index 8c0e09d5217c..7c39b5ac96b0 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.8.2
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-0.8.2
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/taglib-1.7.0 >=media-sound/mpg123-1.13.0 >=media-sound/qmmp-
 DESCRIPTION=A set of extra plugins for Qmmp
 EAPI=5
 HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.7.0 >=media-sound/mpg123-1.13.0 >=media-sound/qmmp-0.8.0 dev-qt/qtgui:4
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-0.8.2.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=790b6d2311da164e0234145746795e5b
+_md5_=5635c9ed2d420c6b9be1e9ddf40ec72f
diff --git a/metadata/md5-cache/media-radio/unixcw-3.4.0 b/metadata/md5-cache/media-radio/unixcw-3.4.0
index d0988988e743..5d2d86d4598f 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.4.0
+++ b/metadata/md5-cache/media-radio/unixcw-3.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=A package of programs that fit together to form a morse code tutor p
 EAPI=5
 HOMEPAGE=http://unixcw.sourceforge.net
 IUSE=alsa ncurses pulseaudio suid qt4
-KEYWORDS=~alpha amd64 ppc ~x86
+KEYWORDS=~alpha amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.4.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9995524d587337be75f65d0a592de37c
+_md5_=36afa981e78a8b819573069fa38415ba
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.14.3-r1 b/metadata/md5-cache/media-sound/gnome-music-3.14.3.1
similarity index 98%
rename from metadata/md5-cache/media-sound/gnome-music-3.14.3-r1
rename to metadata/md5-cache/media-sound/gnome-music-3.14.3.1
index 182b46346c83..888f8c821d1d 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.14.3-r1
+++ b/metadata/md5-cache/media-sound/gnome-music-3.14.3.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9 >=media-libs/grilo-0.2.6:0.2[introspection] media-libs/libmediaart:1.0 >=x11-libs/gtk+-3.13.2:3[introspection] app-misc/tracker[introspection(+)] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) dev-python/pygobject:3[cairo,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.2[tracker] x11-misc/xdg-user-dirs
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 )
 SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-music/3.14/gnome-music-3.14.3.tar.xz
+SRC_URI=mirror://gnome/sources/gnome-music/3.14/gnome-music-3.14.3.1.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=46c901f33bac7a61cc371631ec31fc2d
+_md5_=b59ad42797ac28a91e401bb086263594
diff --git a/metadata/md5-cache/media-sound/gramofile-1.6_p9 b/metadata/md5-cache/media-sound/gramofile-1.6_p9
new file mode 100644
index 000000000000..b995d17eb31a
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gramofile-1.6_p9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses sci-libs/fftw:2.1 virtual/pkgconfig
+DESCRIPTION=Transfer sound from gramophone records to CD
+EAPI=5
+HOMEPAGE=http://www.opensourcepartners.nl/~costar/gramofile
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses sci-libs/fftw:2.1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/g/gramofile/gramofile_1.6.orig.tar.gz mirror://debian/pool/main/g/gramofile/gramofile_1.6-9.diff.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=0e7fb81a50cb8bee991437b96131c531
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.6.2 b/metadata/md5-cache/media-sound/ncmpcpp-0.6.2
index 388bb2d62397..66d9a5be3227 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.6.2
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=5
 HOMEPAGE=http://ncmpcpp.rybczak.net/
 IUSE=clock curl outputs taglib unicode visualizer
-KEYWORDS=amd64 arm hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 arm hppa ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpdclient-2.1 curl? ( net-misc/curl ) dev-libs/boost:=[nls,threads] sys-libs/ncurses[unicode?] sys-libs/readline taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0 )
 SLOT=0
 SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.6.2.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=581892d686f37028bacafc5e3d168618
+_md5_=17c01e98741a99b2a467263753b03fb0
diff --git a/metadata/md5-cache/media-video/acidrip-0.14-r3 b/metadata/md5-cache/media-video/acidrip-0.14-r3
index 89804cdbd440..e1d68c23c06b 100644
--- a/metadata/md5-cache/media-video/acidrip-0.14-r3
+++ b/metadata/md5-cache/media-video/acidrip-0.14-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A gtk-perl mplayer/mencoder frontend for ripping DVDs
 EAPI=5
 HOMEPAGE=http://sourceforge.net/acidrip/
 IUSE=encode
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/gtk2-perl media-video/lsdvd media-video/mplayer[encode] encode? ( >=media-sound/lame-3.92 ) dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/acidrip-0.14.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=dcde48a9e7c229b497afbac0462ed052
+_md5_=8d7c9828320af3be0e4602d48069d237
diff --git a/metadata/md5-cache/media-video/dirac-1.0.2-r1 b/metadata/md5-cache/media-video/dirac-1.0.2-r1
index 4e4ed9758905..a7fa03c73d69 100644
--- a/metadata/md5-cache/media-video/dirac-1.0.2-r1
+++ b/metadata/md5-cache/media-video/dirac-1.0.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Open Source video codec
 EAPI=5
 HOMEPAGE=http://dirac.sourceforge.net/
 IUSE=debug doc mmx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/dirac/dirac-1.0.2.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e569b4c25722d025b46e7e8d7a14d691
+_md5_=cf897cf4aa345a0a6ee0a71e2ddcb131
diff --git a/metadata/md5-cache/media-video/kplayer-0.7.2 b/metadata/md5-cache/media-video/kplayer-0.7.2
deleted file mode 100644
index eabc369a4a5b..000000000000
--- a/metadata/md5-cache/media-video/kplayer-0.7.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=KPlayer is a KDE media player based on mplayer
-EAPI=4
-HOMEPAGE=https://projects.kde.org/projects/extragear/multimedia/kplayer
-IUSE=debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_it linguas_ja linguas_km linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=media-video/mplayer-1.0_rc1 media-video/mplayer2 ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_eu? ( || ( kde-apps/kde-l10n[linguas_eu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_he? ( || ( kde-apps/kde-l10n[linguas_he(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) ) linguas_hi? ( || ( kde-apps/kde-l10n[linguas_hi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) ) linguas_hne? ( || ( kde-apps/kde-l10n[linguas_hne(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_km? ( || ( kde-apps/kde-l10n[linguas_km(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mai? ( || ( kde-apps/kde-l10n[linguas_mai(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@ijekavian? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavian(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) ) linguas_sr@ijekavianlatin? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavianlatin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) ) linguas_sr@latin? ( || ( kde-apps/kde-l10n[linguas_sr@latin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_th? ( || ( kde-apps/kde-l10n[linguas_th(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=mirror://kde/stable/kplayer/0.7.2/src/kplayer-0.7.2.tar.xz
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=72eed6635d8f1f6c3545bb0b2f8b4264
diff --git a/metadata/md5-cache/media-video/kplayer-0.7.2-r1 b/metadata/md5-cache/media-video/kplayer-0.7.2-r1
index b76d3bbb30a2..cbc3ffe02101 100644
--- a/metadata/md5-cache/media-video/kplayer-0.7.2-r1
+++ b/metadata/md5-cache/media-video/kplayer-0.7.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=KPlayer is a KDE media player based on mplayer
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/multimedia/kplayer
 IUSE=debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hne linguas_it linguas_ja linguas_km linguas_lt linguas_mai linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=media-video/mplayer-1.0_rc1 media-video/mplayer2 ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_bs? ( || ( kde-apps/kde-l10n[linguas_bs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) ) linguas_ca? ( || ( kde-apps/kde-l10n[linguas_ca(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) ) linguas_ca@valencia? ( || ( kde-apps/kde-l10n[linguas_ca@valencia(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_da? ( || ( kde-apps/kde-l10n[linguas_da(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_en_GB? ( || ( kde-apps/kde-l10n[linguas_en_GB(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_et? ( || ( kde-apps/kde-l10n[linguas_et(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) ) linguas_eu? ( || ( kde-apps/kde-l10n[linguas_eu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eu(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_ga? ( || ( kde-apps/kde-l10n[linguas_ga(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) ) linguas_gl? ( || ( kde-apps/kde-l10n[linguas_gl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) ) linguas_he? ( || ( kde-apps/kde-l10n[linguas_he(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_he(+)] ) ) linguas_hi? ( || ( kde-apps/kde-l10n[linguas_hi(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) ) linguas_hne? ( || ( kde-apps/kde-l10n[linguas_hne(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hne(+)] ) ) linguas_it? ( || ( kde-apps/kde-l10n[linguas_it(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) ) linguas_ja? ( || ( kde-apps/kde-l10n[linguas_ja(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) ) linguas_km? ( || ( kde-apps/kde-l10n[linguas_km(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) ) linguas_lt? ( || ( kde-apps/kde-l10n[linguas_lt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) ) linguas_mai? ( || ( kde-apps/kde-l10n[linguas_mai(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) ) linguas_nb? ( || ( kde-apps/kde-l10n[linguas_nb(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) ) linguas_nds? ( || ( kde-apps/kde-l10n[linguas_nds(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) ) linguas_nl? ( || ( kde-apps/kde-l10n[linguas_nl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) ) linguas_pa? ( || ( kde-apps/kde-l10n[linguas_pa(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt? ( || ( kde-apps/kde-l10n[linguas_pt(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ro? ( || ( kde-apps/kde-l10n[linguas_ro(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@ijekavian? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavian(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) ) linguas_sr@ijekavianlatin? ( || ( kde-apps/kde-l10n[linguas_sr@ijekavianlatin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) ) linguas_sr@latin? ( || ( kde-apps/kde-l10n[linguas_sr@latin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) ) linguas_sv? ( || ( kde-apps/kde-l10n[linguas_sv(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) ) linguas_th? ( || ( kde-apps/kde-l10n[linguas_th(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_th(+)] ) ) linguas_tr? ( || ( kde-apps/kde-l10n[linguas_tr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) linguas_zh_CN? ( || ( kde-apps/kde-l10n[linguas_zh_CN(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) ) linguas_zh_TW? ( || ( kde-apps/kde-l10n[linguas_zh_TW(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/stable/kplayer/0.7.2/src/kplayer-0.7.2.tar.xz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0c11826085afa21c80cc26636bfb6201
+_md5_=ec05410b00a6a99cfbd908c5dbe1b7dd
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.5.3-r2 b/metadata/md5-cache/media-video/subtitlecomposer-0.5.3-r2
deleted file mode 100644
index 193876b0f7ee..000000000000
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.5.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=gstreamer? ( media-libs/gstreamer:0.10 ) xine? ( media-libs/xine-lib ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Text-based subtitles editor
-EAPI=5
-HOMEPAGE=https://github.com/maxrd2/subtitlecomposer
-IUSE=debug gstreamer xine linguas_bg linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_pl linguas_pt_BR linguas_sr aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=gstreamer? ( media-libs/gstreamer:0.10 ) xine? ( media-libs/xine-lib ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=mirror://sourceforge/subcomposer/subtitlecomposer-0.5.3.tar.bz2
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2e249c4359502ddd2944e1f30e3902e2
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.5.6 b/metadata/md5-cache/media-video/subtitlecomposer-0.5.6
index 96f37620c74d..493e335c2a79 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.5.6
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.5.6
@@ -4,10 +4,10 @@ DESCRIPTION=Text-based subtitles editor
 EAPI=5
 HOMEPAGE=https://github.com/maxrd2/subtitlecomposer
 IUSE=debug gstreamer unicode xine linguas_bg linguas_cs linguas_de linguas_el linguas_es linguas_fr linguas_hu linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sr@latin linguas_uk aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/phonon[qt4] gstreamer? ( media-libs/gstreamer:0.10 ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.4:4[aqua=] ) linguas_bg? ( || ( kde-apps/kde-l10n[linguas_bg(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) ) linguas_cs? ( || ( kde-apps/kde-l10n[linguas_cs(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) ) linguas_de? ( || ( kde-apps/kde-l10n[linguas_de(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) ) linguas_el? ( || ( kde-apps/kde-l10n[linguas_el(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) ) linguas_es? ( || ( kde-apps/kde-l10n[linguas_es(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) ) linguas_fr? ( || ( kde-apps/kde-l10n[linguas_fr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) ) linguas_hu? ( || ( kde-apps/kde-l10n[linguas_hu(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) ) linguas_pl? ( || ( kde-apps/kde-l10n[linguas_pl(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) ) linguas_pt_BR? ( || ( kde-apps/kde-l10n[linguas_pt_BR(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) ) linguas_ru? ( || ( kde-apps/kde-l10n[linguas_ru(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) ) linguas_sr? ( || ( kde-apps/kde-l10n[linguas_sr(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) ) linguas_sr@latin? ( || ( kde-apps/kde-l10n[linguas_sr@latin(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) ) linguas_uk? ( || ( kde-apps/kde-l10n[linguas_uk(+)] >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.5.6.tar.gz -> subtitlecomposer-0.5.6.tar.gz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e3763947f2715180563c248b6143e90b
+_md5_=74cb8144e8f24687910aad988f6aaa16
diff --git a/metadata/md5-cache/media-video/vlc-2.1.2 b/metadata/md5-cache/media-video/vlc-2.1.2
index 35e699406b52..1a5a01bc9959 100644
--- a/metadata/md5-cache/media-video/vlc-2.1.2
+++ b/metadata/md5-cache/media-video/vlc-2.1.2
@@ -11,4 +11,4 @@ REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva
 SLOT=0/5-7
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.1.2/vlc-2.1.2.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2d60228c6f08c2cbaf210990909b119b
+_md5_=5f2874e4f4456976e91cb63fc35c4d6f
diff --git a/metadata/md5-cache/media-video/vlc-2.1.4 b/metadata/md5-cache/media-video/vlc-2.1.4
index 23d0cc7cc005..b529a7ffd2e9 100644
--- a/metadata/md5-cache/media-video/vlc-2.1.4
+++ b/metadata/md5-cache/media-video/vlc-2.1.4
@@ -11,4 +11,4 @@ REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva
 SLOT=0/5-7
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.1.4/vlc-2.1.4.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=aa3de8c13b78ea4043908bd8e2d3fbbf
+_md5_=8bc618b9455240aedda8bc4f507f3ed1
diff --git a/metadata/md5-cache/media-video/vlc-2.1.5 b/metadata/md5-cache/media-video/vlc-2.1.5
index 49ddf2fb9bd6..8f5ccffc2661 100644
--- a/metadata/md5-cache/media-video/vlc-2.1.5
+++ b/metadata/md5-cache/media-video/vlc-2.1.5
@@ -11,4 +11,4 @@ REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva
 SLOT=0/5-7
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.1.5/vlc-2.1.5.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=975dc2120c8ed2cfcc55b4f02eb5f8e3
+_md5_=19b3a7713c1ef081172f6d786aefc7fa
diff --git a/metadata/md5-cache/media-video/vlc-2.1.9999 b/metadata/md5-cache/media-video/vlc-2.1.9999
index 60dffc4deab6..b69ff09f5f35 100644
--- a/metadata/md5-cache/media-video/vlc-2.1.9999
+++ b/metadata/md5-cache/media-video/vlc-2.1.9999
@@ -9,4 +9,4 @@ RDEPEND=!<media-video/ffmpeg-1.2:0 dev-libs/libgpg-error:0 net-dns/libidn:0 >=sy
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) egl? ( X ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt4? ( X ) sdl? ( X ) skins? ( truetype X qt4 ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-7
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=78447bee8168344c246d10f7e2989732
+_md5_=af7e505aff813532ef09a220edb2f301
diff --git a/metadata/md5-cache/media-video/vlc-2.2.9999 b/metadata/md5-cache/media-video/vlc-2.2.9999
index 9dd91a8442ef..b8c12d25a33e 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.9999
+++ b/metadata/md5-cache/media-video/vlc-2.2.9999
@@ -9,4 +9,4 @@ RDEPEND=!<media-video/ffmpeg-1.2:0 dev-libs/libgpg-error:0 net-dns/libidn:0 >=sy
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt4? ( X !qt5 ) qt5? ( X !qt4 ) sdl? ( X ) skins? ( truetype X ^^ ( qt4 qt5 ) ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-7
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=28ecdc865862b0e6a6225bd0f06a49f8
+_md5_=8b2d43d43bf07760c8cf2a95f3e9512b
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index b19511070e46..577c8301a11d 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -9,4 +9,4 @@ RDEPEND=!<media-video/ffmpeg-1.2:0 dev-libs/libgpg-error:0 net-dns/libidn:0 >=sy
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale postproc ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt4? ( X !qt5 ) qt5? ( X !qt4 ) sdl? ( X ) skins? ( truetype X ^^ ( qt4 qt5 ) ) vaapi? ( avcodec X ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-7
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f649710e1ecf710bd0cb50118333983f
+_md5_=6ecb49a120da53ef7f0dd5f4da72746b
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8 b/metadata/md5-cache/net-analyzer/argus-3.0.8
index 7641dea51e51..71e5981e10fc 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=network Audit Record Generation and Utilization System
 EAPI=5
 HOMEPAGE=http://www.qosient.com/argus/
 IUSE=debug sasl tcpd
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=net-libs/libpcap sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=http://qosient.com/argus/src/argus-3.0.8.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=264564d14a26785ff2fe55e894dcdc94
+_md5_=038ea20ebccff9aaed6b36224c5d4830
diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
index 3ae079a3f4b5..32b05d3c97e2 100644
--- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
+++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Clients for net-analyzer/argus
 EAPI=5
 HOMEPAGE=http://www.qosient.com/argus/
 IUSE=debug ft geoip mysql sasl tcpd
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl )
 SLOT=0
 SRC_URI=http://qosient.com/argus/dev/argus-clients-3.0.8.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=38510986165abbfe91e66a1fcdc3f92c
+_md5_=62c9ca07319aac77d3ecaba36f10a82b
diff --git a/metadata/md5-cache/net-analyzer/arping-2.14 b/metadata/md5-cache/net-analyzer/arping-2.14
index 7239cba5b420..2f3d6e1ed69e 100644
--- a/metadata/md5-cache/net-analyzer/arping-2.14
+++ b/metadata/md5-cache/net-analyzer/arping-2.14
@@ -3,9 +3,9 @@ DEPEND=net-libs/libpcap net-libs/libnet:1.1
 DESCRIPTION=A utility to see if a specific IP address is taken and what MAC address owns it
 EAPI=5
 HOMEPAGE=http://www.habets.pp.se/synscan/programs.php?prog=arping
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap net-libs/libnet:1.1
 SLOT=2
 SRC_URI=http://www.habets.pp.se/synscan/files/arping-2.14.tar.gz
-_md5_=469434c05a18a4e1b9c5c76ad74eba2d
+_md5_=ca11898a9662e716a15e30d802fa782d
diff --git a/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2 b/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2
index b9e0666a7d09..ba12e27bb488 100644
--- a/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2
+++ b/metadata/md5-cache/net-analyzer/cryptcat-1.2.1-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=netcat clone extended with twofish encryption
 EAPI=5
 HOMEPAGE=http://cryptcat.sourceforge.net/
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptcat/cryptcat-unix-1.2.1.tar
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8e7fe60130bcc520324794d718def033
+_md5_=9e5215fbab5fd6f827b62a967dd63008
diff --git a/metadata/md5-cache/net-analyzer/ippl-1.4.14-r5 b/metadata/md5-cache/net-analyzer/ippl-1.4.14-r5
index 35c999f7d69a..a750193ce773 100644
--- a/metadata/md5-cache/net-analyzer/ippl-1.4.14-r5
+++ b/metadata/md5-cache/net-analyzer/ippl-1.4.14-r5
@@ -3,9 +3,9 @@ DEPEND=virtual/yacc >=sys-devel/flex-2.5.4a-r4
 DESCRIPTION=A daemon which logs TCP/UDP/ICMP packets
 EAPI=5
 HOMEPAGE=http://pltplp.net/ippl/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://pltplp.net/ippl/archive/ippl-1.4.14.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=44ce656be51d088c8adf5c3fc3e18c6d
+_md5_=216d7440147cae2cce207ce5e4b16f69
diff --git a/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3 b/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3
index 461ad98d4753..3020234f1b7f 100644
--- a/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3
+++ b/metadata/md5-cache/net-analyzer/knocker-0.7.1-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare unpack
 DESCRIPTION=Knocker is an easy to use security port scanner written in C
 EAPI=5
 HOMEPAGE=http://knocker.sourceforge.net
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/knocker/knocker-0.7.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a9a2c405bc1ead308bb5bec9c591536f
+_md5_=637b7b77e5adb608fe19b064d5fa43a6
diff --git a/metadata/md5-cache/net-analyzer/macchanger-1.7.0 b/metadata/md5-cache/net-analyzer/macchanger-1.7.0
index da55866fc5b2..057761c83ceb 100644
--- a/metadata/md5-cache/net-analyzer/macchanger-1.7.0
+++ b/metadata/md5-cache/net-analyzer/macchanger-1.7.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Utility for viewing/manipulating the MAC address of network interfaces
 EAPI=5
 HOMEPAGE=https://github.com/alobbs/macchanger
-KEYWORDS=amd64 arm ppc ~sparc ~x86
+KEYWORDS=amd64 arm ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/alobbs/macchanger/releases/download/1.7.0/macchanger-1.7.0.tar.gz
-_md5_=4170178387649c7760b6a98262f415d6
+_md5_=453f179a4ff5a3ae3fd5760f2864dd77
diff --git a/metadata/md5-cache/net-analyzer/nmap-6.47-r2 b/metadata/md5-cache/net-analyzer/nmap-6.47-r2
new file mode 100644
index 000000000000..a8cfc6fe4fbb
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nmap-6.47-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=dev-libs/liblinear dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) system-lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl ) nls? ( sys-devel/gettext )
+DESCRIPTION=A utility for network exploration or security auditing
+EAPI=5
+HOMEPAGE=http://nmap.org/
+IUSE=ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap linguas_de linguas_fr linguas_hr linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/liblinear dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) system-lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl )
+REQUIRED_USE=system-lua? ( lua ) ndiff? ( python_targets_python2_7 ) zenmap? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://nmap.org/dist/nmap-6.47.tar.bz2 http://dev.gentoo.org/~jer/nmap-logo-64.png
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=eab835d4844bdbfb66dd44f8427afae6
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index cb55201c8442..88eb9fdc0c0f 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -3,11 +3,11 @@ DEPEND=dev-libs/liblinear dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev
 DESCRIPTION=A utility for network exploration or security auditing
 EAPI=5
 HOMEPAGE=http://nmap.org/
-IUSE=ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap linguas_de linguas_es linguas_fr linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_zh python_targets_python2_7
+IUSE=ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap linguas_de linguas_fr linguas_hr linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru linguas_zh python_targets_python2_7
 LICENSE=GPL-2
 RDEPEND=dev-libs/liblinear dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) system-lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl )
 REQUIRED_USE=system-lua? ( lua ) ndiff? ( python_targets_python2_7 ) zenmap? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jer/nmap-logo-64.png
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=877f691f29da7c827006104673db0fe0
+_md5_=c1025b8b23bd17b03390f4f6df67fc80
diff --git a/metadata/md5-cache/net-analyzer/nttcp-1.47-r3 b/metadata/md5-cache/net-analyzer/nttcp-1.47-r3
index fee3a05cc09b..dc712f7c72fe 100644
--- a/metadata/md5-cache/net-analyzer/nttcp-1.47-r3
+++ b/metadata/md5-cache/net-analyzer/nttcp-1.47-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=tool to test TCP and UDP throughput
 EAPI=5
 HOMEPAGE=http://www.leo.org/~elmar/nttcp/
-KEYWORDS=amd64 ~mips ~ppc ~x86
+KEYWORDS=amd64 ~mips ~ppc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.leo.org/~elmar/nttcp/nttcp-1.47.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=315f517ed1f9281e1b896fea701b637f
+_md5_=c17fa22cd586e007e3deac9b828b7001
diff --git a/metadata/md5-cache/net-analyzer/pinger-0.33 b/metadata/md5-cache/net-analyzer/pinger-0.33
index 5597c475b503..e23ee85cac55 100644
--- a/metadata/md5-cache/net-analyzer/pinger-0.33
+++ b/metadata/md5-cache/net-analyzer/pinger-0.33
@@ -4,11 +4,11 @@ DESCRIPTION=Cyclic multi ping utility for selected adresses using GTK/ncurses
 EAPI=5
 HOMEPAGE=http://aa.vslib.cz/silk/projekty/pinger/
 IUSE=gtk2 gtk3 ncurses nls
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=gtk2? ( dev-libs/glib:2 >=x11-libs/gtk+-2.4:2 ) gtk3? ( dev-libs/glib:2 >=x11-libs/gtk+-3.12:3 ) ncurses? ( sys-libs/ncurses )
 REQUIRED_USE=|| ( gtk2 gtk3 ncurses ) ?? ( gtk2 gtk3 )
 SLOT=0
 SRC_URI=http://aa.vslib.cz/silk/projekty/pinger/download/pinger-0.33.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3f69c86e8600cd89aec702524ee1d81d
+_md5_=3a6de75006181d05473023c3d5239a2e
diff --git a/metadata/md5-cache/net-analyzer/sec-2.7.6 b/metadata/md5-cache/net-analyzer/sec-2.7.6
index 2403690699e8..4be6f8363d88 100644
--- a/metadata/md5-cache/net-analyzer/sec-2.7.6
+++ b/metadata/md5-cache/net-analyzer/sec-2.7.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Simple Event Correlator
 EAPI=5
 HOMEPAGE=http://simple-evcorr.sourceforge.net/
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.0
 SLOT=0
 SRC_URI=mirror://sourceforge/simple-evcorr/sec-2.7.6.tar.gz
-_md5_=d05eaedb0cac944020d07aba4fe3cd33
+_md5_=f309c765e208ed7d747bb8983649faa6
diff --git a/metadata/md5-cache/net-analyzer/slurm-0.3.3-r2 b/metadata/md5-cache/net-analyzer/slurm-0.3.3-r2
index e372f3399ee9..b1bd661bd3f7 100644
--- a/metadata/md5-cache/net-analyzer/slurm-0.3.3-r2
+++ b/metadata/md5-cache/net-analyzer/slurm-0.3.3-r2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Realtime network interface monitor based on FreeBSD's pppstatus
 EAPI=5
 HOMEPAGE=http://www.wormulon.net/projects/slurm
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.wormulon.net/files/code/slurm/slurm-0.3.3.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d22d25928050f26151f8b7571064bee3
+_md5_=20ea321b952b8fa2d823a87502f269b6
diff --git a/metadata/md5-cache/net-dns/dnstop-20110502 b/metadata/md5-cache/net-dns/dnstop-20110502
deleted file mode 100644
index e17efc034ace..000000000000
--- a/metadata/md5-cache/net-dns/dnstop-20110502
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/ncurses net-libs/libpcap
-DESCRIPTION=Displays various tables of DNS traffic on your network
-EAPI=2
-HOMEPAGE=http://dnstop.measurement-factory.com/
-IUSE=ipv6
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses net-libs/libpcap
-SLOT=0
-SRC_URI=http://dnstop.measurement-factory.com/src/dnstop-20110502.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e197814bde30e641d1bb46130b58042f
diff --git a/metadata/md5-cache/net-dns/dnstop-20121017 b/metadata/md5-cache/net-dns/dnstop-20121017
index 954bd253d582..140b84297d38 100644
--- a/metadata/md5-cache/net-dns/dnstop-20121017
+++ b/metadata/md5-cache/net-dns/dnstop-20121017
@@ -4,10 +4,10 @@ DESCRIPTION=Displays various tables of DNS traffic on your network
 EAPI=5
 HOMEPAGE=http://dnstop.measurement-factory.com/
 IUSE=ipv6
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc x86
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses net-libs/libpcap[ipv6?]
 SLOT=0
 SRC_URI=http://dnstop.measurement-factory.com/src/dnstop-20121017.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bd288172c6ce3f93597c7cbd311ae3b0
+_md5_=c17e83b183a4b0c764d45f426a94c94b
diff --git a/metadata/md5-cache/net-firewall/ferm-2.2 b/metadata/md5-cache/net-firewall/ferm-2.2
index ee101c465f72..f69d022982dd 100644
--- a/metadata/md5-cache/net-firewall/ferm-2.2
+++ b/metadata/md5-cache/net-firewall/ferm-2.2
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Command line util for managing firewall rules
 EAPI=5
 HOMEPAGE=http://ferm.foo-projects.org/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:* net-firewall/iptables virtual/perl-File-Spec
 SLOT=0
 SRC_URI=http://ferm.foo-projects.org/download/2.2/ferm-2.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=aac94124ca83874f77ea7f38b2dcb459
+_md5_=a23e8bde6c5e02c8049219c99b78c5d5
diff --git a/metadata/md5-cache/net-ftp/cmdftp-0.9.8 b/metadata/md5-cache/net-ftp/cmdftp-0.9.8
index 73e28aa6dae3..c9b176f6179f 100644
--- a/metadata/md5-cache/net-ftp/cmdftp-0.9.8
+++ b/metadata/md5-cache/net-ftp/cmdftp-0.9.8
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
 DESCRIPTION=Light weight, yet robust command line FTP client with shell-like functions.
 EAPI=5
 HOMEPAGE=http://savannah.nongnu.org/projects/cmdftp/
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://download.savannah.nongnu.org/releases/cmdftp/cmdftp-0.9.8.tar.gz
-_md5_=923ecb0b900e41be7a39a2f1e7e02344
+_md5_=fa2f87a7fd7862c40bc16d2c167183e7
diff --git a/metadata/md5-cache/net-im/dianara-1.2.4 b/metadata/md5-cache/net-im/dianara-1.2.4
index da8836943820..a5fa773492a4 100644
--- a/metadata/md5-cache/net-im/dianara-1.2.4
+++ b/metadata/md5-cache/net-im/dianara-1.2.4
@@ -3,10 +3,10 @@ DEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/qjson dev-libs/qoauth dev-q
 DESCRIPTION=Qt-based client for the pump.io distributed social network
 EAPI=5
 HOMEPAGE=http://dianara.nongnu.org/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/qca:2 app-crypt/qca-ossl:2 dev-libs/qjson dev-libs/qoauth dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-apps/file
 SLOT=0
 SRC_URI=mirror://nongnu/dianara/dianara-v1.2.4.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4cc000778e5fe6d8cd80cfe3717c0f8f
+_md5_=0656d139398b151fd78db71b4ea90023
diff --git a/metadata/md5-cache/net-im/licq-1.8.2 b/metadata/md5-cache/net-im/licq-1.8.2
index f5d5fb7d581a..7be6e705b493 100644
--- a/metadata/md5-cache/net-im/licq-1.8.2
+++ b/metadata/md5-cache/net-im/licq-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=ICQ Client with v8 support
 EAPI=5
 HOMEPAGE=http://www.licq.org/
 IUSE=debug doc linguas_he nls socks5 ssl xosd aosd jabber qt4 msn
-KEYWORDS=~alpha amd64 ~ia64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gpgme-1 jabber? ( net-libs/gloox ) qt4? ( dev-qt/qtgui:4 ) socks5? ( net-proxy/dante ) ssl? ( >=dev-libs/openssl-0.9.5a ) xosd? ( x11-libs/xosd ) aosd? ( x11-libs/libaosd )
 SLOT=2
 SRC_URI=mirror://sourceforge/licq/licq-1.8.2.tar.bz2
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=08b50aafed6e4c08d69a32da8a5379ec
+_md5_=9b799cea42210d0cb90dcef82ca70f80
diff --git a/metadata/md5-cache/net-irc/epic5-1.1.10 b/metadata/md5-cache/net-irc/epic5-1.1.10
index 75f070b82a1c..2d2741c042e1 100644
--- a/metadata/md5-cache/net-irc/epic5-1.1.10
+++ b/metadata/md5-cache/net-irc/epic5-1.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Epic5 IRC Client
 EAPI=4
 HOMEPAGE=http://epicsol.org/
 IUSE=archive ipv6 perl tcl ruby socks5 valgrind elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=virtual/libiconv >=dev-libs/openssl-0.9.8e-r3 >=sys-libs/ncurses-5.6-r2 archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl ) socks5? ( net-proxy/dante ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) )
 REQUIRED_USE=ruby? ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.10.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=14ac8792f489b1b306cd65d4a630b736
+_md5_=cfc9f2bd92613d6469fcdb4cbd9d1f23
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.18 b/metadata/md5-cache/net-irc/inspircd-2.0.18
index 2f629bd1f941..0046c3c7d29f 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.18
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.18
@@ -4,10 +4,10 @@ DESCRIPTION=Inspire IRCd - The Stable, High-Performance Modular IRCd
 EAPI=5
 HOMEPAGE=http://inspircd.github.com/
 IUSE=geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl ssl? ( dev-libs/openssl ) geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) tre? ( dev-libs/tre )
 SLOT=0
 SRC_URI=http://www.github.com/inspircd/inspircd/archive/v2.0.18.tar.gz -> inspircd-2.0.18.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=97b8dd458a719f436a1197112136cf88
+_md5_=13bd1b4ad4fd8d8af9b7e48f5ff4dffb
diff --git a/metadata/md5-cache/net-libs/ccrtp-2.0.9 b/metadata/md5-cache/net-libs/ccrtp-2.0.9
index cf28ac793163..6916c70451e6 100644
--- a/metadata/md5-cache/net-libs/ccrtp-2.0.9
+++ b/metadata/md5-cache/net-libs/ccrtp-2.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=GNU ccRTP is an implementation of RTP, the real-time transport proto
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/ccrtp/
 IUSE=doc
-KEYWORDS=amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-cpp/commoncpp2-1.3.0:0= dev-libs/libgcrypt:0= >=dev-libs/ucommon-5.0.0:=
 SLOT=0/2
 SRC_URI=mirror://gnu/ccrtp/ccrtp-2.0.9.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=76d45e64dc1dc1cd57c0e9066f9b8fa0
+_md5_=dfe619c9c53082bebf33dc235ca8a3d6
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.3 b/metadata/md5-cache/net-libs/farstream-0.2.3
deleted file mode 100644
index a8576160525a..000000000000
--- a/metadata/md5-cache/net-libs/farstream-0.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.3-r1 introspection? ( >=dev-libs/gobject-introspection-0.10.11 ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gtk-doc-am virtual/pkgconfig test? ( media-libs/gst-plugins-base:1.0[vorbis] media-libs/gst-plugins-good:1.0 ) app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Audio/video conferencing framework specifically designed for instant messengers
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/Farstream
-IUSE=+introspection msn test upnp
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.3-r1 introspection? ( >=dev-libs/gobject-introspection-0.10.11 ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-libnice:1.0 msn? ( media-plugins/gst-plugins-mimic:1.0 )
-RESTRICT=test
-SLOT=0.2
-SRC_URI=http://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.3.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d3512d346b65a8dec4fa38830a4a435d
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.6 b/metadata/md5-cache/net-libs/farstream-0.2.6
new file mode 100644
index 000000000000..748505405004
--- /dev/null
+++ b/metadata/md5-cache/net-libs/farstream-0.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11 ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-util/gtk-doc-am-1.18 virtual/pkgconfig test? ( media-libs/gst-plugins-base:1.0[vorbis] media-libs/gst-plugins-good:1.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Audio/video conferencing framework specifically designed for instant messengers
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/Farstream
+IUSE=+introspection msn test upnp
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11 ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-libnice:1.0 msn? ( media-plugins/gst-plugins-mimic:1.0 )
+RESTRICT=test
+SLOT=0.2
+SRC_URI=http://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.6.tar.gz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=087b0549805dfd63288cd2083967837f
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.14.3 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.14.3
new file mode 100644
index 000000000000..7af59df85429
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.14.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.35:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.1.90:3 >=x11-libs/gtk+-3.11.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) kerberos? ( app-crypt/gcr:0= app-crypt/mit-krb5 ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.3 >=dev-util/gdbus-codegen-2.30.0 >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GNOME framework for accessing online accounts
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
+IUSE=gnome +introspection kerberos debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
+RDEPEND=>=dev-libs/glib-2.35:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.1.90:3 >=x11-libs/gtk+-3.11.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) kerberos? ( app-crypt/gcr:0= app-crypt/mit-krb5 )
+SLOT=0/1
+SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.14/gnome-online-accounts-3.14.3.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=20fd39100a1165bdcfc76d38484cbcfc
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.10 b/metadata/md5-cache/net-libs/gupnp-0.20.10
deleted file mode 100644
index 1c3808d53612..000000000000
--- a/metadata/md5-cache/net-libs/gupnp-0.20.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
-EAPI=5
-HOMEPAGE=http://gupnp.org/
-IUSE=connman +introspection kernel_linux networkmanager python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0/4
-SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.10.tar.xz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=89cb8ed8403ead6bbfecc7d7e9072f88
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.12 b/metadata/md5-cache/net-libs/gupnp-0.20.12
deleted file mode 100644
index edd443efd2ae..000000000000
--- a/metadata/md5-cache/net-libs/gupnp-0.20.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.28.0:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-IUSE=connman +introspection kernel_linux networkmanager python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.28.0:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0/4
-SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.12.tar.xz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1d34716a3df43f68b30ce09e2b3f429e
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.13 b/metadata/md5-cache/net-libs/gupnp-0.20.13
new file mode 100644
index 000000000000..2afa83f3e3cf
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.14.7:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/e2fsprogs-libs-1.41.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
+IUSE=connman +introspection kernel_linux networkmanager abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.14.7:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/e2fsprogs-libs-1.41.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala
+REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( connman networkmanager )
+SLOT=0/4
+SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.13.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a1324a4d77256732ccda6dfe6aa5223e
diff --git a/metadata/md5-cache/net-libs/libnm-qt-0.9.8.2-r1 b/metadata/md5-cache/net-libs/libnm-qt-0.9.8.2-r1
deleted file mode 100644
index 885f6183a1a2..000000000000
--- a/metadata/md5-cache/net-libs/libnm-qt-0.9.8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info || ( >=net-misc/networkmanager-0.9.8.4[consolekit] >=net-misc/networkmanager-0.9.8.4[systemd] ) modemmanager? ( >=net-libs/libmm-qt-1.0.0 ) doc? ( app-doc/doxygen ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=5
-HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libnm-qt
-IUSE=debug doc modemmanager test aqua
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info || ( >=net-misc/networkmanager-0.9.8.4[consolekit] >=net-misc/networkmanager-0.9.8.4[systemd] ) modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
-SLOT=0/1
-SRC_URI=mirror://kde/unstable/networkmanager-qt/0.9.8.2/src/libnm-qt-0.9.8.2.tar.xz
-_eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=44f8ad69897803d9678f69346ed24a61
diff --git a/metadata/md5-cache/net-libs/libnm-qt-0.9.8.3 b/metadata/md5-cache/net-libs/libnm-qt-0.9.8.3
index 749f761d5a37..99414ba5e025 100644
--- a/metadata/md5-cache/net-libs/libnm-qt-0.9.8.3
+++ b/metadata/md5-cache/net-libs/libnm-qt-0.9.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager bindings for Qt
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libnm-qt
 IUSE=debug doc modemmanager test aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 net-misc/mobile-broadband-provider-info || ( >=net-misc/networkmanager-0.9.8.4[consolekit] >=net-misc/networkmanager-0.9.8.4[systemd] ) modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
 SLOT=0/1
 SRC_URI=mirror://kde/unstable/networkmanager-qt/0.9.8.3/src/libnm-qt-0.9.8.3.tar.xz
 _eclasses_=cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	deaaf624bd641762a3432753e86f1a6a	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=48e99f3d7c083c3ed1ce2339666b49fa
+_md5_=8627e404067253434cdb954eec30da25
diff --git a/metadata/md5-cache/net-libs/liboping-1.6.1 b/metadata/md5-cache/net-libs/liboping-1.6.1
deleted file mode 100644
index 76609a59af06..000000000000
--- a/metadata/md5-cache/net-libs/liboping-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-libs/ncurses perl? ( dev-lang/perl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once
-EAPI=4
-HOMEPAGE=http://verplant.org/liboping
-IUSE=perl
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=sys-libs/ncurses perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=http://verplant.org/liboping/files/liboping-1.6.1.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=22182936dcadb7fbafd4edf8de402527
diff --git a/metadata/md5-cache/net-libs/liboping-1.6.2 b/metadata/md5-cache/net-libs/liboping-1.6.2
deleted file mode 100644
index 92283b6a42e3..000000000000
--- a/metadata/md5-cache/net-libs/liboping-1.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=sys-libs/ncurses perl? ( dev-lang/perl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once
-EAPI=4
-HOMEPAGE=http://verplant.org/liboping
-IUSE=perl
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=sys-libs/ncurses perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=http://verplant.org/liboping/files/liboping-1.6.2.tar.bz2
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d3789cb07a6f292db3481858f8a213f7
diff --git a/metadata/md5-cache/net-libs/liboping-1.7.0 b/metadata/md5-cache/net-libs/liboping-1.7.0
index 71dffa3ff27d..b17a22f1bdd3 100644
--- a/metadata/md5-cache/net-libs/liboping-1.7.0
+++ b/metadata/md5-cache/net-libs/liboping-1.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=C library and ncurses based program to generate ICMP echo requests a
 EAPI=5
 HOMEPAGE=http://verplant.org/liboping
 IUSE=perl
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=sys-libs/ncurses perl? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://verplant.org/liboping/files/liboping-1.7.0.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=68e2395a3708f26dae5bb49b786d4a43
+_md5_=a67b85e4635c4bf73682918191c3f3cd
diff --git a/metadata/md5-cache/net-libs/libotr-4.1.0 b/metadata/md5-cache/net-libs/libotr-4.1.0
index 963c59121849..669cf3cc623e 100644
--- a/metadata/md5-cache/net-libs/libotr-4.1.0
+++ b/metadata/md5-cache/net-libs/libotr-4.1.0
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/libgcrypt-1.2:0 dev-libs/libgpg-error
 DESCRIPTION=(OTR) Messaging allows you to have private conversations over instant messaging
 EAPI=5
 HOMEPAGE=https://otr.cypherpunks.ca
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libgcrypt-1.2:0 dev-libs/libgpg-error
 SLOT=0
 SRC_URI=https://otr.cypherpunks.ca/libotr-4.1.0.tar.gz
-_md5_=ab03936e72a296251cc93591686da1f0
+_md5_=dfe575cc8c7183e002b6023df89f4c2b
diff --git a/metadata/md5-cache/net-misc/arm-1.4.5.0 b/metadata/md5-cache/net-misc/arm-1.4.5.0
deleted file mode 100644
index 903562dda03f..000000000000
--- a/metadata/md5-cache/net-misc/arm-1.4.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=>=net-misc/tor-0.2.1.27 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] =dev-lang/python-2.5*[ncurses] )
-DESCRIPTION=A ncurses-based status monitor for Tor relays
-EAPI=3
-HOMEPAGE=http://www.atagar.com/arm/
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=net-misc/tor-0.2.1.27 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] =dev-lang/python-2.5*[ncurses] )
-SLOT=0
-SRC_URI=http://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d6bd55d54d8eb37748cede333ee15026
diff --git a/metadata/md5-cache/net-misc/arm-1.4.5.0-r1 b/metadata/md5-cache/net-misc/arm-1.4.5.0-r1
deleted file mode 100644
index 250aa3fadfc8..000000000000
--- a/metadata/md5-cache/net-misc/arm-1.4.5.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=>=net-misc/tor-0.2.1.27 app-admin/sudo sys-apps/man sys-process/lsof net-dns/bind-tools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] =dev-lang/python-2.5*[ncurses] )
-DESCRIPTION=A ncurses-based status monitor for Tor relays
-EAPI=3
-HOMEPAGE=http://www.atagar.com/arm/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=net-misc/tor-0.2.1.27 app-admin/sudo sys-apps/man sys-process/lsof net-dns/bind-tools || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ncurses] =dev-lang/python-2.6*[ncurses] =dev-lang/python-2.5*[ncurses] )
-SLOT=0
-SRC_URI=http://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d0ffe2ff168daba38f314549c90d45f1
diff --git a/metadata/md5-cache/net-misc/arm-1.4.5.0-r2 b/metadata/md5-cache/net-misc/arm-1.4.5.0-r2
index adb75a109e94..014ff4e06678 100644
--- a/metadata/md5-cache/net-misc/arm-1.4.5.0-r2
+++ b/metadata/md5-cache/net-misc/arm-1.4.5.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A ncurses-based status monitor for Tor relays
 EAPI=5
 HOMEPAGE=http://www.atagar.com/arm/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=net-misc/tor-0.2.1.27 app-admin/sudo sys-process/lsof net-dns/bind-tools virtual/man >=dev-lang/python-2.7.5-r2:2.7[ncurses] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.atagar.com/arm/resources/static/arm-1.4.5.0.tar.bz2
 _eclasses_=distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=55ff3b9a14e0765cb6dc707992a8e5c0
+_md5_=b612d0da23f7703e55bc895923f4baf6
diff --git a/metadata/md5-cache/net-misc/libreswan-3.10 b/metadata/md5-cache/net-misc/libreswan-3.10
index 7d25e398280b..7efffee45dbb 100644
--- a/metadata/md5-cache/net-misc/libreswan-3.10
+++ b/metadata/md5-cache/net-misc/libreswan-3.10
@@ -4,10 +4,10 @@ DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=5
 HOMEPAGE=https://libreswan.org/
 IUSE=caps curl dnssec ldap pam
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2 BSD-4 RSA DES
 RDEPEND=dev-libs/gmp dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-misc/strongswan
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-3.10.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3a6e14365233aa1f1373110ddf340323
+_md5_=90a9bb292bb92a14386c7dd311fddaea
diff --git a/metadata/md5-cache/net-misc/lldpd-0.7.11-r3 b/metadata/md5-cache/net-misc/lldpd-0.7.11-r3
index 28c9f9c195aa..3247283f6475 100644
--- a/metadata/md5-cache/net-misc/lldpd-0.7.11-r3
+++ b/metadata/md5-cache/net-misc/lldpd-0.7.11-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=5
 HOMEPAGE=http://vincentbernat.github.com/lldpd/
 IUSE=cdp doc +dot1 +dot3 edp fdp graph jansson json-c +lldpmed seccomp sonmp snmp static-libs readline xml zsh-completion
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.5 snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) json-c? ( dev-libs/json-c ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=graph? ( doc ) json-c? ( !jansson )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-0.7.11.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=49f1a3ba7fae23a1cbffbd1b9e9cb387
+_md5_=83152ac6e15281e81d886f84aa6ec0a9
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1 b/metadata/md5-cache/net-misc/modemmanager-1.4.2
similarity index 66%
rename from metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
rename to metadata/md5-cache/net-misc/modemmanager-1.4.2
index da6a9208136f..a7131efa4d5f 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.10 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
 IUSE=+introspection mbim policykit +qmi qmi-newest vala
-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/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= )
+RDEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.10 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= )
 REQUIRED_USE=qmi-newest? ( qmi ) vala? ( introspection )
 SLOT=0/1
-SRC_URI=http://www.freedesktop.org/software/ModemManager/ModemManager-1.2.0.tar.xz
+SRC_URI=http://www.freedesktop.org/software/ModemManager/ModemManager-1.4.2.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bc9bcdb240bbe12aed41c9574c42cc43
+_md5_=9d94636e8a07d929abf414882c3416a4
diff --git a/metadata/md5-cache/net-misc/packETH-1.7.3 b/metadata/md5-cache/net-misc/packETH-1.7.3
index 9befadcb347a..353dd83531f9 100644
--- a/metadata/md5-cache/net-misc/packETH-1.7.3
+++ b/metadata/md5-cache/net-misc/packETH-1.7.3
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 !<s
 DESCRIPTION=Packet generator tool for ethernet
 EAPI=5
 HOMEPAGE=http://packeth.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/packeth/packETH-1.7.3.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9919ef003a94256934bed2405874f8ec
+_md5_=8da3d45291b9062a0a8117b0871452cd
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.3 b/metadata/md5-cache/net-misc/rdesktop-1.8.3
index 5b638f407d46..34bb7df2fe13 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.3
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=A Remote Desktop Protocol Client
 EAPI=5
 HOMEPAGE=http://rdesktop.sourceforge.net/
 IUSE=alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( net-libs/libgssglue ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/rdesktop/rdesktop-1.8.3.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=00f032880add578b5089fa0b7b01ff53
+_md5_=7f70b414dc3c491599d44a6cca526ef1
diff --git a/metadata/md5-cache/net-misc/stunnel-5.08 b/metadata/md5-cache/net-misc/stunnel-5.08
index 47cdfd0ab0f1..7336c8e158d6 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.08
+++ b/metadata/md5-cache/net-misc/stunnel-5.08
@@ -4,10 +4,10 @@ DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
 IUSE=ipv6 selinux tcpd ssl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/openssl selinux? ( sec-policy/selinux-stunnel )
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.08.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.08.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.08.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.08.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.08.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.08.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.08.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2b40945102bb7eab168b8bca03b34689
+_md5_=581a5ccfc5a4b344a27b1d7bc302d033
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.0.3.1 b/metadata/md5-cache/net-misc/x2goclient-4.0.3.1
index bfcc0b08642e..7830b8777dcb 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.0.3.1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.0.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=The X2Go Qt client
 EAPI=5
 HOMEPAGE=http://www.x2go.org
 IUSE=ldap nsplugin
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libssh-0.6.0_rc1 net-print/cups dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtsvg:4 ldap? ( net-nds/openldap ) net-misc/nx
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.0.3.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=259d1061fa4f3cec8050a9dfe7dab988
+_md5_=520765e6af2e780d2045d0505505e30e
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.01.16 b/metadata/md5-cache/net-misc/youtube-dl-2015.01.25
similarity index 95%
rename from metadata/md5-cache/net-misc/youtube-dl-2015.01.16
rename to metadata/md5-cache/net-misc/youtube-dl-2015.01.25
index 10ddeab1822c..63dd209c6b16 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2015.01.16
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.01.25
@@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2015.01.16/youtube-dl-2015.01.16.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2015.01.25/youtube-dl-2015.01.25.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	5cf77567a87c3a6f59d6a51848ebde98	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0824b6b9f8d78155592a80c046964b7e
+_md5_=e25bce53d9a798d6dcbf5661de9927b8
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
index 983aa2f88b2d..05575c3b5e4e 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
@@ -3,11 +3,11 @@ DEPEND=net-print/cups dev-lang/perl:=[-build(-)]
 DESCRIPTION=Generates ppds out of xml foomatic printer description files
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.11.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d5bccc8a8f74554672dba2f41820636a
+_md5_=0f9dab3deaa05275d5a2d0b880daa78e
diff --git a/metadata/md5-cache/net-print/gtklp-1.3.1 b/metadata/md5-cache/net-print/gtklp-1.3.1
index 6e9ce112e9fb..6cdfbc48566b 100644
--- a/metadata/md5-cache/net-print/gtklp-1.3.1
+++ b/metadata/md5-cache/net-print/gtklp-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=A GUI for cupsd
 EAPI=5
 HOMEPAGE=http://gtklp.sirtobi.com/
 IUSE=nls ssl
-KEYWORDS=amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 >=net-print/cups-1.6 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtklp/gtklp-1.3.1.src.tar.gz mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=85d72dd0b56ad41cbe344d47cb980ebb
+_md5_=6706004db88e1f3f59bbf9f36fa5c236
diff --git a/metadata/md5-cache/net-wireless/iw-3.17 b/metadata/md5-cache/net-wireless/iw-3.17
index 415573c67c93..48aaf400ecc5 100644
--- a/metadata/md5-cache/net-wireless/iw-3.17
+++ b/metadata/md5-cache/net-wireless/iw-3.17
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libnl virtual/pkgconfig
 DESCRIPTION=nl80211-based configuration utility for wireless devices using the mac80211 kernel stack
 EAPI=5
 HOMEPAGE=http://wireless.kernel.org/en/users/Documentation/iw
-KEYWORDS=amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 RDEPEND=dev-libs/libnl
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/iw/iw-3.17.tar.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=18473080406259159debb5169fee3eec
+_md5_=0baafc000f30fb8a99202a040614910c
diff --git a/metadata/md5-cache/sci-biology/rebase-1411 b/metadata/md5-cache/sci-biology/rebase-1411
deleted file mode 100644
index 3d463783aafa..000000000000
--- a/metadata/md5-cache/sci-biology/rebase-1411
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
-DESCRIPTION=A restriction enzyme database
-EAPI=5
-HOMEPAGE=http://rebase.neb.com
-IUSE=emboss minimal
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/rebase-1411.tar.xz
-_md5_=21aa8b797c31bd1098f96c16cd745eb9
diff --git a/metadata/md5-cache/sci-biology/rebase-1412 b/metadata/md5-cache/sci-biology/rebase-1412
index 690c3fda48a2..5c3aa282eeea 100644
--- a/metadata/md5-cache/sci-biology/rebase-1412
+++ b/metadata/md5-cache/sci-biology/rebase-1412
@@ -4,10 +4,10 @@ DESCRIPTION=A restriction enzyme database
 EAPI=5
 HOMEPAGE=http://rebase.neb.com
 IUSE=emboss minimal
-KEYWORDS=amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=emboss? ( >=sci-biology/emboss-5.0.0 )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/rebase-1412.tar.xz
-_md5_=bbd46439d3b79b9bd9f0ea9a6d58a957
+_md5_=40265e6fd15cc4a4d310e118ed40acce
diff --git a/metadata/md5-cache/sci-electronics/geda-1.8.2 b/metadata/md5-cache/sci-electronics/geda-1.8.2
index 7b3c8ec66262..6bc0d06fb57e 100644
--- a/metadata/md5-cache/sci-electronics/geda-1.8.2
+++ b/metadata/md5-cache/sci-electronics/geda-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=GPL Electronic Design Automation (gEDA):gaf core package
 EAPI=4
 HOMEPAGE=http://www.gpleda.org/
 IUSE=debug doc examples nls stroke threads
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 >=x11-libs/cairo-1.2.0 >=dev-scheme/guile-1.8[deprecated] nls? ( virtual/libintl ) stroke? ( >=dev-libs/libstroke-0.5.1 ) sci-electronics/electronics-menu
 SLOT=0
 SRC_URI=http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3289957ef6a8affb218993bff956cac3
+_md5_=0a9529696a9a4e62c1fd1800dff3d4b9
diff --git a/metadata/md5-cache/sci-libs/arpack-3.1.3-r1 b/metadata/md5-cache/sci-libs/arpack-3.1.3-r1
index 7717f8bea4a6..9372ec0b900c 100644
--- a/metadata/md5-cache/sci-libs/arpack-3.1.3-r1
+++ b/metadata/md5-cache/sci-libs/arpack-3.1.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Arnoldi package library to solve large scale eigenvalue problems
 EAPI=5
 HOMEPAGE=http://www.caam.rice.edu/software/ARPACK/ http://forge.scilab.org/index.php/p/arpack-ng/
 IUSE=doc examples mpi static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) virtual/fortran
 SLOT=0
 SRC_URI=http://forge.scilab.org/upload/arpack-ng/files/arpack-ng-3.1.3.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6d32b3e597b9fb43dc56e98c64502576
+_md5_=5810d1d6fa7052aa6b1ca277bc6c6a35
diff --git a/metadata/md5-cache/sci-libs/cgcode-1.0-r2 b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
index 695675a1b92e..c9c31be61dad 100644
--- a/metadata/md5-cache/sci-libs/cgcode-1.0-r2
+++ b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/blas virtual/pkgconfig virtual/fortran
 DESCRIPTION=Conjugate gradient Codes for large sparse linear systems
 EAPI=5
 HOMEPAGE=http://fetk.org/codes/cgcode/index.html
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/cgcode-1.0.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8b5e6708de23d6253847cf5ce507c347
+_md5_=36b3b346319f8ab3e98b40441dd32cbc
diff --git a/metadata/md5-cache/sci-libs/inchi-1.04 b/metadata/md5-cache/sci-libs/inchi-1.04
index fc3dd747b3c5..db92bfae37dc 100644
--- a/metadata/md5-cache/sci-libs/inchi-1.04
+++ b/metadata/md5-cache/sci-libs/inchi-1.04
@@ -4,9 +4,9 @@ DESCRIPTION=A program and library for generating standard and non-standard InChI
 EAPI=5
 HOMEPAGE=http://www.iupac.org/inchi/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=IUPAC-InChi
 SLOT=0
 SRC_URI=http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-API.ZIP -> inchi-1.04.zip doc? ( http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-DOC.ZIP -> inchi-1.04-doc.zip )
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d2264842c47f81ff94355f90c08b4b0d
+_md5_=4b1dc3392554e45028232a13b9abed58
diff --git a/metadata/md5-cache/sci-libs/metis-4.0.3 b/metadata/md5-cache/sci-libs/metis-4.0.3
index 3fbb91177ed5..20de61766d66 100644
--- a/metadata/md5-cache/sci-libs/metis-4.0.3
+++ b/metadata/md5-cache/sci-libs/metis-4.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A package for unstructured serial graph partitioning
 EAPI=5
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/metis/
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/metis-4.0.3.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2acaf044e20743e11b4dd21d468bc149
+_md5_=a06dbeeaeeac8350ddfec363a07f1229
diff --git a/metadata/md5-cache/sci-libs/parmetis-3.2.0 b/metadata/md5-cache/sci-libs/parmetis-3.2.0
index 1a8633a094f5..ddea2d9ac6bf 100644
--- a/metadata/md5-cache/sci-libs/parmetis-3.2.0
+++ b/metadata/md5-cache/sci-libs/parmetis-3.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel graph partitioner
 EAPI=5
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/parmetis/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 RDEPEND=virtual/mpi !sci-libs/metis
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD/ParMetis-3.2.0.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d47a00a6767f75017aa77452bc0378f4
+_md5_=4687df6a3122b5f36ad17f4d4ee51f77
diff --git a/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1 b/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1
index 5539cf95174d..d9cbc0c7ae06 100644
--- a/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1
+++ b/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1
@@ -3,9 +3,9 @@ DESCRIPTION=Common configurations for all packages in suitesparse
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/SuiteSparse_config
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/suitesparseconfig-4.2.1.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e0cebbe360cd8d1124b116f939c3c503
+_md5_=f4eb90fa5d388311b6e1b835f5eb4db6
diff --git a/metadata/md5-cache/sci-libs/superlu-4.1-r1 b/metadata/md5-cache/sci-libs/superlu-4.1-r1
deleted file mode 100644
index 3a41f710b8e6..000000000000
--- a/metadata/md5-cache/sci-libs/superlu-4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=virtual/blas virtual/pkgconfig test? ( app-shells/tcsh ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
-DESCRIPTION=Sparse LU factorization library
-EAPI=2
-HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
-IUSE=doc examples static-libs test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=virtual/blas virtual/fortran
-SLOT=0
-SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.1.tar.gz
-_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f3d97c9df9e9b4c21c741250774a4cef
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3 b/metadata/md5-cache/sci-libs/superlu-4.3
index f3e8c987652e..22d6761d1aa5 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3
+++ b/metadata/md5-cache/sci-libs/superlu-4.3
@@ -4,10 +4,10 @@ DESCRIPTION=Sparse LU factorization library
 EAPI=5
 HOMEPAGE=http://crd.lbl.gov/~xiaoye/SuperLU/
 IUSE=doc examples static-libs test
-KEYWORDS=amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.3.tar.gz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	autotools-utils	3727db64c7b960903d5033280f108080	eutils	998e5931fb95b10a6a11ec796ada2759	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f94b1b93a2c0ccff4a4cdb6598bbfeee
+_md5_=07a6f98621cbff201f61bb94be44de02
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.37 b/metadata/md5-cache/sys-apps/accountsservice-0.6.40
similarity index 92%
rename from metadata/md5-cache/sys-apps/accountsservice-0.6.37
rename to metadata/md5-cache/sys-apps/accountsservice-0.6.40
index 47447cc9819b..c46dc45ca721 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.37
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.40
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/AccountsService/
 IUSE=doc +introspection selinux systemd
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.37.3:2 sys-auth/polkit introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) systemd? ( >=sys-apps/systemd-186:0= ) !systemd? ( sys-auth/consolekit ) selinux? ( sec-policy/selinux-accountsd )
 SLOT=0
-SRC_URI=http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz
+SRC_URI=http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.40.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=be00e6dbce438943d4864c973a9e5f6b
+_md5_=9498fa5f4b9cb4c5b396d27826448848
diff --git a/metadata/md5-cache/sys-apps/biosdevname-0.6.1 b/metadata/md5-cache/sys-apps/biosdevname-0.6.1
index 007ac71eac53..3eda360e19b2 100644
--- a/metadata/md5-cache/sys-apps/biosdevname-0.6.1
+++ b/metadata/md5-cache/sys-apps/biosdevname-0.6.1
@@ -3,10 +3,10 @@ DEPEND=virtual/udev sys-apps/pciutils virtual/pkgconfig
 DESCRIPTION=Sets BIOS-given device names instead of kernel eth* names
 EAPI=4
 HOMEPAGE=http://linux.dell.com/biosdevname/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://linux.dell.com/biosdevname/biosdevname-0.6.1/biosdevname-0.6.1.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=774c09f4c989b99b9881363bb6beaa2b
+_md5_=4062ff9ce9e650e21a3e3737d2c965e1
diff --git a/metadata/md5-cache/sys-apps/iproute2-3.17.0 b/metadata/md5-cache/sys-apps/iproute2-3.17.0
index 0f1738b348b2..e81ea3261732 100644
--- a/metadata/md5-cache/sys-apps/iproute2-3.17.0
+++ b/metadata/md5-cache/sys-apps/iproute2-3.17.0
@@ -4,10 +4,10 @@ DESCRIPTION=kernel routing and traffic control utilities
 EAPI=5
 HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 IUSE=atm berkdb +iptables ipv6 minimal selinux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.20:= ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.17.0.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=12a2e7b2dcab3e1d8eda57dd678a6a9e
+_md5_=d8076e1326813f3afd4512540c500489
diff --git a/metadata/md5-cache/sys-apps/usbutils-008 b/metadata/md5-cache/sys-apps/usbutils-008
index 2c59f0c5f066..61efa21bad15 100644
--- a/metadata/md5-cache/sys-apps/usbutils-008
+++ b/metadata/md5-cache/sys-apps/usbutils-008
@@ -4,11 +4,11 @@ DESCRIPTION=USB enumeration utilities
 EAPI=5
 HOMEPAGE=http://linux-usb.sourceforge.net/
 IUSE=python zlib python_targets_python2_7
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= zlib? ( sys-libs/zlib:= ) sys-apps/hwids python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-008.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=01f5a1813a7c100d9200a1f239b9a0c3
+_md5_=c642c0053ed38b7ac74a101410a9d968
diff --git a/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1 b/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
index 215044a532e0..88095467052e 100644
--- a/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
+++ b/metadata/md5-cache/sys-block/mpt-status-1.2.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Query tool to access the running configuration and status of LSI SCSI HBAs
 EAPI=5
 HOMEPAGE=http://www.drugphish.ch/~ratz/mpt-status/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.drugphish.ch/~ratz/mpt-status/mpt-status-1.2.0.tar.bz2 mirror://gentoo/mpt-status-1.2.0-linux-sources.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ea74f04e0bf8ca7f8d55d0d34be3d221
+_md5_=e2cecfe75df30234fd5051c61b658d7f
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.4.0 b/metadata/md5-cache/sys-block/ms-sys-2.4.0
index 4df34667cb4b..46ffb033bee4 100644
--- a/metadata/md5-cache/sys-block/ms-sys-2.4.0
+++ b/metadata/md5-cache/sys-block/ms-sys-2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line program for writing Microsoft compatible boot records
 EAPI=5
 HOMEPAGE=http://ms-sys.sourceforge.net
 IUSE=linguas_sv
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.4.0.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=43b85341686683372d11c8e8dc8fe86f
+_md5_=45240ee9a95522aa440c086bbb2aea59
diff --git a/metadata/md5-cache/sys-cluster/ploop-1.12 b/metadata/md5-cache/sys-cluster/ploop-1.12
index 60739c700687..e2cc6205fedf 100644
--- a/metadata/md5-cache/sys-cluster/ploop-1.12
+++ b/metadata/md5-cache/sys-cluster/ploop-1.12
@@ -4,10 +4,10 @@ DESCRIPTION=openvz tool and a library to control ploop block devices
 EAPI=5
 HOMEPAGE=http://wiki.openvz.org/Download/ploop
 IUSE=debug static-libs
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 !<sys-cluster/vzctl-4.5 sys-block/parted sys-fs/e2fsprogs sys-process/lsof sys-apps/findutils
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/ploop/1.12/src/ploop-1.12.tar.bz2
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=105bef61d0ddbb17d9b802398f9ad5c8
+_md5_=d65f6ca4baf500f38d0aac377bb26998
diff --git a/metadata/md5-cache/sys-devel/bin86-0.16.21 b/metadata/md5-cache/sys-devel/bin86-0.16.21
index 6e0517d96ebb..25f11ee2b798 100644
--- a/metadata/md5-cache/sys-devel/bin86-0.16.21
+++ b/metadata/md5-cache/sys-devel/bin86-0.16.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Assembler and loader used to create kernel bootsector
 EAPI=5
 HOMEPAGE=http://v3.sk/~lkundrak/dev86/
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://v3.sk/~lkundrak/dev86/bin86-0.16.21.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dbd1ed226f3a66f532342d27fc7d96ce
+_md5_=374d052e3b0311625406727098749948
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.4 b/metadata/md5-cache/sys-devel/libtool-2.4.4
index 1841aea901d9..cd7846a00c46 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.4
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.4
@@ -4,10 +4,10 @@ DESCRIPTION=A shared library tool for developers
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/libtool/
 IUSE=vanilla
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.4.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=dcec1e5ab36f64f010c61af171080224
+_md5_=9a5432dc7f3ca0099d4baf48f767004d
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r2 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r2
deleted file mode 100644
index 883aa7130b37..000000000000
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Provides a caching directory on an already mounted filesystem
-EAPI=5
-HOMEPAGE=http://people.redhat.com/~dhowells/fscache/
-IUSE=doc selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-cachefilesd )
-SLOT=0
-SRC_URI=http://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.5.tar.bz2 -> cachefilesd-0.10.5.tar
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f5eeab5bd6e66ef205926e0aa799bf34
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r3 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r3
deleted file mode 100644
index a344d4cc1ecb..000000000000
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Provides a caching directory on an already mounted filesystem
-EAPI=5
-HOMEPAGE=http://people.redhat.com/~dhowells/fscache/
-IUSE=doc selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-cachefilesd )
-SLOT=0
-SRC_URI=http://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.5.tar.bz2 -> cachefilesd-0.10.5.tar
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=bea4133af48e5e22ac6a190a5847f378
diff --git a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4 b/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
index f4081c6e8ae9..f185c5684722 100644
--- a/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
+++ b/metadata/md5-cache/sys-fs/cachefilesd-0.10.5-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Provides a caching directory on an already mounted filesystem
 EAPI=5
 HOMEPAGE=http://people.redhat.com/~dhowells/fscache/
 IUSE=doc selinux
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-cachefilesd )
 SLOT=0
 SRC_URI=http://people.redhat.com/~dhowells/fscache/cachefilesd-0.10.5.tar.bz2 -> cachefilesd-0.10.5.tar
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cd202f394cf5a4ebd1bcd189af5248d2
+_md5_=b83c0e7e5de7bad3276a9eda72672606
diff --git a/metadata/md5-cache/sys-fs/ext4magic-0.3.0 b/metadata/md5-cache/sys-fs/ext4magic-0.3.0
deleted file mode 100644
index 13d61ed7043d..000000000000
--- a/metadata/md5-cache/sys-fs/ext4magic-0.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-arch/bzip2 >=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fsprogs-1.41.9 sys-libs/zlib
-DESCRIPTION=Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems
-EAPI=4
-HOMEPAGE=http://developer.berlios.de/projects/ext4magic/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 >=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fsprogs-1.41.9 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://berlios/ext4magic/ext4magic-0.3.0.tar.gz
-_md5_=37a83988b78b3ddafd0c20e8c9e59cf8
diff --git a/metadata/md5-cache/sys-fs/ext4magic-0.3.1-r1 b/metadata/md5-cache/sys-fs/ext4magic-0.3.1-r1
deleted file mode 100644
index d9f7870b8a40..000000000000
--- a/metadata/md5-cache/sys-fs/ext4magic-0.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-arch/bzip2 >=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fsprogs-1.41.9 sys-libs/zlib
-DESCRIPTION=Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems
-EAPI=5
-HOMEPAGE=http://developer.berlios.de/projects/ext4magic/
-IUSE=debug expert-mode file-attr
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 >=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fsprogs-1.41.9 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://berlios/ext4magic/ext4magic-0.3.1.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9adc1a09d31cbef5ed323f9e06a4e784
diff --git a/metadata/md5-cache/sys-kernel/git-sources-3.19_rc6 b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc6
new file mode 100644
index 000000000000..698af28b0d9d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-3.19_rc6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/patch-2.7.1-r3 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.19_rc6
+SRC_URI=mirror://kernel/linux/kernel/v3.x/testing/patch-3.19-rc6.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	kernel-2	e0363401e3e385deca89bb9a22b528bb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b676a950e8412cfedd2e1f5acdfa87a2
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.3-r2 b/metadata/md5-cache/sys-libs/libselinux-2.3-r2
index 839f9470c892..e1aa1a3bb601 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.3-r2
+++ b/metadata/md5-cache/sys-libs/libselinux-2.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux userland library
 EAPI=5
 HOMEPAGE=http://userspace.selinuxproject.org
 IUSE=python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1[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(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/libselinux-2.3.tar.gz http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-libselinux-4.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d1beadfb79b1bf277a44e49a6bf4ef70
+_md5_=5eb15fa5fe436033eeed328360a5707a
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.3-r4 b/metadata/md5-cache/sys-libs/libsemanage-2.3-r4
index d4c9f9942667..7ee2ef830962 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-2.3-r4
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.3-r4
@@ -4,11 +4,11 @@ DESCRIPTION=SELinux kernel and policy management library
 EAPI=5
 HOMEPAGE=http://userspace.selinuxproject.org
 IUSE=python python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/libsemanage-2.3.tar.gz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	236a8d81f730332749bd484d8b53ee91	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=881bfbf54a8b53c59e9feebd68c51dfb
+_md5_=a99ffe2e6980fd451e712cd23e1c3513
diff --git a/metadata/md5-cache/www-client/chromium-41.0.2272.12 b/metadata/md5-cache/www-client/chromium-41.0.2272.12
deleted file mode 100644
index 86dacfe1a451..000000000000
--- a/metadata/md5-cache/www-client/chromium-41.0.2272.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-41.0.2272.12-lite.tar.xz
-_eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=22d2e063819ec4c0173fc259197eb990
diff --git a/metadata/md5-cache/www-client/chromium-41.0.2272.3 b/metadata/md5-cache/www-client/chromium-41.0.2272.16
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-41.0.2272.3
rename to metadata/md5-cache/www-client/chromium-41.0.2272.16
index 4aac4d50e315..40a95692fc07 100644
--- a/metadata/md5-cache/www-client/chromium-41.0.2272.3
+++ b/metadata/md5-cache/www-client/chromium-41.0.2272.16
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( dev-libs/libgcrypt:0= >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-41.0.2272.3-lite.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-41.0.2272.16-lite.tar.xz
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3a0accf620d8d09f3ac006bb03de904c
+_md5_=78d2e8392953fe48501a7020f3951510
diff --git a/metadata/md5-cache/www-client/surfraw-2.2.9-r1 b/metadata/md5-cache/www-client/surfraw-2.2.9-r1
index 88db9105f9b3..c7f7cc1ffc83 100644
--- a/metadata/md5-cache/www-client/surfraw-2.2.9-r1
+++ b/metadata/md5-cache/www-client/surfraw-2.2.9-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst preinst prepare
 DESCRIPTION=A fast unix command line interface to WWW
 EAPI=5
 HOMEPAGE=http://surfraw.alioth.debian.org/
-KEYWORDS=amd64 hppa ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
 RDEPEND=dev-lang/perl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f8c3a63170ee9a84c159af4e79383f6a
+_md5_=8b3ae554dea0454ef8a368dd1cbafe75
diff --git a/metadata/md5-cache/www-servers/thin-1.5.1-r1 b/metadata/md5-cache/www-servers/thin-1.5.1-r1
deleted file mode 100644
index 1c2631cc0690..000000000000
--- a/metadata/md5-cache/www-servers/thin-1.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel test? ( ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( dev-ruby/rspec:0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=A fast and very simple Ruby web server
-EAPI=5
-HOMEPAGE=http://code.macournoyer.com/thin/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=https://github.com/macournoyer/thin/archive/v1.5.1.tar.gz -> thin-1.5.1.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=edee81ca7cef0cae9f276125dd48f757
diff --git a/metadata/md5-cache/www-servers/thin-1.5.1-r2 b/metadata/md5-cache/www-servers/thin-1.5.1-r2
deleted file mode 100644
index 48f03068e688..000000000000
--- a/metadata/md5-cache/www-servers/thin-1.5.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel test? ( ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( dev-ruby/rspec:0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=A fast and very simple Ruby web server
-EAPI=5
-HOMEPAGE=http://code.macournoyer.com/thin/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=https://github.com/macournoyer/thin/archive/v1.5.1.tar.gz -> thin-1.5.1.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4aa62fb773992e515349ebecf495726f
diff --git a/metadata/md5-cache/www-servers/thin-1.5.1-r3 b/metadata/md5-cache/www-servers/thin-1.5.1-r3
deleted file mode 100644
index 7c8bdc7c9d0f..000000000000
--- a/metadata/md5-cache/www-servers/thin-1.5.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel test? ( ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( dev-ruby/rspec:0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=A fast and very simple Ruby web server
-EAPI=5
-HOMEPAGE=http://code.macournoyer.com/thin/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-0.12.6[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=https://github.com/macournoyer/thin/archive/v1.5.1.tar.gz -> thin-1.5.1.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d669dff26d32d28861ebcb4c386290d6
diff --git a/metadata/md5-cache/www-servers/thin-1.6.2 b/metadata/md5-cache/www-servers/thin-1.6.2
deleted file mode 100644
index 938495505fa0..000000000000
--- a/metadata/md5-cache/www-servers/thin-1.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel test? ( ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby20] virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( dev-ruby/rspec:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby20] virtual/ruby-ssl[ruby_targets_ruby20] dev-ruby/rake-compiler[ruby_targets_ruby20] test? ( dev-ruby/rspec:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/rake-compiler[ruby_targets_ruby21] test? ( dev-ruby/rspec:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A fast and very simple Ruby web server
-EAPI=5
-HOMEPAGE=http://code.macournoyer.com/thin/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby20] virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/eventmachine-1.0.0[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=https://github.com/macournoyer/thin/archive/v1.6.2.tar.gz -> thin-1.6.2.tar.gz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=589b57c89f63c4f77b6d9e991aa42f4e
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.1.26 b/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
new file mode 100644
index 000000000000..a7bfb093102e
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.1.26
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2= x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord:=[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GTK support library for colord
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/software/colord/
+IUSE=doc +introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2= x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord:=[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) !<x11-misc/colord-0.1.27
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=0/1
+SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-gtk-0.1.26.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3ba16d9d5173f40674398849c9af7824
diff --git a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.34.9 b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.34.9
index a1338f870355..c31223cfe42b 100644
--- a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.34.9
+++ b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.34.9
@@ -10,4 +10,4 @@ RDEPEND=!<x11-libs/vte-0.27.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/vte/0.34/vte-0.34.9.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=72666ee68f5ff4cf6d52bb14c694d739
+_md5_=3d3281008fd2cc2d4fdaa0364cb51123
diff --git a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.2 b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3
similarity index 89%
rename from metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.2
rename to metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3
index a02b6cfcb3f3..958c58cc014b 100644
--- a/metadata/md5-cache/x11-libs/gnome-pty-helper-0.36.2
+++ b/metadata/md5-cache/x11-libs/gnome-pty-helper-0.38.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f
 LICENSE=LGPL-2
 RDEPEND=!<x11-libs/vte-0.27.90
 SLOT=0
-SRC_URI=mirror://gnome/sources/vte/0.36/vte-0.36.2.tar.xz
+SRC_URI=mirror://gnome/sources/vte/0.38/vte-0.38.3.tar.xz
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e6a3e11e213f2e0c6bec9f58fbd48faf
+_md5_=935958f03a60ec8048a2ae12e8d1f16c
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.14.7 b/metadata/md5-cache/x11-libs/gtk+-3.14.7
new file mode 100644
index 000000000000..798d9adf45e9
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtk+-3.14.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/atk-2.12[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.41.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.7[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( >=dev-libs/wayland-1.5.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.38.2 >=dev-util/gtk-doc-am-1.20 sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/damageproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-proto/xineramaproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Gimp ToolKit +
+EAPI=5
+HOMEPAGE=http://www.gtk.org/
+IUSE=aqua cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
+RDEPEND=>=dev-libs/atk-2.12[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.41.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.7[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( >=dev-libs/wayland-1.5.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 >=x11-themes/adwaita-icon-theme-3.14 X? ( !<x11-base/xorg-server-1.11.4 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
+REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
+SLOT=3
+SRC_URI=mirror://gnome/sources/gtk+/3.14/gtk+-3.14.7.tar.xz
+_eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=7013e75006d3b699299f6bf9c830daed
diff --git a/metadata/md5-cache/x11-libs/libQGLViewer-2.5.4 b/metadata/md5-cache/x11-libs/libQGLViewer-2.5.4
deleted file mode 100644
index 96c134fa5823..000000000000
--- a/metadata/md5-cache/x11-libs/libQGLViewer-2.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/opengl dev-qt/qtopengl:4 dev-qt/qtgui:4
-DESCRIPTION=C++ library based on Qt that eases the creation of OpenGL 3D viewers
-EAPI=5
-HOMEPAGE=http://www.libqglviewer.com
-IUSE=designer examples
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=virtual/opengl dev-qt/qtopengl:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 )
-SLOT=0
-SRC_URI=http://www.libqglviewer.com/src/libQGLViewer-2.5.4.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=8a0eb8dc0e9e102754c9248e828fbe49
diff --git a/metadata/md5-cache/x11-libs/libQGLViewer-2.5.3 b/metadata/md5-cache/x11-libs/libQGLViewer-2.6.1
similarity index 67%
rename from metadata/md5-cache/x11-libs/libQGLViewer-2.5.3
rename to metadata/md5-cache/x11-libs/libQGLViewer-2.6.1
index 53c241a21698..cd07cb388a7f 100644
--- a/metadata/md5-cache/x11-libs/libQGLViewer-2.5.3
+++ b/metadata/md5-cache/x11-libs/libQGLViewer-2.6.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/opengl dev-qt/qtopengl:4 dev-qt/qtgui:4
+DEPEND=virtual/opengl virtual/glu dev-qt/qtopengl:4 dev-qt/qtgui:4
 DESCRIPTION=C++ library based on Qt that eases the creation of OpenGL 3D viewers
 EAPI=5
 HOMEPAGE=http://www.libqglviewer.com
 IUSE=designer examples
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=virtual/opengl dev-qt/qtopengl:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 )
+RDEPEND=virtual/opengl virtual/glu dev-qt/qtopengl:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 )
 SLOT=0
-SRC_URI=http://www.libqglviewer.com/src/libQGLViewer-2.5.3.tar.gz
+SRC_URI=http://www.libqglviewer.com/src/libQGLViewer-2.6.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=60bb5f19f577dfbdeaa28ccb0bed1eb2
+_md5_=d6e6ac99520fa6505dc8fb149f646238
diff --git a/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92-r1 b/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92-r1
index 430d4e243350..d1536debb4c0 100644
--- a/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92-r1
+++ b/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A desktop-agnostic library for GLib-based projects
 EAPI=5
 HOMEPAGE=https://launchpad.net/libdesktop-agnostic
 IUSE=debug +gconf glade gnome +introspection python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 gconf? ( gnome-base/gconf:2 ) glade? ( gnome-base/libglade:2.0 ) gnome? ( gnome-base/gnome-desktop:2 ) >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://launchpad.net/libdesktop-agnostic/0.4/0.3.92/+download/libdesktop-agnostic-0.3.92.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	998e5931fb95b10a6a11ec796ada2759	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=a580f0c4ec78f920174550cd25453bf2
+_md5_=a5f0e737335a92dfbc6a705fa3cb4e88
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.4-r3 b/metadata/md5-cache/x11-libs/motif-2.3.4-r3
index 527ae79e0ed7..dc674b81aa3b 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.4-r3
+++ b/metadata/md5-cache/x11-libs/motif-2.3.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=The Motif user interface component toolkit
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/motif/ http://motif.ics.com/
 IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXp-1.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.4%20Source%20Code/motif-2.3.4-src.tgz mirror://gentoo/motif-2.3.4-patches-1.tar.xz
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=94ca96c89a529047c67a7f1f731aee0c
+_md5_=11915187ce0523883050841d538eb507
diff --git a/metadata/md5-cache/x11-libs/vte-0.36.2 b/metadata/md5-cache/x11-libs/vte-0.36.2
deleted file mode 100644
index add7546cee7b..000000000000
--- a/metadata/md5-cache/x11-libs/vte-0.36.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31.13:2 >=x11-libs/gtk+-3.1.9:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Library providing a virtual terminal emulator widget
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
-IUSE=debug glade +introspection debug
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND==x11-libs/gnome-pty-helper-0.36.2
-RDEPEND=>=dev-libs/glib-2.31.13:2 >=x11-libs/gtk+-3.1.9:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-SLOT=2.90
-SRC_URI=mirror://gnome/sources/vte/0.36/vte-0.36.2.tar.xz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9022609444411e911c9b7bf93fde4d25
diff --git a/metadata/md5-cache/x11-libs/vte-0.38.3 b/metadata/md5-cache/x11-libs/vte-0.38.3
new file mode 100644
index 000000000000..228992cb7e13
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/vte-0.38.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.8:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) || ( dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
+IUSE=debug glade +introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+PDEPEND=>=x11-libs/gnome-pty-helper-0.38.3
+RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.8:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !x11-libs/vte:2.90[glade]
+SLOT=2.91
+SRC_URI=mirror://gnome/sources/vte/0.38/vte-0.38.3.tar.xz
+_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	29582087e5f16ca16b1c6815c2ae2b65	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=9e9d020849cf232f07a96069f1897639
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.45 b/metadata/md5-cache/x11-misc/xlockmore-5.45
index ff2f5b420f19..33cba01fbf66 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.45
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.45
@@ -4,11 +4,11 @@ DESCRIPTION=Just another screensaver application for X
 EAPI=5
 HOMEPAGE=http://www.tux.org/~bagleyd/xlockmore.html
 IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
 SLOT=0
 SRC_URI=http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.45/xlockmore-5.45.tar.bz2
 _eclasses_=autotools	8fc2dd333ef9346c906ffd9a523d8211	eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f584a3da359d21fb5dd6030064533e69
+_md5_=989a81d3017f24e98f0519fb130166e7
diff --git a/metadata/md5-cache/x11-plugins/pidgin-otr-4.0.1 b/metadata/md5-cache/x11-plugins/pidgin-otr-4.0.1
index e7a7f83e96b3..7c412493b963 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-otr-4.0.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-otr-4.0.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/libgcrypt:0 net-im/pidgin[gtk] >=net-libs/libotr-4.0.0 x11-libs/
 DESCRIPTION=(OTR) Messaging allows you to have private conversations over instant messaging
 EAPI=5
 HOMEPAGE=http://www.cypherpunks.ca/otr/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libgcrypt:0 net-im/pidgin[gtk] >=net-libs/libotr-4.0.0 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.cypherpunks.ca/otr/pidgin-otr-4.0.1.tar.gz
-_md5_=41f16984d1dd5519cd17512c6e7fdbb7
+_md5_=56e44e6764ee16da7790b7387e75b51b
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.5 b/metadata/md5-cache/x11-wm/fluxbox-1.3.5
index e36a40b58d82..9c3c504be21d 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.5
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Fluxbox is an X11 window manager featuring tabs and an iconbar
 EAPI=5
 HOMEPAGE=http://www.fluxbox.org
 IUSE=nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.5.tar.lzma
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=15ff23253871a8791d613e3fff56c77c
+_md5_=196552c4eea405813211f6bd6f8588eb
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1 b/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1
index 87354a0883af..df3f0fe647d5 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.5-r1
@@ -10,4 +10,4 @@ RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/flux
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.5.tar.lzma
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a7c1964295651290d5b4a82995831bd3
+_md5_=ecc32379615599ec95eb21ea61b6ae0a
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.6 b/metadata/md5-cache/x11-wm/fluxbox-1.3.6
deleted file mode 100644
index a8dbdbf1cfeb..000000000000
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage ) bidi? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) x11-proto/xextproto
-DESCRIPTION=Fluxbox is an X11 window manager featuring tabs and an iconbar
-EAPI=5
-HOMEPAGE=http://www.fluxbox.org
-IUSE=nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage )
-SLOT=0
-SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.6.tar.xz
-_eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=cd9fb9d8ffe9ef06f110bb333f5b83f1
diff --git a/metadata/md5-cache/x11-wm/fluxbox-9999 b/metadata/md5-cache/x11-wm/fluxbox-9999
index 3ef2f8f5e997..8ae447f6c5b6 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-9999
+++ b/metadata/md5-cache/x11-wm/fluxbox-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=bidi? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) x11-proto/xextproto x11-libs/libXpm x11-libs/libXrandr x11-libs/libXext x11-libs/libXft x11-libs/libXrender || ( x11-misc/gxmessage x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) truetype? ( media-libs/freetype ) bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) vim-syntax? ( app-vim/fluxbox-syntax ) !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 !!<=x11-misc/fluxconf-0.9.9 !!<=x11-misc/fbdesk-1.2.1 dev-vcs/git
+DEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage ) bidi? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) x11-proto/xextproto dev-vcs/git
 DESCRIPTION=Fluxbox is an X11 window manager featuring tabs and an iconbar
-EAPI=4
+EAPI=5
 HOMEPAGE=http://www.fluxbox.org
 IUSE=nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax
 LICENSE=MIT
-RDEPEND=x11-libs/libXpm x11-libs/libXrandr x11-libs/libXext x11-libs/libXft x11-libs/libXrender || ( x11-misc/gxmessage x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) truetype? ( media-libs/freetype ) bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) vim-syntax? ( app-vim/fluxbox-syntax ) !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 !!<=x11-misc/fluxconf-0.9.9 !!<=x11-misc/fbdesk-1.2.1
+RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage )
 SLOT=0
 _eclasses_=eutils	998e5931fb95b10a6a11ec796ada2759	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7960ab49b37720afb9e673661cf2ae73
+_md5_=c2dead65ef7010acb3d73ce44e1f65b3
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a4a5bcdf2f0b..c0620382a6e6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jan 2015 09:36:55 +0000
+Mon, 26 Jan 2015 16:06:56 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 851822acd1d5..b7a9c96f46ab 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jan 26 09:36:52 UTC 2015
+Mon Jan 26 16:06:52 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 26a635281b33..5ab68e4593da 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 26 Jan 2015 10:00:01 +0000
+Mon, 26 Jan 2015 16:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 198df319b6fc..0de245376df4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1422264901 Mon 26 Jan 2015 09:35:01 AM UTC UTC
+1422288301 Mon 26 Jan 2015 04:05:01 PM UTC UTC
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
index a13f16d9fe1a..b0ef564ff071 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild,v 1.3 2015/01/17 13:48:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild,v 1.4 2015/01/26 10:13:27 ago Exp $
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug ft geoip mysql sasl tcpd"
 
 MY_CDEPEND="
diff --git a/net-analyzer/argus/argus-3.0.8.ebuild b/net-analyzer/argus/argus-3.0.8.ebuild
index 7d5543943268..b12f194a2e00 100644
--- a/net-analyzer/argus/argus-3.0.8.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.8.ebuild,v 1.3 2015/01/17 13:48:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-3.0.8.ebuild,v 1.4 2015/01/26 10:13:31 ago Exp $
 
 EAPI=5
 inherit autotools eutils user
@@ -11,7 +11,7 @@ SRC_URI="http://qosient.com/argus/src/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
diff --git a/net-analyzer/arping/arping-2.14.ebuild b/net-analyzer/arping/arping-2.14.ebuild
index e8acbfb24053..ba26ccf22896 100644
--- a/net-analyzer/arping/arping-2.14.ebuild
+++ b/net-analyzer/arping/arping-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/arping-2.14.ebuild,v 1.6 2015/01/18 08:41:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/arping-2.14.ebuild,v 1.7 2015/01/26 10:13:48 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND="
 	net-libs/libpcap
diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
index 70c12a3e52b6..1f5f3397a44f 100644
--- a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
+++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild,v 1.4 2015/01/17 13:49:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild,v 1.5 2015/01/26 10:14:05 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 S=${WORKDIR}/unix
 
diff --git a/net-analyzer/ippl/ippl-1.4.14-r5.ebuild b/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
index 5ce919720454..72c6cb67b537 100644
--- a/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
+++ b/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ippl-1.4.14-r5.ebuild,v 1.1 2015/01/13 18:23:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ippl-1.4.14-r5.ebuild,v 1.2 2015/01/26 10:14:22 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs user
@@ -11,7 +11,7 @@ SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="virtual/yacc
 	>=sys-devel/flex-2.5.4a-r4"
diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
index 2c694552e658..277fa77d95a4 100644
--- a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
+++ b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knocker/knocker-0.7.1-r3.ebuild,v 1.3 2015/01/17 13:49:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knocker/knocker-0.7.1-r3.ebuild,v 1.4 2015/01/26 10:14:39 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://knocker.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO )
 
diff --git a/net-analyzer/macchanger/macchanger-1.7.0.ebuild b/net-analyzer/macchanger/macchanger-1.7.0.ebuild
index 606f9a2c694a..80de74e93675 100644
--- a/net-analyzer/macchanger/macchanger-1.7.0.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.7.0.ebuild,v 1.5 2015/01/17 13:57:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.7.0.ebuild,v 1.6 2015/01/26 10:30:40 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ OUI_FILE="OUI.list-${OUI_DATE}"
 HOMEPAGE="https://github.com/alobbs/macchanger"
 SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ~sparc x86"
 SLOT="0"
 
 src_configure() {
diff --git a/net-analyzer/nmap/nmap-6.47-r2.ebuild b/net-analyzer/nmap/nmap-6.47-r2.ebuild
new file mode 100644
index 000000000000..ac0a854c9c4e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.47-r2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r2.ebuild,v 1.1 2015/01/26 12:08:35 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( lua )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.01-make.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with zenmap) \
+		$(usex lua --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB )
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 03dd1a502f50..f624fb91e2c5 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.1 2015/01/05 07:42:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.2 2015/01/26 12:08:35 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE="ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
@@ -71,17 +71,17 @@ src_prepare() {
 
 	if use nls; then
 		local lingua=''
-		for lingua in ${NMAP_LINGUAS}; do
+		for lingua in ${NMAP_LINGUAS[@]}; do
 			if ! use linguas_${lingua}; then
-				rm -rf zenmap/share/zenmap/locale/${lingua}
-				rm -f zenmap/share/zenmap/locale/${lingua}.po
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi
 		done
 	else
 		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS}; do
-			rm -rf zenmap/share/zenmap/locale/${lingua}
-			rm -f zenmap/share/zenmap/locale/${lingua}.po
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
 		done
 	fi
 
diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
index 15e20a8e1fa4..4fc7616976b7 100644
--- a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
+++ b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nttcp/nttcp-1.47-r3.ebuild,v 1.2 2015/01/09 13:48:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nttcp/nttcp-1.47-r3.ebuild,v 1.3 2015/01/26 10:14:56 ago Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz"
 LICENSE="public-domain"
 
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-format-security.patch
diff --git a/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33.ebuild
index 31f9fc307b81..0f8f1240ef23 100644
--- a/net-analyzer/pinger/pinger-0.33.ebuild
+++ b/net-analyzer/pinger/pinger-0.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.33.ebuild,v 1.2 2015/01/09 13:48:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.33.ebuild,v 1.3 2015/01/26 10:15:14 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="gtk2 gtk3 ncurses nls"
 
 REQUIRED_USE="
diff --git a/net-analyzer/sec/sec-2.7.6.ebuild b/net-analyzer/sec/sec-2.7.6.ebuild
index e6ed1093b394..c42598d0b5f0 100644
--- a/net-analyzer/sec/sec-2.7.6.ebuild
+++ b/net-analyzer/sec/sec-2.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sec/sec-2.7.6.ebuild,v 1.2 2015/01/09 13:49:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sec/sec-2.7.6.ebuild,v 1.3 2015/01/26 10:15:31 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/simple-evcorr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
 
 RDEPEND=">=dev-lang/perl-5.8.0"
 
diff --git a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
index 2602e6f2fb95..db309a5cc2c4 100644
--- a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
+++ b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.3-r2.ebuild,v 1.2 2015/01/09 13:49:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.3-r2.ebuild,v 1.3 2015/01/26 10:15:48 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="
diff --git a/net-dns/dnstop/Manifest b/net-dns/dnstop/Manifest
index 7ae71e4bed31..1fe503fee804 100644
--- a/net-dns/dnstop/Manifest
+++ b/net-dns/dnstop/Manifest
@@ -1,3 +1,2 @@
-DIST dnstop-20110502.tar.gz 73083 SHA256 2278e6f9b0190383c2d7d9100fe38a2fee32a8120d2f6c6a2f78f3769cec4365 SHA512 dc673c95d436c9e4378e81ef96827be7d5ded52ab19056d5e8cfd01c27b7e8be46a9112dad88a2f8a11b72212840b8007b5173ca07b058ed8bbd8eb28e863fca WHIRLPOOL 789c329ab207a617c6f10f893006a4c2746b01f55c08d699d9acfca74bf44c587af59d8f86b384446e9979c0c4e61c1506ceda878c6f19b025a8a478a4a4047b
 DIST dnstop-20121017.tar.gz 74559 SHA256 6aed2d6037ab94244c4b802a412f902034be3448431b2118cd0e6afe1bf959f6 SHA512 efe0abdd87d14aa8bdc74dad4a5a4d613110e0a78ee7034ecf6d4a7e2037f1895c776761d70127c021ba207dffbc7e1cb551ec55f62b54f93babcd38f21cd44a WHIRLPOOL 30539e7bc5967bc4a67743d4c8b610776e119bd33208d2925f9615926dae5f4233269d35732404e0e1f4078c4b16fe88bcb89fa3bdb7486ce7287608f526b69d
 DIST dnstop-20140915.tar.gz 77917 SHA256 b4b03d02005b16e98d923fa79957ea947e3aa6638bb267403102d12290d0c57a SHA512 902cf96f7366983cae4bf684e44fbe12f6e982cee8ff489329e25e1a13de60870d356906a99fee56c6da2258c4a39074a504389549c6c2e239a4ea94d8b9a65d WHIRLPOOL dbdb56039bf9eaa3463edd77f01fc5a500cd3b5d68337491791c63b1e212c0a8eaebcf9cea8d7cbf918f98fbbf92e14c7e1a665715a915f68e84b1b77e48c616
diff --git a/net-dns/dnstop/dnstop-20110502.ebuild b/net-dns/dnstop/dnstop-20110502.ebuild
deleted file mode 100644
index 48bfbda23860..000000000000
--- a/net-dns/dnstop/dnstop-20110502.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnstop/dnstop-20110502.ebuild,v 1.6 2014/08/10 20:42:23 slyfox Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Displays various tables of DNS traffic on your network"
-HOMEPAGE="http://dnstop.measurement-factory.com/"
-SRC_URI="http://dnstop.measurement-factory.com/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
-IUSE="ipv6"
-
-RDEPEND="sys-libs/ncurses
-	net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	dobin dnstop || die
-	doman dnstop.8
-	dodoc CHANGES
-}
diff --git a/net-dns/dnstop/dnstop-20121017.ebuild b/net-dns/dnstop/dnstop-20121017.ebuild
index 0af779564896..66910bd45af5 100644
--- a/net-dns/dnstop/dnstop-20121017.ebuild
+++ b/net-dns/dnstop/dnstop-20121017.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnstop/dnstop-20121017.ebuild,v 1.3 2015/01/09 13:38:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnstop/dnstop-20121017.ebuild,v 1.4 2015/01/26 09:56:54 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dnstop.measurement-factory.com/src/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
 IUSE="ipv6"
 
 RDEPEND="sys-libs/ncurses
diff --git a/net-firewall/ferm/ferm-2.2.ebuild b/net-firewall/ferm/ferm-2.2.ebuild
index 79687252821d..9cd7cc01a437 100644
--- a/net-firewall/ferm/ferm-2.2.ebuild
+++ b/net-firewall/ferm/ferm-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ferm/ferm-2.2.ebuild,v 1.2 2015/01/22 08:44:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ferm/ferm-2.2.ebuild,v 1.3 2015/01/26 09:37:05 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://ferm.foo-projects.org/download/${MY_PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 # does not install any perl libs
diff --git a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
index b2cb553b70be..fe977e4378c8 100644
--- a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
+++ b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/cmdftp/cmdftp-0.9.8.ebuild,v 1.2 2015/01/09 13:38:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/cmdftp/cmdftp-0.9.8.ebuild,v 1.3 2015/01/26 10:40:38 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/net-im/dianara/dianara-1.2.4.ebuild b/net-im/dianara/dianara-1.2.4.ebuild
index 2aa6248756be..1cf8788e192f 100644
--- a/net-im/dianara/dianara-1.2.4.ebuild
+++ b/net-im/dianara/dianara-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.2 2015/01/09 13:38:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.3 2015/01/26 10:08:10 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-im/licq/licq-1.8.2.ebuild b/net-im/licq/licq-1.8.2.ebuild
index f2c2ecf1358f..5dae4b0475d8 100644
--- a/net-im/licq/licq-1.8.2.ebuild
+++ b/net-im/licq/licq-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.8.2.ebuild,v 1.4 2015/01/09 13:38:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.8.2.ebuild,v 1.5 2015/01/26 10:41:36 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~sparc x86"
 IUSE="debug doc linguas_he nls socks5 ssl xosd aosd jabber qt4 msn"
 
 RDEPEND=">=app-crypt/gpgme-1
diff --git a/net-irc/epic5/epic5-1.1.10.ebuild b/net-irc/epic5/epic5-1.1.10.ebuild
index 5b17445e231b..09a589fc2e15 100644
--- a/net-irc/epic5/epic5-1.1.10.ebuild
+++ b/net-irc/epic5/epic5-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.10.ebuild,v 1.4 2015/01/09 13:38:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic5/epic5-1.1.10.ebuild,v 1.5 2015/01/26 10:12:47 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://epicsol.org/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
 
 RDEPEND="virtual/libiconv
diff --git a/net-irc/inspircd/inspircd-2.0.18.ebuild b/net-irc/inspircd/inspircd-2.0.18.ebuild
index e1162ec0541e..221be85477ee 100644
--- a/net-irc/inspircd/inspircd-2.0.18.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.18.ebuild,v 1.4 2014/12/28 16:26:45 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.18.ebuild,v 1.5 2015/01/26 10:16:24 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
 
 RDEPEND="
diff --git a/net-libs/ccrtp/ccrtp-2.0.9.ebuild b/net-libs/ccrtp/ccrtp-2.0.9.ebuild
index 5dfd8467fe3c..8bb2b6f8327a 100644
--- a/net-libs/ccrtp/ccrtp-2.0.9.ebuild
+++ b/net-libs/ccrtp/ccrtp-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-2.0.9.ebuild,v 1.4 2015/01/18 08:40:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ccrtp/ccrtp-2.0.9.ebuild,v 1.5 2015/01/26 10:08:27 ago Exp $
 
 EAPI=5
 inherit eutils multilib
@@ -9,7 +9,7 @@ DESCRIPTION="GNU ccRTP is an implementation of RTP, the real-time transport prot
 HOMEPAGE="http://www.gnu.org/software/ccrtp/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 LICENSE="GPL-2"
 IUSE="doc"
 SLOT="0/2"
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index a6d39569298d..9ca0ceb3ce44 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,3 +1,3 @@
 DIST farstream-0.1.2.tar.gz 1265972 SHA256 fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9 SHA512 7d9ddde5d17205752a17298fb90cf855a828b2ae58746fbdc7e47749cee5e5eac4fd56f97f58251a5d253901cdd555e9cfade6016b6d92df99daefbe850e2910 WHIRLPOOL 273d20082152ff09adf8e64481b1b7c7ba7e6a24fc09addc219880fbee7f1e6b9845ce727c032fa3c364e8d2440736fd0324015426591b7e9766f11054828294
-DIST farstream-0.2.3.tar.gz 1253317 SHA256 bff535949252cdfc0374cb91f08b08476e7af38183295269b579500cc6c60496 SHA512 2f584a034611c22bfaa622e043884329a6d32821fd194b55d5c92669285ee43ff1a60cde3a9f825c3a895c50fd733ff6cf85beeb7efffff053eca287e7bc9528 WHIRLPOOL b93006211c35f6275d8422472f2effe3f70e8ee9b78a7a463f1b9e6caea8736d2a14cdf151151bbd663e2b101735b4521b4e637a4dd072bb65d03f24b71a73c8
 DIST farstream-0.2.4.tar.gz 1274905 SHA256 120d5b5cd79fcbe19d9e046526fc4bc059e0a3733b3de2d7e5299dc5a3a7bb30 SHA512 f0327392cf644bf08fac81b3408d98eff8ba96742b88d1bd3006416d6fb1fc7c44a0dcc3e6e6ccc64be27633c67069a1219d6dc07815b80edf34515119cda089 WHIRLPOOL c529d16b8de0020bea77785826dd3d7d639c130ef91371d63fae6f8561353d35bce28ef7e249a6510498097962eed50dd1f4b2e01619f149086fc9e3ae32e0b7
+DIST farstream-0.2.6.tar.gz 1301412 SHA256 b92c7f64852a5f5585da3ad5f91e52aba0da4633b8e41170d4560d7360dd4252 SHA512 2d21d0dc8f47c7611d43e7ce4231532e7de51020625cec72b4bd1f801897068cd4c0d5246510684f56a71ede368caf17ef61cae9b55d8ce1ec87b2cf250d4c50 WHIRLPOOL e832d97b1f1a66d85d604e8f75fa2f1077eb3db4bd5bb6e033f96da391c62e9fa0a919579b46f3f00b85189f5fa8af42f8390dc0b791cc1fd9b597fb6f9a51c8
diff --git a/net-libs/farstream/farstream-0.2.3.ebuild b/net-libs/farstream/farstream-0.2.6.ebuild
similarity index 81%
rename from net-libs/farstream/farstream-0.2.3.ebuild
rename to net-libs/farstream/farstream-0.2.6.ebuild
index 9ff7bce3fa65..af7f88c5d65e 100644
--- a/net-libs/farstream/farstream-0.2.3.ebuild
+++ b/net-libs/farstream/farstream-0.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/farstream-0.2.3.ebuild,v 1.6 2014/03/28 02:30:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/farstream-0.2.6.ebuild,v 1.1 2015/01/26 12:31:05 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="http://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection msn test upnp"
 
 SLOT="0.2"
@@ -23,10 +23,10 @@ SLOT="0.2"
 RESTRICT="test"
 
 COMMONDEPEND="
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
+	>=media-libs/gstreamer-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0
 	>=dev-libs/glib-2.32:2
-	>=net-libs/libnice-0.1.3-r1
+	>=net-libs/libnice-0.1.8
 	introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
 	upnp? ( >=net-libs/gupnp-igd-0.2:= )
 "
@@ -38,11 +38,12 @@ RDEPEND="${COMMONDEPEND}
 "
 DEPEND="${COMMONDEPEND}
 	${PYTHON_DEPS}
-	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-am-1.18
 	virtual/pkgconfig
 	test? (
 		media-libs/gst-plugins-base:1.0[vorbis]
-		media-libs/gst-plugins-good:1.0 )"
+		media-libs/gst-plugins-good:1.0 )
+"
 
 pkg_setup() {
 	python-any-r1_pkg_setup
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 42018a53bc33..80376d36c9b9 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-online-accounts-3.12.4.tar.xz 1361472 SHA256 b871789f83514e0e0d2f1a78d03cca420dbaad707359b3d7c40275d519246c40 SHA512 3eec2e6afa0d98bca04ec7901eba5138245cbb1cacdd168de64a8fb27f48ebde952e1c610f8c3204dc8b9b98cb6c72eec8d43e1ffdb30ed55023bff26990f2d4 WHIRLPOOL b3a3afb7a8ac29b8137b56ad7641cb7339e5e4656f601b8d066732a1716160586a48528f262dd6fe3920cf53fafa846ba27e3327bb56d20d36617d8f8789418c
 DIST gnome-online-accounts-3.14.2.tar.xz 1406916 SHA256 341a2c79cd26770ccbf4476f7ce7222cfe026f442cfbd05dc7f7612f7b30dae9 SHA512 e99717c4e30a5c1f9b08701935ed04926df813ad57a22208bc49a08934e58fd51002dd831461e6b380f2e4d98d06f34ad1579f593c76b0ae1ced6e18572cf3b0 WHIRLPOOL bb6e91208bee59591fa81bc690e9ee134e20a21e5eafc4a6065b5b67db13b123f0d310fe49596f3a74fc9f99db98dcfff2ca3b0b65a3a47aeba89e99aa594111
+DIST gnome-online-accounts-3.14.3.tar.xz 1408156 SHA256 6fe2dc67ab2c50a1c127767f43f31513dac72453bd41d4b4265217a19667c2c6 SHA512 849fd4419a78ea442f610701d4653bfaa18974a35324f0b8209efe9d86e193dccfe67d044a868e1e6e594403b494884bac7109860a6352eecd1b58903432aa39 WHIRLPOOL dcb9373b4c7db2845b0854c52c345f767785ac8e8e590d7e09f41e86d895d40ad9cdd8e4dc11efa5d7ed397b27d41c4f3065a08ec335ba695d3a2a315f49ea2d
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild
new file mode 100644
index 000000000000..118b2a624279
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnome-online-accounts/gnome-online-accounts-3.14.3.ebuild,v 1.1 2015/01/26 12:34:44 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+IUSE="gnome +introspection kerberos" # telepathy"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.35:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	net-libs/telepathy-glib
+	>=net-libs/webkit-gtk-2.1.90:3
+	>=x11-libs/gtk+-3.11.1:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
+	kerberos? (
+		app-crypt/gcr:0=
+		app-crypt/mit-krb5 )
+"
+#	telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.3
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_configure() {
+	# TODO: Give users a way to set the G/Y!/FB/Twitter/Windows Live secrets
+	# Twitter/Y! disabled per upstream recommendation, bug #497168
+	# telepathy optional support is really badly done, bug #494456
+	gnome2_src_configure \
+		--disable-static \
+		--disable-twitter \
+		--disable-yahoo \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-imap-smtp \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-telepathy \
+		--enable-windows-live \
+		$(use_enable kerberos)
+		#$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 2f066509a0e5..c60d8fe28b56 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,2 +1,2 @@
-DIST gupnp-0.20.10.tar.xz 382264 SHA256 5c7f9278b50ed252606552e2f148be4e1b1616bc93ebc8b09b22fcf5d8aa08e4 SHA512 3c9a4e1335507fbddd898baee6783765b6a4c012fc1f97e5a997c6a90b8ce9807f62b127d8a22f3b0fc3e806d22f73dbee4690dbfe62ab02572993a3f34bb864 WHIRLPOOL faca7982f484d13544265557d642e9d530e9e17aeddf7073ef6611f7b10b3b71e73ce4ca82984be92d0d55e9ab93b33004f1ef78be1de1c8b0b1a3a0b5070d70
 DIST gupnp-0.20.12.tar.xz 394316 SHA256 205d47b950a1b7190df1115f454cb38a44d71aacfec75d4287299e400e139b69 SHA512 87b74f550e5b1f18a984fce2d955bc43a8931aae4ca6d4bfe19842fd5f6028590e4cb2b6e0fc245dfda7099b7913b5855cbe6a324b5b4cba780cc35b73e6cc33 WHIRLPOOL 1b60c28ba8346b90270e4363e25755bcd81045755adb913516ab7824a0b7e8d71021d106408f8dadee731692e56e0c3a87519470394521593c5a70a02fcd8053
+DIST gupnp-0.20.13.tar.xz 395356 SHA256 d779b094f13097a5900689b3587e5b495d79112d0855ed842577acba25c902b3 SHA512 dfc73a50f93dba84042652556a3fad870137fda3659fac4fe735c3d2cecf94d6908382d88cf85122840dd61017b9348f97edb6ded6d876d5e35058d70f9b8dc1 WHIRLPOOL 5d3cb3f9411324d73d33728e137c7b75c16386a5c57470c5213c3393582b6ebdd9889d6e5cc702128bb1c0f8514958b3bf70607cbd38dfe957b11bd03dda3009
diff --git a/net-libs/gupnp/gupnp-0.20.10.ebuild b/net-libs/gupnp/gupnp-0.20.10.ebuild
deleted file mode 100644
index 502dd2f4d65b..000000000000
--- a/net-libs/gupnp/gupnp-0.20.10.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.20.10.ebuild,v 1.6 2014/03/28 02:33:37 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-# FIXME: Claims to works with python3 but appears to be wishful thinking
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1 vala
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="connman +introspection kernel_linux networkmanager"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=net-libs/gssdp-0.13.0:0=[introspection?]
-	>=net-libs/libsoup-2.28.2:2.4[introspection?]
-	>=dev-libs/glib-2.24:2
-	dev-libs/libxml2
-	|| (
-		>=sys-apps/util-linux-2.16
-		<sys-libs/e2fsprogs-libs-1.41.8 )
-	introspection? (
-			>=dev-libs/gobject-introspection-0.6.4
-			$(vala_depend) )
-	connman? (
-		>=dev-libs/glib-2.28:2
-		>=net-misc/connman-0.80 )
-	networkmanager? ( >=dev-libs/glib-2.26:2 )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local backend=unix
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static \
-		--with-context-manager=${backend}
-}
-
-src_install() {
-	gnome2_src_install
-	python_parallel_foreach_impl python_doscript tools/gupnp-binding-tool
-}
diff --git a/net-libs/gupnp/gupnp-0.20.12.ebuild b/net-libs/gupnp/gupnp-0.20.13.ebuild
similarity index 51%
rename from net-libs/gupnp/gupnp-0.20.12.ebuild
rename to net-libs/gupnp/gupnp-0.20.13.ebuild
index 5f472e870a5f..5b94fc90dce5 100644
--- a/net-libs/gupnp/gupnp-0.20.12.ebuild
+++ b/net-libs/gupnp/gupnp-0.20.13.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.20.12.ebuild,v 1.1 2014/05/31 15:38:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp/gupnp-0.20.13.ebuild,v 1.1 2015/01/26 12:40:47 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 # FIXME: Claims to works with python3 but appears to be wishful thinking
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit gnome2 python-r1 vala
+inherit gnome2 multilib-minimal python-r1 vala
 
 DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
 HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
@@ -20,30 +19,29 @@ SLOT="0/4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="connman +introspection kernel_linux networkmanager"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=net-libs/gssdp-0.13.0:0=[introspection?]
-	>=net-libs/libsoup-2.28.2:2.4[introspection?]
-	>=dev-libs/glib-2.28.0:2
-	dev-libs/libxml2
+	>=net-libs/gssdp-0.14.7:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	|| (
-		>=sys-apps/util-linux-2.16
-		<sys-libs/e2fsprogs-libs-1.41.8 )
+		>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+		<sys-libs/e2fsprogs-libs-1.41.8[${MULTILIB_USEDEP}] )
 	introspection? (
 			>=dev-libs/gobject-introspection-0.6.4
 			$(vala_depend) )
-	connman? (
-		>=dev-libs/glib-2.28:2
-		>=net-misc/connman-0.80 )
-	networkmanager? ( >=dev-libs/glib-2.26:2 )
+	connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
 	!net-libs/gupnp-vala
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1
 	sys-devel/gettext
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 
 src_prepare() {
@@ -51,19 +49,28 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	local backend=unix
 	use kernel_linux && backend=linux
 	use connman && backend=connman
 	use networkmanager && backend=network-manager
 
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
-		$(use_enable introspection) \
+		$(multilib_native_use_enable introspection) \
 		--disable-static \
 		--with-context-manager=${backend}
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
 }
 
-src_install() {
+multilib_src_install() {
 	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
 	python_parallel_foreach_impl python_doscript tools/gupnp-binding-tool
 }
diff --git a/net-libs/libnm-qt/Manifest b/net-libs/libnm-qt/Manifest
index 22801304df5b..73941ade3daf 100644
--- a/net-libs/libnm-qt/Manifest
+++ b/net-libs/libnm-qt/Manifest
@@ -1,2 +1 @@
-DIST libnm-qt-0.9.8.2.tar.xz 133408 SHA256 118fa4732536677f889b2776ec45bd0c726f26abcb8e8b6f8dfcaee265475f33 SHA512 443e1bac3d0c6512009152d0594d4089c97e1e7309bc0a1b745cb1a95a768b03b675bf1ba7366b4e3c1aa346443d2b98e055ee4244a630410750e05bb1a9019c WHIRLPOOL 7a7eb9beca985d5294176a0ad5ff419212c9c9cd2ecf615363e72cbffe056d054115f437b442360bf978881215ba320122ded4b0527c53486482ccd4d107678b
 DIST libnm-qt-0.9.8.3.tar.xz 133452 SHA256 1f749a21dd8b58026842d87f19e4f5b482b18a7620517ced4a8bdf38dbe84560 SHA512 314f063d45cd384c092b02212d71d45ee2a18892735ddde2a1165dca28a84163db2c6b6c677e7828301e063d4eeb7266fd193a7eb4e454ff945aacd718e0eceb WHIRLPOOL a08dc570a22b34e1ad7e00183b1ef598a127a1d4f59042a1468c4efd94e4560b166385a24fb8a28fe8e1a41c817f5177a6648b46c3f6c7283a3d9642e28d99dd
diff --git a/net-libs/libnm-qt/libnm-qt-0.9.8.2-r1.ebuild b/net-libs/libnm-qt/libnm-qt-0.9.8.2-r1.ebuild
deleted file mode 100644
index 85166a838b1d..000000000000
--- a/net-libs/libnm-qt/libnm-qt-0.9.8.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/libnm-qt-0.9.8.2-r1.ebuild,v 1.4 2014/10/27 16:41:32 ago Exp $
-
-EAPI=5
-
-KDE_REQUIRED="never"
-inherit kde4-base
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/unstable/networkmanager-qt/${PV}/src/${P}.tar.xz"
-else
-	KEYWORDS=""
-fi
-
-DESCRIPTION="NetworkManager bindings for Qt"
-HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libnm-qt"
-
-LICENSE="LGPL-2"
-SLOT="0/1"
-IUSE="debug doc modemmanager test"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	net-misc/mobile-broadband-provider-info
-	|| (
-		>=net-misc/networkmanager-0.9.8.4[consolekit]
-		>=net-misc/networkmanager-0.9.8.4[systemd]
-	)
-	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=OFF
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGERQT)
-		$(cmake-utils_use !test DISABLE_TESTING)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	if use doc; then
-		{ cd "${BUILD_DIR}" && doxygen; } || die "Generating documentation failed"
-		HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild b/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild
index 80b4eab89b5e..d9db22987958 100644
--- a/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild
+++ b/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild,v 1.2 2015/01/09 13:38:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/libnm-qt-0.9.8.3.ebuild,v 1.3 2015/01/26 10:03:06 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ KDE_REQUIRED="never"
 inherit kde4-base
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/unstable/networkmanager-qt/${PV}/src/${P}.tar.xz"
 else
 	KEYWORDS=""
diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
index ba23e4de028c..5eef357cb4b1 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -1,4 +1,2 @@
-DIST liboping-1.6.1.tar.bz2 282388 SHA256 cf5c9ac217ddc653543785de50fae6b2595393efa9d73e2e1acb63dc48fb3983
-DIST liboping-1.6.2.tar.bz2 263031 SHA256 5f4ab4b127b5a8a79ab771002604bff0e2903622393e5602f336cad258bb73cf SHA512 6e09cff67f0d87382a0c63b7b515de5bae0db97996b450aba5432a2bcd05d0b5c7481323c23d839c8937dd132bc9cfc5bb1a4ca50a3746653f4893fccd27357f WHIRLPOOL ad3e692477af372b4481b07d0c1a4a9fe24a60048d3f8277d57d68ab97f90ea33813207babb9402cbf3a870760e9395519ad9d12c0e8184f004521c6d7b18fb9
 DIST liboping-1.7.0.tar.bz2 306359 SHA256 60089a544522abced4aecbb554f494632968371e5ade7bea27015cd6aa598db3 SHA512 74ca6184fc192cabc0edb289aaab7b7d6f743a69cd0e1c0de82d768e7fd599229fbb974fbc0e1f3f5a3377c47cc8871c8cd1b16982f7b67167cd7cc5808eb38e WHIRLPOOL cf845b01582cf207c2409e1e5ee71ca9e7fb402ff8fb0131778246aa8931aa3b1c59e6318fea6923ed3f83721f8a0928991ecefb87f7ec13f2f8c4f3f8df4fdc
 DIST liboping-1.8.0.tar.bz2 316441 SHA256 1dcb9182c981b31d67522ae24e925563bed57cf950dc681580c4b0abb6a65bdb SHA512 94170de6e23c1c2380866e5195a3cdac795f30bda560ee3869bcdd9aa42b831fa3aac1a351033f72ed81d501b8e3e02db9bb5e5ada29e51ea4b1d2cca7af6217 WHIRLPOOL 724144216788a3837e2afb45b88a9ea757984e45841a365cfc7b17b43269069600dd9ed261f4b108527eb5f19b151500b24e4544c8e3f944cc1d7392e39b6c4a
diff --git a/net-libs/liboping/files/liboping-1.6.1-nouidmagic.patch b/net-libs/liboping/files/liboping-1.6.1-nouidmagic.patch
deleted file mode 100644
index 16586b25ab3d..000000000000
--- a/net-libs/liboping/files/liboping-1.6.1-nouidmagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- liboping-1.6.1/src/Makefile.am	2011-03-06 10:03:21.000000000 +0100
-+++ liboping-1.6.0/src/Makefile.am	2011-01-26 14:18:42.000000000 +0100
-@@ -51,16 +51,3 @@
- noping_LDADD += -lrt
- endif
- endif # BUILD_WITH_LIBNCURSES
--
--install-exec-hook:
--	@if test "x0" = "x$$UID"; then \
--		if test "xLinux" = "x`uname -s`"; then \
--			echo "Setting CAP_NET_RAW capability on binaries."; \
--			setcap cap_net_raw=ep $(DESTDIR)$(bindir)/oping; \
--			setcap cap_net_raw=ep $(DESTDIR)$(bindir)/noping; \
--		else \
--			echo "Setting set-UID bit on binaries."; \
--			chmod u+s $(DESTDIR)$(bindir)/oping; \
--			chmod u+s $(DESTDIR)$(bindir)/noping; \
--		fi; \
--	fi
diff --git a/net-libs/liboping/liboping-1.6.1.ebuild b/net-libs/liboping/liboping-1.6.1.ebuild
deleted file mode 100644
index 885f7679034c..000000000000
--- a/net-libs/liboping/liboping-1.6.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.6.1.ebuild,v 1.5 2014/10/09 19:55:25 dilfridge Exp $
-
-EAPI=4
-
-inherit base autotools
-
-DESCRIPTION="C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once"
-HOMEPAGE="http://verplant.org/liboping"
-SRC_URI="http://verplant.org/${PN}/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="perl"
-
-DEPEND="
-	sys-libs/ncurses
-	perl? ( dev-lang/perl  )
-"
-RDEPEND=${DEPEND}
-
-PATCHES=( "${FILESDIR}/${P}-nouidmagic.patch" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la'  -delete || die
-
-	fperms u+s,og-r /usr/bin/oping
-	fperms u+s,og-r /usr/bin/noping
-}
diff --git a/net-libs/liboping/liboping-1.6.2.ebuild b/net-libs/liboping/liboping-1.6.2.ebuild
deleted file mode 100644
index 089621fada57..000000000000
--- a/net-libs/liboping/liboping-1.6.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.6.2.ebuild,v 1.4 2014/10/09 19:55:25 dilfridge Exp $
-
-EAPI=4
-
-inherit base autotools
-
-DESCRIPTION="C library and ncurses based program to generate ICMP echo requests and ping multiple hosts at once"
-HOMEPAGE="http://verplant.org/liboping"
-SRC_URI="http://verplant.org/${PN}/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="perl"
-
-DEPEND="
-	sys-libs/ncurses
-	perl? ( dev-lang/perl  )
-"
-RDEPEND=${DEPEND}
-
-PATCHES=( "${FILESDIR}/${P}-nouidmagic.patch" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la'  -delete || die
-
-	fperms u+s,og-r /usr/bin/oping
-	fperms u+s,og-r /usr/bin/noping
-}
diff --git a/net-libs/liboping/liboping-1.7.0.ebuild b/net-libs/liboping/liboping-1.7.0.ebuild
index 247025831200..411272cbd5ba 100644
--- a/net-libs/liboping/liboping-1.7.0.ebuild
+++ b/net-libs/liboping/liboping-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.7.0.ebuild,v 1.2 2015/01/09 13:38:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboping/liboping-1.7.0.ebuild,v 1.3 2015/01/26 09:42:09 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://verplant.org/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="perl"
 
 DEPEND="
diff --git a/net-libs/libotr/libotr-4.1.0.ebuild b/net-libs/libotr/libotr-4.1.0.ebuild
index 2b9b4488c3a7..ff6ba4fa595f 100644
--- a/net-libs/libotr/libotr-4.1.0.ebuild
+++ b/net-libs/libotr/libotr-4.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-4.1.0.ebuild,v 1.3 2015/01/22 08:41:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libotr/libotr-4.1.0.ebuild,v 1.4 2015/01/26 10:12:27 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgcrypt-1.2:0
diff --git a/net-misc/arm/arm-1.4.5.0-r1.ebuild b/net-misc/arm/arm-1.4.5.0-r1.ebuild
deleted file mode 100644
index c15188e51740..000000000000
--- a/net-misc/arm/arm-1.4.5.0-r1.ebuild
+++ /dev/null
@@ -1,48 +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/arm/arm-1.4.5.0-r1.ebuild,v 1.1 2014/10/09 09:32:33 blueness Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ncurses"
-
-inherit python distutils
-
-DESCRIPTION="A ncurses-based status monitor for Tor relays"
-HOMEPAGE="http://www.atagar.com/arm/"
-SRC_URI="http://www.atagar.com/arm/resources/static/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# Note: While we depend on net-misc/tor, we strictly speaking
-# don't have to because it could run on a different machine.
-RDEPEND="
-	>=net-misc/tor-0.2.1.27
-	app-admin/sudo
-	sys-apps/man
-	sys-process/lsof
-	net-dns/bind-tools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	distutils_src_install --docPath "${EPREFIX}"/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	elog "Some graphing data issues have been noted in testing"
-	elog "when run as root. It is not recommended to run arm as"
-	elog "root until those issues have been isolated and fixed."
-	elog
-	elog "Trouble with graphs under app-misc/screen? Try:"
-	elog 'TERM="rxvt-unicode" arm'
-}
diff --git a/net-misc/arm/arm-1.4.5.0-r2.ebuild b/net-misc/arm/arm-1.4.5.0-r2.ebuild
index 84a69920bc05..558d7767dd08 100644
--- a/net-misc/arm/arm-1.4.5.0-r2.ebuild
+++ b/net-misc/arm/arm-1.4.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arm/arm-1.4.5.0-r2.ebuild,v 1.3 2015/01/02 20:12:12 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/arm/arm-1.4.5.0-r2.ebuild,v 1.4 2015/01/26 10:40:02 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.atagar.com/arm/resources/static/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
 # Note: While we depend on net-misc/tor, we strictly speaking
diff --git a/net-misc/arm/arm-1.4.5.0.ebuild b/net-misc/arm/arm-1.4.5.0.ebuild
deleted file mode 100644
index 5268c85e0379..000000000000
--- a/net-misc/arm/arm-1.4.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/arm/arm-1.4.5.0.ebuild,v 1.3 2012/06/08 12:12:07 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ncurses"
-
-inherit python distutils
-
-DESCRIPTION="A ncurses-based status monitor for Tor relays"
-HOMEPAGE="http://www.atagar.com/arm/"
-SRC_URI="http://www.atagar.com/arm/resources/static/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=net-misc/tor-0.2.1.27"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	distutils_src_install --docPath "${EPREFIX}"/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	elog "Some graphing data issues have been noted in testing"
-	elog "when run as root. It is not recommended to run arm as"
-	elog "root until those issues have been isolated and fixed."
-	elog
-	elog "Trouble with graphs under app-misc/screen? Try:"
-	elog 'TERM="rxvt-unicode" arm'
-}
diff --git a/net-misc/libreswan/libreswan-3.10.ebuild b/net-misc/libreswan/libreswan-3.10.ebuild
index ce8a92296029..49e499c58c9d 100644
--- a/net-misc/libreswan/libreswan-3.10.ebuild
+++ b/net-misc/libreswan/libreswan-3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/libreswan/libreswan-3.10.ebuild,v 1.2 2015/01/09 13:38:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/libreswan/libreswan-3.10.ebuild,v 1.3 2015/01/26 09:46:25 ago Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit eutils systemd toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/libreswan/libreswan.git"
diff --git a/net-misc/lldpd/lldpd-0.7.11-r3.ebuild b/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
index d31b29c995fd..1b0d6907c911 100644
--- a/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
+++ b/net-misc/lldpd/lldpd-0.7.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.11-r3.ebuild,v 1.2 2015/01/09 13:39:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lldpd/lldpd-0.7.11-r3.ebuild,v 1.3 2015/01/26 09:42:29 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph jansson json-c +lldpmed seccomp sonmp
 	snmp static-libs readline xml zsh-completion"
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 4d8f3abba3f5..dd6eeca4a764 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,2 +1,2 @@
-DIST ModemManager-1.2.0.tar.xz 1306972 SHA256 8bd9d8c3b506f34a9f927e95784026d1fe132c9d60fc426a892b690f7d6408bc SHA512 42e94e9bac7224ecdb7502d2542a84b3952a38054845bc87530914369c0c4ff5c15e1b892a54e39a20d3ef115c287f6976256912c076c320adbb9161cb6adce3 WHIRLPOOL 5be964dbf8a324a392d4fedf1aefedd88a5d09cea31b343c20f1f0b4524d2bec68f4668a0f4eb2b1d1a213551fd85b572b19a88632d2f0fcc0cad6bdbee622bd
 DIST ModemManager-1.4.0.tar.xz 1313396 SHA256 efe12c30d4660a4694dec2a1ea68ea176f4dc3cb4b9e843929115943dc189ca0 SHA512 4c6ab92f6151c190585f83cbd5a50f283f1bea9a98207d81a9cc577a26ff9ff32b0b1efade0a1f44dfc5f77d96da999aede1626a1ddb2a97a9741884408685fb WHIRLPOOL 1c75bc86dea1fa9d5a7510cbc5cfdc2ea1a23e28a9d42ed30a7124f4f13535703eec3b240b9de2398562af11cfa3fa55c24cc5a5a55f4b1817e4a58217c98c22
+DIST ModemManager-1.4.2.tar.xz 1350604 SHA256 07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d SHA512 8be9387f78de5213ff77374ee2cba67c08301b29b2cd957c8bab86446d1227759833b9ecafb3caef590701f6422bae587db848391cf15c1dd16b5421e976a4c6 WHIRLPOOL 6a554a80ce53d1eb41f993ee5113a8f5606f20dde5c415f4c3375510bd5acb655f84ff5a17a5d678ba615810bcbc1366005b3d72dbab2b087a50f5e5352641a2
diff --git a/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild b/net-misc/modemmanager/modemmanager-1.4.2.ebuild
similarity index 92%
rename from net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild
rename to net-misc/modemmanager/modemmanager-1.4.2.ebuild
index 219f2f7dbf35..895257a11c83 100644
--- a/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.4.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.2.0-r1.ebuild,v 1.8 2014/10/11 12:29:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-1.4.2.ebuild,v 1.1 2015/01/26 12:45:40 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 user readme.gentoo udev vala
@@ -16,7 +15,7 @@ SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection mbim policykit +qmi qmi-newest vala"
 REQUIRED_USE="
 	qmi-newest? ( qmi )
@@ -27,7 +26,7 @@ RDEPEND="
 	>=dev-libs/glib-2.32:2
 	virtual/libgudev:=
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	mbim? ( >=net-libs/libmbim-1.4 )
+	mbim? ( >=net-libs/libmbim-1.10 )
 	policykit? ( >=sys-auth/polkit-0.106[introspection] )
 	qmi? ( >=net-libs/libqmi-1.6.0:= )
 "
diff --git a/net-misc/packETH/packETH-1.7.3.ebuild b/net-misc/packETH/packETH-1.7.3.ebuild
index a93b47d2e5ce..c5e05d750d55 100644
--- a/net-misc/packETH/packETH-1.7.3.ebuild
+++ b/net-misc/packETH/packETH-1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/packETH-1.7.3.ebuild,v 1.2 2015/01/09 13:39:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/packETH/packETH-1.7.3.ebuild,v 1.3 2015/01/26 10:16:06 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/packeth/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/net-misc/rdesktop/rdesktop-1.8.3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3.ebuild
index a2e7ea41073f..3fa6688ae7c5 100644
--- a/net-misc/rdesktop/rdesktop-1.8.3.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.3.ebuild,v 1.6 2015/01/18 08:51:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.3.ebuild,v 1.7 2015/01/26 10:43:03 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/stunnel/stunnel-5.08.ebuild b/net-misc/stunnel/stunnel-5.08.ebuild
index 5c6d85f2363e..2c62e2a061b7 100644
--- a/net-misc/stunnel/stunnel-5.08.ebuild
+++ b/net-misc/stunnel/stunnel-5.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.08.ebuild,v 1.4 2015/01/23 07:49:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.08.ebuild,v 1.5 2015/01/26 09:41:11 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/x2goclient/x2goclient-4.0.3.1.ebuild b/net-misc/x2goclient/x2goclient-4.0.3.1.ebuild
index 5271355387f3..ed28e54538ee 100644
--- a/net-misc/x2goclient/x2goclient-4.0.3.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-4.0.3.1.ebuild,v 1.2 2015/01/09 13:47:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/x2goclient/x2goclient-4.0.3.1.ebuild,v 1.3 2015/01/26 10:40:58 ago Exp $
 
 EAPI=5
 inherit eutils nsplugins qt4-r2
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ldap nsplugin"
 
 DEPEND=">=net-libs/libssh-0.6.0_rc1
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index be936aa59a2e..c5bad60936a3 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2014.11.02.1.tar.gz 1123292 SHA256 2e4ee5cc168eb56f778beec48809aa18068c22f8bbaa1911f5b69cf51edb609e SHA512 0a21d216c36642a079e837440d05338970abd30352564a41267ddb33ff4afd866a28aa678c7186b2a0dd4a11e8ec1e36b55bdf1307b3f23b9f2d3422d8ab9fbd WHIRLPOOL 6bbd185c60371ef553899a2838950fcefa849c76b8ec70d18106e38f9be3ec0bc28c799bd3de3d4ad6a0956699ed6613706b7b4205fcddef1f0ec4bc7c9772a7
-DIST youtube-dl-2015.01.16.tar.gz 1280829 SHA256 194eeeea3357b95eb447d8cfdc3227802849e2be697e2bad925cfad01e3a673e SHA512 e835ab2d6d9968b037d5d5c19850ec7bf13e82301314a9461d3e0e4bdb9faa871c1b11b7c909d72f6eb4bd996736ac2841db52cf25e826ae3d854d4df305dbf6 WHIRLPOOL 8e0267cc107f339400ed5e9f1ca41b47e54ba6f1c24766d1baa66faac91390de87aa1a059ac5441f6c8f2669cb700a2669e8d8e0388053d26ad9981d154cc075
 DIST youtube-dl-2015.01.22.tar.gz 1285309 SHA256 9ff6b6e3d2b86043700f770f6a27acf8caa251f694f34227df8b27f67664f973 SHA512 a52188ca9a82ee5760b5e43d5cc506e9cd2ecfc8de481f24b669db7a27935c6dcc285205b29b6330bb299bd2abce10c6fded2f28d1490e6ae53f6ccd2c137c8c WHIRLPOOL eb0d6d01d78c01d3dbc1e8cd4ad99c382fc977c722ebecc864942c5b77549b95cda09725b5681071fea3b48ee9489750d6426b0bb64475947343502f5861f737
+DIST youtube-dl-2015.01.25.tar.gz 1305777 SHA256 f5345af6eba6f0f76cbddf920d311bc6e169cc07b58eeaa0295a7fc4bab587e7 SHA512 209d92fbaf11099f557a77a8762d40561e78a858d833f9c5388d2280ce165ae80e46f3b453bbd64c43d6f0b510a374a356d4cd6c9a57300615c8415df6f4e0e1 WHIRLPOOL e618565b15e823e7a28f5c81d547c29b6c41da037cb766221b57d239f99da98e69488afcf7d84a578f52ec33f802a6b7f508cfc0c23333edf3969e40cec5f831
diff --git a/net-misc/youtube-dl/youtube-dl-2015.01.16.ebuild b/net-misc/youtube-dl/youtube-dl-2015.01.25.ebuild
similarity index 96%
rename from net-misc/youtube-dl/youtube-dl-2015.01.16.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.01.25.ebuild
index 28575c2c53ab..84c615b54fce 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.01.16.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.01.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.01.16.ebuild,v 1.1 2015/01/18 13:53:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.01.25.ebuild,v 1.1 2015/01/26 11:36:45 jer Exp $
 
 EAPI=5
 
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
index 37d0f9dcd0e0..3b061522b2b5 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild,v 1.7 2015/01/18 08:44:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild,v 1.8 2015/01/26 10:19:51 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="net-print/cups"
diff --git a/net-print/gtklp/gtklp-1.3.1.ebuild b/net-print/gtklp/gtklp-1.3.1.ebuild
index a6e9cf66c07b..2f32e81a9b1d 100644
--- a/net-print/gtklp/gtklp-1.3.1.ebuild
+++ b/net-print/gtklp/gtklp-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.3.1.ebuild,v 1.2 2015/01/22 08:39:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gtklp/gtklp-1.3.1.ebuild,v 1.3 2015/01/26 10:20:08 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gtklp/${P}.src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="nls ssl"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/net-wireless/iw/iw-3.17.ebuild b/net-wireless/iw/iw-3.17.ebuild
index 74623ee7b38a..455741f6ff42 100644
--- a/net-wireless/iw/iw-3.17.ebuild
+++ b/net-wireless/iw/iw-3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.17.ebuild,v 1.3 2015/01/22 08:39:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/iw/iw-3.17.ebuild,v 1.4 2015/01/26 10:40:20 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/libnl"
diff --git a/profiles/package.mask b/profiles/package.mask
index cfabefee2b0c..52462a8d098f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16299 2015/01/25 15:16:17 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16300 2015/01/26 15:46:07 floppym 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,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (26 Jan 2015)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-42
+
 # Julian Ospald <hasufell@gentoo.org> (22 Jan 2015)
 # Masked for removal in 30 days, wrt #537260.
 games-rpg/morrowind-data
@@ -427,11 +432,6 @@ dev-ml/obrowser
 # Missing deps, uninstallable
 www-apps/trac-downloads
 
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (21 Nov 2014)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-41
-
 # Markos Chandras <hwoarang@gentoo.org> (18 Nov 2014)
 # Mask latest development version for testing
 =x11-misc/lightdm-1.13*
diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc
index 5b6dd65fc13d..4e9218257749 100644
--- a/profiles/prefix/linux/profile.bashrc
+++ b/profiles/prefix/linux/profile.bashrc
@@ -17,7 +17,7 @@ fi
 if [[ ${EBUILD_PHASE} == setup ]]; then
     VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 )
     if [[ $VERS -lt 6 && "${CFLAGS} " != *'gnu89-inline '* ]]; then # compare host glibc 2.x to 2.6
-        elog "Your host glibc is too old; enabling -fgnu89-inline compiler flag. bug 473524"
+        einfo "Your host glibc is too old; enabling -fgnu89-inline compiler flag. bug 473524"
         CFLAGS="${CFLAGS} -fgnu89-inline" # for C only
     fi  
 fi
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e60a33693700..a3bdc448f79b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2072,6 +2072,7 @@ dev-ml/ocamlnet:httpd - Enables net-httpd web server component
 dev-ml/ocamlnet:zip - Enables netzip support to read/write gzip data using object channels
 dev-ml/pgocaml:batteries - Enable Batteries support instead of extlib
 dev-ml/utop:camlp4 - Enables camlp4 support.
+dev-ml/uutf:utftrip - Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.
 dev-perl/App-Nopaste:clipboard - copying of URLs with -x/--copy
 dev-perl/App-Nopaste:github - Github authentication
 dev-perl/App-Nopaste:pastebin - pastebin.com support
@@ -2174,7 +2175,6 @@ dev-python/amqplib:extras - Install extra tools to generate initial Python mod f
 dev-python/anyvc:bazaar - Add support for Bazaar
 dev-python/anyvc:mercurial - Add support for Mercurial
 dev-python/bokeh:chaco - Enable interface for implementing qplot and ggplot like functionality using chaco
-dev-python/bpython:urwid - Backend based on dev-python/urwid
 dev-python/celery:redis - Enables redis support
 dev-python/celery:sqs - Enables Amazon SQS transport module for celery
 dev-python/celery:yaml - Enable support of yaml as a configuration file format
@@ -2518,7 +2518,6 @@ dev-util/anjuta:devhelp - Enable devhelp integration
 dev-util/anjuta:glade - Build glade plugin for anjuta
 dev-util/anjuta:packagekit - Use packagekit to search for missing tools
 dev-util/anjuta:terminal - Enable terminal plugin based on x11-libs/vte
-dev-util/anjuta:vala - Enable support for the Vala programming language
 dev-util/apitrace:cli - Enable command line interface
 dev-util/apitrace:egl - Enable EGL support
 dev-util/buildbot:irc - Add support for status delivery through an ircbot.
@@ -7603,7 +7602,6 @@ x11-libs/cairo:opengl - Use Mesa backend for acceleration
 x11-libs/cairo:openvg - Use OpenVG for backend acceleration
 x11-libs/cairo:valgrind - Built-in support to mark memory regions
 x11-libs/cairo:xlib-xcb - Use XCB renderer backend for acceleration over xlib
-x11-libs/colord-gtk:vala - Generate bindings for dev-lang/vala
 x11-libs/fltk:games - Builds and installs some extra games
 x11-libs/glamor:gles - Build glamor based on gles2
 x11-libs/gtk+:cloudprint - Enable printing via Google Cloud Print.
diff --git a/sci-biology/rebase/Manifest b/sci-biology/rebase/Manifest
index 79c961d514d0..c07e862dd316 100644
--- a/sci-biology/rebase/Manifest
+++ b/sci-biology/rebase/Manifest
@@ -1,3 +1,2 @@
-DIST rebase-1411.tar.xz 63580536 SHA256 25539f305825ddfd655709f6a5985eaae7315b9f8375dac85b40e1eb2b5abaf2 SHA512 b0d63438c00b8f197c6ae915969cca392ed829c5e7a03cc9abdc2fb2bdbc86896f537df427d979219bd8f5a30cd2dacf0089e4f4ed82c4644ab7e5ecaf4b84eb WHIRLPOOL d0691d415ae576c8f82d5a8dbbea0118f47ac0ae2fb43b66e7ec004a82cc784fdcdd83885f19ce129d1b999e4b84ea0babb0e1d22a159ee8fef9540712b62be0
 DIST rebase-1412.tar.xz 65051884 SHA256 0056bf0b7f965749aa6704012417db74003576a77fbaee393123c88fab567d49 SHA512 e96d4c003b606eddb1274aa5b9baf422bb49310e5cdeba38c2c918c571420ece300dddff431160199950079b409d5aafe5fc322a1b9aa1f2727f79e571f76fb8 WHIRLPOOL 53ceb8b4a83048d5792fa569dea98830c3ae94400759e28822df7533569d26047f85aca9b0abd861ac89a944a83fb90d224b79fc2bfce4f79ff77daeb69c1b72
 DIST rebase-1501.tar.xz 66478008 SHA256 4ffba0e98524cb25389f6cb0079792a4efc1e0f95101961105ecd67209c79f94 SHA512 46656da15d297d3a58382559da16659f0c01611910cde4284ef45e3f0d181bcb7878ba32465ea154e45a3658b731d4cb2a5a25f62105a05daf284bbd78df3592 WHIRLPOOL 57fdd5ddf01842e0214f64231c9171234e7dedd06b7d1faeef996142c67bfbfa582cd0a85f0156f9f51f1c6c12e7603c2b1aba7c4edb8c6e5c11af6247b84e02
diff --git a/sci-biology/rebase/rebase-1411.ebuild b/sci-biology/rebase/rebase-1411.ebuild
deleted file mode 100644
index be2060934f66..000000000000
--- a/sci-biology/rebase/rebase-1411.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1411.ebuild,v 1.4 2014/12/31 16:10:56 ago Exp $
-
-EAPI=5
-
-MY_PV=${PV#1}
-
-DESCRIPTION="A restriction enzyme database"
-HOMEPAGE="http://rebase.neb.com"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emboss minimal"
-
-RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="binchecks strip"
-
-src_compile() {
-	if use emboss; then
-		echo; einfo "Indexing Rebase for usage with EMBOSS."
-		mkdir REBASE || die
-		EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
-				-protofile proto.${MY_PV} -equivalences \
-				|| die "Indexing Rebase failed."
-		echo
-	fi
-}
-
-src_install() {
-	if ! use minimal; then
-		insinto /usr/share/${PN}
-		doins withrefm.${MY_PV} proto.${MY_PV}
-	fi
-	newdoc REBASE.DOC README
-	if use emboss; then
-		insinto /usr/share/EMBOSS/data/REBASE
-		doins REBASE/embossre.{enz,ref,sup}
-		insinto /usr/share/EMBOSS/data
-		doins REBASE/embossre.equ
-	fi
-}
diff --git a/sci-biology/rebase/rebase-1412.ebuild b/sci-biology/rebase/rebase-1412.ebuild
index ff07853772b1..477687579c4f 100644
--- a/sci-biology/rebase/rebase-1412.ebuild
+++ b/sci-biology/rebase/rebase-1412.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1412.ebuild,v 1.3 2015/01/17 13:59:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/rebase/rebase-1412.ebuild,v 1.4 2015/01/26 10:34:05 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emboss minimal"
 
 RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
diff --git a/sci-electronics/geda/geda-1.8.2.ebuild b/sci-electronics/geda/geda-1.8.2.ebuild
index f950cfbe3767..cd1098eefebe 100644
--- a/sci-electronics/geda/geda-1.8.2.ebuild
+++ b/sci-electronics/geda/geda-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.8.2.ebuild,v 1.3 2015/01/22 08:43:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.8.2.ebuild,v 1.4 2015/01/26 10:34:39 ago Exp $
 
 EAPI=4
 inherit eutils fdo-mime flag-o-matic gnome2-utils versionator
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(get_version_component_ra
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc examples nls stroke threads"
 
 CDEPEND="
diff --git a/sci-libs/arpack/arpack-3.1.3-r1.ebuild b/sci-libs/arpack/arpack-3.1.3-r1.ebuild
index a45a73904290..5896e12d4789 100644
--- a/sci-libs/arpack/arpack-3.1.3-r1.ebuild
+++ b/sci-libs/arpack/arpack-3.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.3-r1.ebuild,v 1.5 2015/01/18 08:45:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-3.1.3-r1.ebuild,v 1.6 2015/01/26 10:32:52 ago Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples mpi static-libs"
 
 RDEPEND="
diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
index 7beda32640a4..9e500d523034 100644
--- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild
+++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/cgcode-1.0-r2.ebuild,v 1.5 2015/01/09 13:39:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cgcode/cgcode-1.0-r2.ebuild,v 1.6 2015/01/26 09:58:58 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://fetk.org/codes/cgcode/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 IUSE=""
 
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
index 5a085e1fc552..2b629610da93 100644
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/inchi-1.04.ebuild,v 1.9 2015/01/18 08:46:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/inchi/inchi-1.04.ebuild,v 1.10 2015/01/26 10:34:22 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="IUPAC-InChi"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 DEPEND="app-arch/unzip"
diff --git a/sci-libs/metis/metis-4.0.3.ebuild b/sci-libs/metis/metis-4.0.3.ebuild
index ba60f1f3c151..7ebf6a7bd430 100644
--- a/sci-libs/metis/metis-4.0.3.ebuild
+++ b/sci-libs/metis/metis-4.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/metis/metis-4.0.3.ebuild,v 1.11 2015/01/22 08:39:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/metis/metis-4.0.3.ebuild,v 1.12 2015/01/26 10:33:29 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="free-noncomm"
 IUSE="doc static-libs"
 
diff --git a/sci-libs/parmetis/parmetis-3.2.0.ebuild b/sci-libs/parmetis/parmetis-3.2.0.ebuild
index 3d66e18e6606..195902eb26cf 100644
--- a/sci-libs/parmetis/parmetis-3.2.0.ebuild
+++ b/sci-libs/parmetis/parmetis-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/parmetis-3.2.0.ebuild,v 1.5 2015/01/09 13:41:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/parmetis-3.2.0.ebuild,v 1.6 2015/01/26 10:33:47 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${MYP}.tar.gz"
 
 SLOT="0"
 LICENSE="free-noncomm"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 DEPEND="virtual/mpi"
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild
index 00d4779e95f3..419c9728c741 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild,v 1.7 2015/01/18 08:45:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild,v 1.8 2015/01/26 10:32:34 ago Exp $
 
 EAPI=5
 
@@ -12,5 +12,5 @@ SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index d9a6c1492108..377b0a7e7d15 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -1,2 +1 @@
-DIST superlu_4.1.tar.gz 2235055 SHA256 db79b732c6defc1b8f9a48d202bd52bd2a506eb355333e2073c4949c0f48fcf1 SHA512 64ec9f68e141a1debe28fd3c0596afafe415d8044a39b648833b003cc6d6290484010011a2167573a7001a8564c2faa72d467bb36d9772cf8940e41044ebbc59 WHIRLPOOL 60db6826a53a53356be3395da8e8c16e3afcdcaa6839547138207e8c3c0653494f4087c7075031d5b75374c1e0f1d69983e56601032050443fec9acd202dcfb6
 DIST superlu_4.3.tar.gz 2876631 SHA256 7aa08e75fba6b242aef20f10a31d7e052ad74ad29384e68d41a61d1d642f18da SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c WHIRLPOOL 034d924a736d101497df13f4f69d96b9e375c78a207df1615a7d22b639e24d755e9cb16e952c57ee8eece8d4ea7aa9f9d0576aaaee19ae0b0898698973864c15
diff --git a/sci-libs/superlu/superlu-4.1-r1.ebuild b/sci-libs/superlu/superlu-4.1-r1.ebuild
deleted file mode 100644
index c1d0d7710630..000000000000
--- a/sci-libs/superlu/superlu-4.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.1-r1.ebuild,v 1.12 2013/02/21 21:23:07 jlec Exp $
-
-EAPI="2"
-
-inherit autotools eutils fortran-2 toolchain-funcs multilib
-
-MY_PN=SuperLU
-
-DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="http://crd.lbl.gov/~xiaoye/SuperLU/"
-SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-
-RDEPEND="
-	virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-S="${WORKDIR}/${MY_PN}_${PV}"
-
-src_prepare() {
-	unset VERBOSE
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	sed \
-		-e "s:= ar:= $(tc-getAR):g" \
-		-e "s:= ranlib:= $(tc-getRANLIB):g" \
-		-i make.inc || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	cd TESTING
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		FORTRAN="$(tc-getFC)" \
-		LOADER="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		FFLAGS="${FFLAGS}" \
-		LOADOPTS="${LDFLAGS}" \
-		BLASLIB="$($(tc-getPKG_CONFIG) --libs blas)" \
-		SUPERLULIB="${S}/SRC/.libs/libsuperlu$(get_libname)" \
-		LD_LIBRARY_PATH="${S}/SRC/.libs" \
-		DYLD_LIBRARY_PATH="${S}/SRC/.libs" \
-		|| die "emake matrix generation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-
-	if use doc; then
-		dodoc DOC/ug.pdf || die
-		dohtml DOC/html/* || die
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN || die
-	fi
-}
diff --git a/sci-libs/superlu/superlu-4.3.ebuild b/sci-libs/superlu/superlu-4.3.ebuild
index 517974b99219..1aa9735b2409 100644
--- a/sci-libs/superlu/superlu-4.3.ebuild
+++ b/sci-libs/superlu/superlu-4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3.ebuild,v 1.11 2015/01/18 08:46:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/superlu/superlu-4.3.ebuild,v 1.12 2015/01/26 10:33:10 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="${HOMEPAGE}/${PN}_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 RDEPEND="
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 48bb63241896..3ee491ffddcc 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,2 +1,2 @@
-DIST accountsservice-0.6.37.tar.xz 363244 SHA256 b0b21136dc9d74a7135fd5ed7fa1a8069efb91bc6ecc1ef8911125433345a5c1 SHA512 c6014da6796ed384c02f9171bb47cdbc5da61d80d53adbc3120c19a1166caa2ede2a6e676cfc6ddf2b953e78a290b70d86a5bf1af10c428e215a875878cc816c WHIRLPOOL 0287d845e04d2c134fd88b4e1c281a7e193844c691f8c61f48efa81e680b7fe98008b742d641dc7bf41ba64c949287997a84648d983c9062750adddf8d7fbdff
 DIST accountsservice-0.6.39.tar.xz 367648 SHA256 f938a3d517ddd44c7605b49f11028198071906e0fde96f22c7e16d1eb275335d SHA512 b72f2edf95b7df5b38c75fbe4be2581384f7ff3631248a9fd2a523a13638e2c9c8933f195b8991a7138a556786531258b00878dc1a68863b616d2d2a17cbcf33 WHIRLPOOL 34b199ea220a8a34743ded82fba37b1ce90f7aafc9b7c1eb5988ef772d5d1f4d5283267327370d5a26966cc5370549323ffd2a9645bead9700b1a53dd5afe9bf
+DIST accountsservice-0.6.40.tar.xz 367772 SHA256 f04f756600cbab558671658ab8e77212de2a000c07bc0469e7b51541871fcb2b SHA512 da12a97ca9a2eb69d978fd3b5f46e8dd2e2f3e6f57db027e0b8c8c583c715d45f105c9ddcd1a2a1c4a2f4bfce672431e601a7cd0f063b31675fd6f13b6cb4ef8 WHIRLPOOL 3a12f5e5e68f3b21ec1347a9e1677b8eee10818ced138e35a3b1f61d8814a6af5ad50aed352a0fcbec819d8271c46c8db2e93ea0c7ccbbb5672f0f7e7e4786be
diff --git a/sys-apps/accountsservice/accountsservice-0.6.37.ebuild b/sys-apps/accountsservice/accountsservice-0.6.40.ebuild
similarity index 86%
rename from sys-apps/accountsservice/accountsservice-0.6.37.ebuild
rename to sys-apps/accountsservice/accountsservice-0.6.40.ebuild
index 101f48881220..3d7a31579008 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.37.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.37.ebuild,v 1.6 2014/11/02 09:41:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.40.ebuild,v 1.1 2015/01/26 12:51:50 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="doc +introspection selinux systemd"
 
@@ -50,7 +50,6 @@ src_configure() {
 		--disable-static \
 		--disable-more-warnings \
 		--localstatedir="${EPREFIX}"/var \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--enable-admin-group="wheel" \
 		$(use_enable doc docbook-docs) \
 		$(use_enable introspection) \
diff --git a/sys-apps/biosdevname/biosdevname-0.6.1.ebuild b/sys-apps/biosdevname/biosdevname-0.6.1.ebuild
index 298fad4096c4..bafd0ee998c4 100644
--- a/sys-apps/biosdevname/biosdevname-0.6.1.ebuild
+++ b/sys-apps/biosdevname/biosdevname-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.6.1.ebuild,v 1.2 2015/01/09 13:39:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.6.1.ebuild,v 1.3 2015/01/26 09:38:36 ago Exp $
 
 EAPI=4
 inherit udev
@@ -11,7 +11,7 @@ SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="virtual/udev"
diff --git a/sys-apps/iproute2/iproute2-3.17.0.ebuild b/sys-apps/iproute2/iproute2-3.17.0.ebuild
index 32b61033de61..62df7ec201a7 100644
--- a/sys-apps/iproute2/iproute2-3.17.0.ebuild
+++ b/sys-apps/iproute2/iproute2-3.17.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.17.0.ebuild,v 1.4 2015/01/22 08:40:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.17.0.ebuild,v 1.5 2015/01/26 09:40:11 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/usbutils/usbutils-008.ebuild b/sys-apps/usbutils/usbutils-008.ebuild
index 6dfc3a039fb9..16ec0867ef4e 100644
--- a/sys-apps/usbutils/usbutils-008.ebuild
+++ b/sys-apps/usbutils/usbutils-008.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-008.ebuild,v 1.6 2015/01/18 08:49:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-008.ebuild,v 1.7 2015/01/26 10:39:23 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild b/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
index 7967951efab2..536468965fe2 100644
--- a/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
+++ b/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild,v 1.2 2015/01/09 13:40:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/mpt-status/mpt-status-1.2.0-r1.ebuild,v 1.3 2015/01/26 10:08:44 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.drugphish.ch/~ratz/mpt-status/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.2.0-gentoo.patch"
diff --git a/sys-block/ms-sys/ms-sys-2.4.0.ebuild b/sys-block/ms-sys/ms-sys-2.4.0.ebuild
index a9f563ec3392..36c515b432fe 100644
--- a/sys-block/ms-sys/ms-sys-2.4.0.ebuild
+++ b/sys-block/ms-sys/ms-sys-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/ms-sys/ms-sys-2.4.0.ebuild,v 1.3 2015/01/09 13:42:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/ms-sys/ms-sys-2.4.0.ebuild,v 1.4 2015/01/26 10:09:01 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="linguas_sv"
 
 DEPEND="sys-devel/gettext"
diff --git a/sys-cluster/ploop/ploop-1.12.ebuild b/sys-cluster/ploop/ploop-1.12.ebuild
index 56893b7f52e4..cf89796f0783 100644
--- a/sys-cluster/ploop/ploop-1.12.ebuild
+++ b/sys-cluster/ploop/ploop-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.12.ebuild,v 1.2 2015/01/09 13:40:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ploop/ploop-1.12.ebuild,v 1.3 2015/01/26 09:39:32 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug static-libs"
 
 DEPEND="
diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild b/sys-devel/bin86/bin86-0.16.21.ebuild
index 52fed214e98f..8d8574e2d62c 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.21.ebuild,v 1.3 2015/01/09 13:41:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.21.ebuild,v 1.4 2015/01/26 10:39:40 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-devel/libtool/libtool-2.4.4.ebuild b/sys-devel/libtool/libtool-2.4.4.ebuild
index dbdb8fd1025f..8c43019f5a43 100644
--- a/sys-devel/libtool/libtool-2.4.4.ebuild
+++ b/sys-devel/libtool/libtool-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.4.ebuild,v 1.4 2015/01/22 18:36:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.4.ebuild,v 1.5 2015/01/26 09:40:34 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.5-r2.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.5-r2.ebuild
deleted file mode 100644
index 15b1484eab1c..000000000000
--- a/sys-fs/cachefilesd/cachefilesd-0.10.5-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/cachefilesd-0.10.5-r2.ebuild,v 1.5 2014/11/02 10:11:03 swift Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Provides a caching directory on an already mounted filesystem"
-HOMEPAGE="http://people.redhat.com/~dhowells/fscache/"
-SRC_URI="http://people.redhat.com/~dhowells/fscache/${P}.tar.bz2 -> ${P}.tar"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="doc selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.10.4-makefile.patch
-	tc-export CC
-	if ! use selinux; then
-		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
-	fi
-
-	append-flags -fpie
-}
-
-src_install() {
-	default
-
-	if use selinux; then
-		insinto /usr/share/doc/${P}
-		doins -r selinux
-	fi
-
-	dodoc howto.txt
-
-	newconfd "${FILESDIR}"/cachefilesd.conf ${PN}
-	newinitd "${FILESDIR}"/cachefilesd.init ${PN}
-
-	systemd_dounit ${PN}.service
-
-	keepdir /var/cache/fscache
-}
-
-pkg_postinst() {
-	[[ -d /var/cache/fscache ]] && return
-	elog "Before CacheFiles can be used, a directory for local storage"
-	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
-	elog "uses /var/cache/fscache.  The filesystem mounted there must support"
-	elog "extended attributes (mount -o user_xattr)."
-	echo ""
-	elog "Once that is taken care of, start the daemon, add -o ...,fsc"
-	elog "to the mount options of your network mounts, and let it fly!"
-}
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.5-r3.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.5-r3.ebuild
deleted file mode 100644
index a7458d66da4a..000000000000
--- a/sys-fs/cachefilesd/cachefilesd-0.10.5-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/cachefilesd-0.10.5-r3.ebuild,v 1.2 2014/11/02 10:11:03 swift Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Provides a caching directory on an already mounted filesystem"
-HOMEPAGE="http://people.redhat.com/~dhowells/fscache/"
-SRC_URI="http://people.redhat.com/~dhowells/fscache/${P}.tar.bz2 -> ${P}.tar"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.10.4-makefile.patch
-	tc-export CC
-	if ! use selinux; then
-		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
-	fi
-
-	append-flags -fpie
-}
-
-src_install() {
-	default
-
-	if use selinux; then
-		insinto /usr/share/doc/${P}
-		doins -r selinux
-	fi
-
-	dodoc howto.txt
-
-	newconfd "${FILESDIR}"/cachefilesd.conf ${PN}
-	newinitd "${FILESDIR}"/cachefilesd-2.init ${PN}
-
-	systemd_dounit ${PN}.service
-
-	keepdir /var/cache/fscache
-}
-
-pkg_postinst() {
-	[[ -d /var/cache/fscache ]] && return
-	elog "Before CacheFiles can be used, a directory for local storage"
-	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
-	elog "uses /var/cache/fscache.  The filesystem mounted there must support"
-	elog "extended attributes (mount -o user_xattr)."
-	echo ""
-	elog "Once that is taken care of, start the daemon, add -o ...,fsc"
-	elog "to the mount options of your network mounts, and let it fly!"
-}
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
index 6050d4d1ccb9..cae6d831a41d 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild,v 1.3 2015/01/09 13:41:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild,v 1.4 2015/01/26 10:00:11 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://people.redhat.com/~dhowells/fscache/${P}.tar.bz2 -> ${P}.tar"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
diff --git a/sys-fs/ext4magic/Manifest b/sys-fs/ext4magic/Manifest
index cf957c90ae9e..c8872a3df721 100644
--- a/sys-fs/ext4magic/Manifest
+++ b/sys-fs/ext4magic/Manifest
@@ -1,3 +1 @@
-DIST ext4magic-0.3.0.tar.gz 410590 SHA256 927b7b2c73f9b81a3cbf13a2643c60023b573b6ec24565d02a3bb08abea79985 SHA512 ba31e3b0b1942d8b1c08a81b2a8777bbacb9cc89be60e472b8de6032850b5ddd0a6170863f511658435202f27e701e120adf88257e1789e853cd57f3422d5d45 WHIRLPOOL e65ca9e26bc689e937486f1c35675296d7a5ad578b9db475aa033d01360db39cc983efe620fc7396418362aa12acf5521087e29b54b7829505cdce7e451e64e9
-DIST ext4magic-0.3.1.tar.gz 411237 SHA256 bcf231da889ac702b29d41ff8150a5615936cf1c55da73864da5c35272f37e49 SHA512 078649790071d4463d472fe7149a5fd90ea19eb7d598ed76e8159e7786303587ac71b00e353a7978134d9b4d2e9ee4452aa01b8c047b8473c5bb4cddb92fd598 WHIRLPOOL 4f5917f998380fd8242769acf90acb76af4cd0514b16d9b00f3f896a644cf131061f3c768c5a2eb82e96924f3bffbbb5428b1b2ed6a1d57eebb6c88031244ef5
 DIST ext4magic-0.3.2.tar.gz 426941 SHA256 8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115 SHA512 81bc9ba40dc2ea0bfb01bec160a1bbf0bf8a7983241aba34190d3571386f4d7dc63409866737b8d64516a3594eba11c819bbb721a1942c0a675d5675a7bba9a1 WHIRLPOOL 34bb59fa31babb0ac0edf098ed428c0f3a30976ce81edda15c1498e69f5a8d4453e3f7a133bd42dfe30bd11a42561ae8dd653a56e5831a8aaafacc90ba840da0
diff --git a/sys-fs/ext4magic/ext4magic-0.3.0.ebuild b/sys-fs/ext4magic/ext4magic-0.3.0.ebuild
deleted file mode 100644
index c1f38fd39408..000000000000
--- a/sys-fs/ext4magic/ext4magic-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext4magic/ext4magic-0.3.0.ebuild,v 1.2 2012/07/04 20:31:35 ssuominen Exp $
-
-EAPI=4
-
-DESCRIPTION="Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems"
-HOMEPAGE="http://developer.berlios.de/projects/ext4magic/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	>=sys-apps/file-5.04
-	sys-apps/util-linux
-	>=sys-fs/e2fsprogs-1.41.9
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/sys-fs/ext4magic/ext4magic-0.3.1-r1.ebuild b/sys-fs/ext4magic/ext4magic-0.3.1-r1.ebuild
deleted file mode 100644
index 62cfeaa6d5a5..000000000000
--- a/sys-fs/ext4magic/ext4magic-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext4magic/ext4magic-0.3.1-r1.ebuild,v 1.3 2013/02/17 17:36:46 ago Exp $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems"
-HOMEPAGE="http://developer.berlios.de/projects/ext4magic/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug expert-mode file-attr"
-
-RDEPEND="app-arch/bzip2
-	>=sys-apps/file-5.04
-	sys-apps/util-linux
-	>=sys-fs/e2fsprogs-1.41.9
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_configure() {
-	# build-system incorrectly recognizes '--disable-feature' options as enabled!
-	econf \
-		$(usex debug '--enable-debug' '') \
-		$(usex debug '--enable-debug-magic' '') \
-		$(usex expert-mode '--enable-expert-mode' '') \
-		$(usex file-attr '--enable-file-attr' '')
-}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index ea546779965e..ce8b737b1e02 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,3 +4,4 @@ DIST patch-3.19-rc2.xz 5866896 SHA256 47e3e705485e7ffee4b119a229b63acab5603d7651
 DIST patch-3.19-rc3.xz 5905536 SHA256 eaa6ab2e8dbcf92809142b0c552dca30474bb1b6fe59cb8d5c2ebcda5b362d36 SHA512 3d858d1ebb4cd33b2eac78e8752b26e5d4266e973d4b1ad85d6bba6601ad0789c88e52a79fce02a677c4c0852f3e7ca05b35220983bb53ac79d56ccb504ca8e6 WHIRLPOOL 5e5f40283ee8c6ebbe4be8abe4bb8b20f337e1a39f036435b5e9b8ca5286e9d6c30d5c72f00b6d20487d628464fa8f484f7d4c654d709dfe34d8be1c6bf7879c
 DIST patch-3.19-rc4.xz 5938480 SHA256 dab3b0ea8caff16ebc68380e88ad09b79a61a3bf291c1bbf116b55b06ac35273 SHA512 4ce5b0eda402086d519c58d059a8a37d2b66c06ceb877448934f49111f6c5f84f333a9d63e882a5b806d5bc99e4fc7606e9c6e2ee787f67c943c65549f5f7b01 WHIRLPOOL 9832d2df533f181f5ef70ee763e2bd02875d3244a7a57bb2347abc651daab8cf7381999e5a2231d1a491fdbf368950c4e510dd87a452bcf378dcd0d6c6c6a55f
 DIST patch-3.19-rc5.xz 5981512 SHA256 a77dc24e149f0f90fa2b34508b40ed5d725a8f5690ea6873bb8641e2c0642623 SHA512 2d9e2c6226f91ab7bc91f405afbf1a6b92c182f3e33e1b2269abd52c6ae9b1a2814cec2b45cef2a8006e645077ce378310f78893c57486f35dbee79a84b1664a WHIRLPOOL 67747c22770a576ba2031931c06999c631a2dacd55ae214e995bf0499715ea03c3000b637f8db1c1031ae7ae8986cd9a88cc2dc88fe93f5f5915875b090e5caa
+DIST patch-3.19-rc6.xz 6013056 SHA256 a333002cc872c7aa354a99b8b56bb258ec56ada49d1d3a70f17dbbef73e164b2 SHA512 a0ebbbd5e9ba3c89bd946abb21cff993ac7cdff849ac04ebb623d0c54de6c966d5b4c18da78840a81703f567dd56554c51913e62ebdae486c10df69935ae1883 WHIRLPOOL 61dfee16ddec324922970120bdd66ced4a031134c2eb5e4ffb8cb551ad5981cdd4d3f9149f738256903eaf234f467ea751a16685842aaf4889aaba4c2055c80f
diff --git a/sys-kernel/git-sources/git-sources-3.19_rc6.ebuild b/sys-kernel/git-sources/git-sources-3.19_rc6.ebuild
new file mode 100644
index 000000000000..63c0a1065898
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-3.19_rc6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.19_rc6.ebuild,v 1.1 2015/01/26 11:40:38 ago Exp $
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_DEBLOB_AVAILABLE=0
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.1-r3"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-libs/libselinux/libselinux-2.3-r2.ebuild b/sys-libs/libselinux/libselinux-2.3-r2.ebuild
index 0c75d20f9a5a..3ec735452ff0 100644
--- a/sys-libs/libselinux/libselinux-2.3-r2.ebuild
+++ b/sys-libs/libselinux/libselinux-2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r2.ebuild,v 1.2 2015/01/22 08:40:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.3-r2.ebuild,v 1.3 2015/01/26 10:35:15 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
@@ -22,7 +22,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20"
 
diff --git a/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild b/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild
index f9a14733de73..578dd4d95292 100644
--- a/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild,v 1.2 2015/01/22 08:42:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsemanage/libsemanage-2.3-r4.ebuild,v 1.3 2015/01/26 10:35:34 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_2 python3_3 python3_4 )
@@ -18,7 +18,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="python"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e48ec0130e1f..cdd67e780205 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,3 @@
 DIST chromium-40.0.2214.91.tar.xz 284982556 SHA256 f72fda9ff1ea256ab911610ee532eadf8303137d431f2481d01d3d60e5e64149 SHA512 fc95eb1d6975710f5641a039503830f57f5c9c874e18d55d8e0b88bae190b1cfbc073a18fc4634cd3543b74e1dad924a9565b1ac9d160c792f9b1957e2ce6d33 WHIRLPOOL cf2662c656a047e7c687a2c96e309f3cff2705d7c01a07edcef8e264dc61686db53e219348057b5c33ede3af06da26cf050dac1afaf6c0e6d47fa6c2ce2e130d
 DIST chromium-41.0.2272.12-lite.tar.xz 237786236 SHA256 7093674377a99a4c8f64e18521a3973bdb74cc5ae75463a355a5bc44c783ddf4 SHA512 77be9cf563ccc690364d11d6be0b8cc7ca4baf3a74f996f8e2dadee236ab25daf06b7c8409ecafea6595e1bdf5c50eaeec09496164740495d398664ea6b36a3e WHIRLPOOL ac45b98be51db3539e511a53c162b81da72da4f2449354c867bae14c5c90dc3f62fe898604cb06782c54a50d786525bb82d94a546fde9d53d4bcceb13ea3002c
-DIST chromium-41.0.2272.3-lite.tar.xz 237751776 SHA256 fc3d64ab45b3c3ff6b714add779529f6e26902319872d4faa7679331ab00f36a SHA512 dd3f822b1fe231a7361e9c9ecbd4c72ab7d8d85b1b9570ea895ac221bd4bcfcb127d62dab6be42d1b3b1e4ba1ed12d97b6bea160831bd1a8768b2d8f63007b69 WHIRLPOOL 489433daf6fda378c8d6f7081a16dc6af66460fe6a323d081219ba0d695fc29c7359d598f145244b8191ae09668268ef6ae2ea685130bb4e785dc01cd2f3a051
+DIST chromium-41.0.2272.16-lite.tar.xz 237800940 SHA256 f90eaac9d316829f78069cc28f679bff31187026ba12e9910110829127743141 SHA512 b112dd131a0fedad761057b9e103f866ee72c8a199c2e489f1615f23eccb1502b7c54a59c8c2226d62f3f3dc9d9273b9546956a83d13e66e8005797e46ed63a2 WHIRLPOOL c5279b7cd15a73216f1de61fe960fc99dcae9c966ed01f08af3d8c3e7d4daa3e8882c16b6770b74f14c7e28f2d0d246b0230488de58d27d022c27d62db0eb6a6
diff --git a/www-client/chromium/chromium-41.0.2272.12.ebuild b/www-client/chromium/chromium-41.0.2272.16.ebuild
similarity index 99%
rename from www-client/chromium/chromium-41.0.2272.12.ebuild
rename to www-client/chromium/chromium-41.0.2272.16.ebuild
index fe155d6f20a4..f4f37804c6d3 100644
--- a/www-client/chromium/chromium-41.0.2272.12.ebuild
+++ b/www-client/chromium/chromium-41.0.2272.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.12.ebuild,v 1.1 2015/01/21 20:50:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.16.ebuild,v 1.1 2015/01/26 15:43:32 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -185,6 +185,7 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/${PN}-cups-r0.patch"
 
 	epatch_user
 
diff --git a/www-client/chromium/chromium-41.0.2272.3.ebuild b/www-client/chromium/chromium-41.0.2272.3.ebuild
deleted file mode 100644
index 5f2a0084a25d..000000000000
--- a/www-client/chromium/chromium-41.0.2272.3.ebuild
+++ /dev/null
@@ -1,619 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-41.0.2272.3.ebuild,v 1.3 2015/01/18 13:39:18 phajdan.jr Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc"
-RESTRICT="!bindist? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? (
-		dev-libs/libgcrypt:0=
-		>=net-print/cups-1.3.11:=
-	)
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	dev-libs/icu:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-base/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libXNVCtrl' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/logging.h' \
-		'third_party/pdfium/third_party/macros.h' \
-		'third_party/pdfium/third_party/numerics' \
-		'third_party/pdfium/third_party/template_util.h' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/tlslite' \
-		'third_party/trace-viewer' \
-		'third_party/trace-viewer/third_party/components/polymer' \
-		'third_party/trace-viewer/third_party/d3' \
-		'third_party/trace-viewer/third_party/gl-matrix' \
-		'third_party/trace-viewer/third_party/jszip' \
-		'third_party/trace-viewer/third_party/tvcm' \
-		'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
-		'third_party/undoview' \
-		'third_party/usrsctp' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/kernel' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libvpx (http://crbug.com/347823).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	# Always support proprietary codecs.
-	myconf+=" -Dproprietary_codecs=1"
-
-	ffmpeg_branding="Chromium"
-	if ! use bindist; then
-		# Enable H.264 support in bundled ffmpeg.
-		ffmpeg_branding="Chrome"
-	fi
-	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-	doexe out/Release/libpdf.so || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/surfraw/surfraw-2.2.9-r1.ebuild b/www-client/surfraw/surfraw-2.2.9-r1.ebuild
index c5f4a69d46b5..5ab98f8b6bfb 100644
--- a/www-client/surfraw/surfraw-2.2.9-r1.ebuild
+++ b/www-client/surfraw/surfraw-2.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.9-r1.ebuild,v 1.3 2015/01/22 08:40:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.9-r1.ebuild,v 1.4 2015/01/26 10:00:28 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 hppa ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 RESTRICT="test"
 RDEPEND="dev-lang/perl"
 
diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
index 33759ce095da..6dc0e4723b8b 100644
--- a/www-servers/thin/Manifest
+++ b/www-servers/thin/Manifest
@@ -1,3 +1 @@
-DIST thin-1.5.1.tar.gz 176614 SHA256 523eb77709cc3427279df658f566a1c4eeaf85825ba2747f599eabf1fcb83bb3 SHA512 f691569eab296f4bcc11599da8c5a0715ce3b681dd616b09a9e245e67953e4f34e7a0a9a66d85b6cdef27ce3e9d569b09f21039802ccfeaf8d02c649b39356d8 WHIRLPOOL ee832d8a3ff3c1bbbc9d3dab414a1f6798445480e24df92afe39d0fdc14a27034e3dc1c3c12c7101866fdeb1f1b8f80b86c825e2a919593af495e059e7b85f57
-DIST thin-1.6.2.tar.gz 179335 SHA256 8ae29b80a9c0fd07503ca687381d5b7a9afd59f1fd4ca0584e434ed18f45c28e SHA512 0f8e2ae0c622f53f76c4f940c16c0e5e43040e528eb76a95deab3a93bc7d10de5c8521e0d2ee66cd39f71377dd587fc0bb2a97158d1b0ffee1d06b0bd89bbd9f WHIRLPOOL cc20d29ecc99677338c670a4bbb7a4dc30ad1497104f4e547157f7aca67220102f0990326b145187b4a83e206b95a9b6068d1a5c8ca4780db4af336db4331f2f
 DIST thin-1.6.3.tar.gz 180296 SHA256 67ad0865c75c09b454bdabfaf7943275282f4aa059a5fb38b9aef8f2c5f7f231 SHA512 de8c564a9af79d6b8ed849d39c2147745deca8744926a96fe9a5f81745ccab0df5f144d74f1a69fb31d61c8b229d9f51331ad39770d20015e7a4e6453b3abed0 WHIRLPOOL bda35046cb67042273cba973a015518d62dce63627d8c58f7ab57e0a2a6eb6398d17a6d2e0e16f6627714c3aca48bbf0260abd3d34790b76e071ea12f5083735
diff --git a/www-servers/thin/thin-1.5.1-r1.ebuild b/www-servers/thin/thin-1.5.1-r1.ebuild
deleted file mode 100644
index 6185ab565974..000000000000
--- a/www-servers/thin/thin-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.5.1-r1.ebuild,v 1.2 2014/01/01 14:30:31 patrick Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and very simple Ruby web server"
-HOMEPAGE="http://code.macournoyer.com/thin/"
-SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-# The runtime dependencies are used at build-time as well since the
-# Rakefile loads thin!
-mydeps=">=dev-ruby/daemons-1.0.9
-	>=dev-ruby/rack-1.0.0
-	>=dev-ruby/eventmachine-0.12.6
-	virtual/ruby-ssl"
-
-ruby_add_rdepend "${mydeps}"
-ruby_add_bdepend "${mydeps}
-	dev-ruby/rake-compiler
-	test? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	# Fix Ragel-based parser generation (uses a *very* old syntax that
-	# is not supported in Gentoo)
-	sed -i -e 's: | rlgen-cd::' Rakefile || die
-
-	# Fix specs' dependencies so that the extension is not rebuilt
-	# when running tests
-	sed -i -e '/:spec =>/s:^:#:' tasks/spec.rake || die
-
-	# Fix rspec version to allow newer 1.x versions
-	sed -i -e '/gem "rspec"/ s/1.2.9/1.0/' tasks/spec.rake spec/spec_helper.rb || die
-
-	# Avoid CLEAN since it may not be available and we don't need it.
-	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
-
-	# Disable a test that is known for freezing the testsuite,
-	# reported upstream. In thin 1.5.1 this just fails.
-	sed -i \
-		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
-		spec/daemonizing_spec.rb || die
-
-	# nasty but too complex to fix up for now :(
-	use test || rm tasks/spec.rake
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "rake compile failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	keepdir /etc/thin
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	einfo
-	elog "Thin is now shipped with init scripts."
-	elog "The default script (/etc/init.d/thin) will start all servers that have"
-	elog "configuration files in /etc/thin/. You can symlink the init script to"
-	elog "files of the format 'thin.SERVER' to be able to start individual servers."
-	elog "See /etc/conf.d/thin for more configuration options."
-	einfo
-}
diff --git a/www-servers/thin/thin-1.5.1-r2.ebuild b/www-servers/thin/thin-1.5.1-r2.ebuild
deleted file mode 100644
index dd71237bf546..000000000000
--- a/www-servers/thin/thin-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.5.1-r2.ebuild,v 1.2 2014/01/01 14:30:31 patrick Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and very simple Ruby web server"
-HOMEPAGE="http://code.macournoyer.com/thin/"
-SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-# The runtime dependencies are used at build-time as well since the
-# Rakefile loads thin!
-mydeps=">=dev-ruby/daemons-1.0.9
-	>=dev-ruby/rack-1.0.0
-	>=dev-ruby/eventmachine-0.12.6
-	virtual/ruby-ssl"
-
-ruby_add_rdepend "${mydeps}"
-ruby_add_bdepend "${mydeps}
-	dev-ruby/rake-compiler
-	test? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	# Fix Ragel-based parser generation (uses a *very* old syntax that
-	# is not supported in Gentoo)
-	sed -i -e 's: | rlgen-cd::' Rakefile || die
-
-	# Fix specs' dependencies so that the extension is not rebuilt
-	# when running tests
-	sed -i -e '/:spec =>/s:^:#:' tasks/spec.rake || die
-
-	# Fix rspec version to allow newer 1.x versions
-	sed -i -e '/gem "rspec"/ s/1.2.9/1.0/' tasks/spec.rake spec/spec_helper.rb || die
-
-	# Avoid CLEAN since it may not be available and we don't need it.
-	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
-
-	# Disable a test that is known for freezing the testsuite,
-	# reported upstream. In thin 1.5.1 this just fails.
-	sed -i \
-		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
-		spec/daemonizing_spec.rb || die
-
-	# nasty but too complex to fix up for now :(
-	use test || rm tasks/spec.rake
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "rake compile failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	keepdir /etc/thin
-	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-1 ${PN}
-
-	einfo
-	elog "Thin is now shipped with init scripts."
-	elog "The default script (/etc/init.d/thin) will start all servers that have"
-	elog "configuration files in /etc/thin/. You can symlink the init script to"
-	elog "files of the format 'thin.SERVER' to be able to start individual servers."
-	elog "See /etc/conf.d/thin for more configuration options."
-	einfo
-}
diff --git a/www-servers/thin/thin-1.5.1-r3.ebuild b/www-servers/thin/thin-1.5.1-r3.ebuild
deleted file mode 100644
index 965d17606fc4..000000000000
--- a/www-servers/thin/thin-1.5.1-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.5.1-r3.ebuild,v 1.2 2014/01/01 14:30:31 patrick Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and very simple Ruby web server"
-HOMEPAGE="http://code.macournoyer.com/thin/"
-SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-# The runtime dependencies are used at build-time as well since the
-# Rakefile loads thin!
-mydeps=">=dev-ruby/daemons-1.0.9
-	>=dev-ruby/rack-1.0.0
-	>=dev-ruby/eventmachine-0.12.6
-	virtual/ruby-ssl"
-
-ruby_add_rdepend "${mydeps}"
-ruby_add_bdepend "${mydeps}
-	dev-ruby/rake-compiler
-	test? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	# Fix Ragel-based parser generation (uses a *very* old syntax that
-	# is not supported in Gentoo)
-	sed -i -e 's: | rlgen-cd::' Rakefile || die
-
-	# Fix specs' dependencies so that the extension is not rebuilt
-	# when running tests
-	sed -i -e '/:spec =>/s:^:#:' tasks/spec.rake || die
-
-	# Fix rspec version to allow newer 1.x versions
-	sed -i -e '/gem "rspec"/ s/1.2.9/1.0/' tasks/spec.rake spec/spec_helper.rb || die
-
-	# Avoid CLEAN since it may not be available and we don't need it.
-	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
-
-	# Disable a test that is known for freezing the testsuite,
-	# reported upstream. In thin 1.5.1 this just fails.
-	sed -i \
-		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
-		spec/daemonizing_spec.rb || die
-
-	# nasty but too complex to fix up for now :(
-	use test || rm tasks/spec.rake
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "rake compile failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	keepdir /etc/thin
-	newinitd "${FILESDIR}"/${PN}.initd-2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-2 ${PN}
-
-	einfo
-	elog "Thin is now shipped with init scripts."
-	elog "The default script (/etc/init.d/thin) will start all servers that have"
-	elog "configuration files in /etc/thin/. You can symlink the init script to"
-	elog "files of the format 'thin.SERVER' to be able to start individual servers."
-	elog "See /etc/conf.d/thin for more configuration options."
-	einfo
-}
diff --git a/www-servers/thin/thin-1.6.2.ebuild b/www-servers/thin/thin-1.6.2.ebuild
deleted file mode 100644
index 6048f2b1138c..000000000000
--- a/www-servers/thin/thin-1.6.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.6.2.ebuild,v 1.2 2014/07/10 11:53:22 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="spec:main spec:group:0 spec:group:1 spec:group:2"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and very simple Ruby web server"
-HOMEPAGE="http://code.macournoyer.com/thin/"
-SRC_URI="https://github.com/macournoyer/thin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-util/ragel"
-RDEPEND="${RDEPEND}"
-
-# The runtime dependencies are used at build-time as well since the
-# Rakefile loads thin!
-mydeps=">=dev-ruby/daemons-1.0.9
-	>=dev-ruby/rack-1.0.0
-	>=dev-ruby/eventmachine-1.0.0
-	virtual/ruby-ssl"
-
-ruby_add_rdepend "${mydeps}"
-ruby_add_bdepend "${mydeps}
-	dev-ruby/rake-compiler
-	test? ( dev-ruby/rspec:0 )"
-
-all_ruby_prepare() {
-	# Fix Ragel-based parser generation (uses a *very* old syntax that
-	# is not supported in Gentoo)
-	sed -i -e 's: | rlgen-cd::' Rakefile || die
-
-	# Fix specs' dependencies so that the extension is not rebuilt
-	# when running tests
-	sed -i -e '/:spec =>/s:^:#:' tasks/spec.rake || die
-
-	# Fix rspec version to allow newer 1.x versions
-	sed -i -e '/gem "rspec"/ s/1.2.9/1.0/' tasks/spec.rake spec/spec_helper.rb || die
-
-	# Avoid CLEAN since it may not be available and we don't need it.
-	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
-
-	# Disable a test that is known for freezing the testsuite,
-	# reported upstream. In thin 1.5.1 this just fails.
-	sed -i \
-		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
-		spec/daemonizing_spec.rb || die
-
-	# nasty but too complex to fix up for now :(
-	use test || rm tasks/spec.rake
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake compile || die "rake compile failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	keepdir /etc/thin
-	newinitd "${FILESDIR}"/${PN}.initd-2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-2 ${PN}
-
-	einfo
-	elog "Thin is now shipped with init scripts."
-	elog "The default script (/etc/init.d/thin) will start all servers that have"
-	elog "configuration files in /etc/thin/. You can symlink the init script to"
-	elog "files of the format 'thin.SERVER' to be able to start individual servers."
-	elog "See /etc/conf.d/thin for more configuration options."
-	einfo
-}
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index f0e1ffe21f42..9e5b9c132e4b 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -1 +1,2 @@
 DIST colord-gtk-0.1.25.tar.xz 271192 SHA256 bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a SHA512 858a95630109ebbcc1e75f6ccdd73af28f9f0739a797d23ea6eadc1447518652925383e61940f0181c7361956a7250b209c63be2107b7f696bb471a122989611 WHIRLPOOL 95fc0aa6e56cadcfb98b13561826d856fb1a5e2a8d0804a7f00c461bf590662c566e9d1213afd91012db0231f9ab65e78286422f8af84f4d9b953f3ed011f6cc
+DIST colord-gtk-0.1.26.tar.xz 280380 SHA256 28d00b7f157ea3e2ea5315387b2660fde82faba16674861c50465e55d61a3e45 SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d WHIRLPOOL 47eb1f5988a7404381bd8ca426ae7be595f4bb104785d97d16c3afa2d20b60c61b757eba6c2df94e1004e667a17848b17ac21095ae1bcfe482eeeeb2f01f007c
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
new file mode 100644
index 000000000000..6ea1f8ec55a4
--- /dev/null
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild,v 1.1 2015/01/26 13:05:37 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GTK support library for colord"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0/1" # subslot = libcolord-gtk soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107
+IUSE="doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=media-libs/lcms-2.2:2=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	x11-libs/gtk+:3[X(+),introspection?]
+	x11-misc/colord:=[introspection?,vala?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+"
+# ${PN} was part of x11-misc/colord until 0.1.22
+RDEPEND="${COMMON_DEPEND}
+	!<x11-misc/colord-0.1.27
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9
+	)
+	vala? ( $(vala_depend) )
+"
+
+RESTRICT="test" # Tests need a display device with a default color profile set
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-gtk2 \
+		--disable-static \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_compile() {
+	if use doc; then
+		MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile #482542
+	else
+		gnome2_src_compile
+	fi
+}
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
index b4dbbb90f9f4..da6fd63d0085 100644
--- a/x11-libs/colord-gtk/metadata.xml
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-	<flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
-</use>
 </pkgmetadata>
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
index ab6c4a923bf2..9bcb3218b47e 100644
--- a/x11-libs/gnome-pty-helper/Manifest
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -1,4 +1,4 @@
 DIST vte-0.34.9.tar.xz 996756 SHA256 6f38c5edf57d0a5b870c4e5e210731cccfb4899d0856ba7a3dc599f2ba6e23e1 SHA512 57fff7d5916bcd8a8a13e3cf050f85ed78e9154fdf2510a6d6f594f938c6d56f512089c6bc3e06c9123d35d17f2eb3b3814a5407635027ec0116c25f73034688 WHIRLPOOL 2caf90fdbce7baaf6038c0fda674577724ace354e63b8a6977e46b7f2cea8860f1a687cf34d4e10c4b08eeb666f6c62c42c0f5cfb0c55498fcc44cf44c9570d8
-DIST vte-0.36.2.tar.xz 1009160 SHA256 f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345 SHA512 fafd368b95918024e6324c81f4fa6c35ad15138ad44af2f92164492d9773b127202d11824c9def4a26e17de44336f42e9c8906330dd300795c280ca068381632 WHIRLPOOL 034b6879131d2535e21a8a97e571753e250f98e01ef334d639038a0638fc0a6d214a267267f11822c30919629edaabc6f6a66a366a9b506ae57e2d4674efa724
 DIST vte-0.36.3.tar.xz 1013412 SHA256 54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c SHA512 9e0c4e60c5a271720d7b480c9618069752faec6c310cc2477e67cdb1c3e961f6981d39c9116716739390dc8e4bab9bf06cf6c5d7d2546062e48523f85d731c77 WHIRLPOOL 0c582f50a07b9a55e8e7b16ae371b913348e8f93fc50ff734ea04a481a5e1ca30ebf3c3781dcd20fd340f50b34cd8f516de76ca59093f3952f23b99a5b30ddca
 DIST vte-0.38.2.tar.xz 1005048 SHA256 b2daba79229c84de3fbc41fcbb160c8d7ca50523fc01dedefada27e75ecc7de5 SHA512 4c493e18cca4b50d66640d282d7d33a471d1ac4bd2dd929b059b829a42fed852d202669751b266adf7291502203e26c513b6852b3035458d41a433b900b0c6bb WHIRLPOOL 2bfe6562f4476a223d63d4db5e85ed251cdb45c307072bc37515b74efa6ac1a2be299139e452319299a270ccccdf96b5cfd973555be021f7878d4e7a568f1c87
+DIST vte-0.38.3.tar.xz 1005548 SHA256 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4 SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164 WHIRLPOOL 4f67b4f6060b4178d8dde717577ae534fe68f436ce6d3f10e914c40bad44ce01c48f135c600b3d85c4f78a6577af0652bffa0b7e877ff2dc22b9996c9da00d76
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.34.9.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.34.9.ebuild
index 18b4f496018d..9a78fa1984e2 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.34.9.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.34.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gnome-pty-helper/gnome-pty-helper-0.34.9.ebuild,v 1.12 2014/04/21 10:30:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gnome-pty-helper/gnome-pty-helper-0.34.9.ebuild,v 1.14 2015/01/26 13:16:20 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
similarity index 89%
rename from x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.2.ebuild
rename to x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
index 8ec422f8969e..4b2aaeaee259 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.2.ebuild,v 1.1 2014/05/31 09:13:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild,v 1.1 2015/01/26 13:10:57 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index eb3c3c9950e2..aab639476ef0 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -3,3 +3,4 @@ DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e5
 DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
 DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
 DIST gtk+-3.14.6.tar.xz 15680832 SHA256 cfc424e6e10ffeb34a33762aeb77905c3ed938f0b4006ddb7e880aad234ef119 SHA512 7ebe517d0141a8d3302729b2b1f0f7ae64b715582d5c092f56a6632d12124b11d9fc519e18a242bab02a8c8e77208dc9569af98c0d377b0246f6ad4dd0c9f774 WHIRLPOOL c8b061655e288186182c9aaa26a826e9e98b39cd753aa718d765d31abb3f30af263f6fe8e5b57fd711547bd245db17412055cfd8943c97431de6b6c1ec7d9f2d
+DIST gtk+-3.14.7.tar.xz 15664532 SHA256 fb9914b04f218c1afb4820ea492f3c6ab6d6993cc6634ecade8303678d05a46e SHA512 d3d8ac5b65666a53f7c905ff087f460f423532135b7d6cdb9818b414e878193b7395d2eb5ec11ef64dd5495695ca672c4bd91481df53c76b5a155cf7041d6bc7 WHIRLPOOL 7495ff71eca3da11583d9a68185cda22ef9c553b92ab1ae814a2dcb2b7f795c48c15eedf70751c85abf3ca9720648c26d6ca7774752a7c08156e00f1906c528a
diff --git a/x11-libs/gtk+/gtk+-3.14.7.ebuild b/x11-libs/gtk+/gtk+-3.14.7.ebuild
new file mode 100644
index 000000000000..a14f435e0e52
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.14.7.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.7.ebuild,v 1.1 2015/01/26 13:36:45 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
+IUSE="aqua cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# Use gtk+:2 for gtk-update-icon-cache
+COMMON_DEPEND="
+	>=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39 )
+	wayland? (
+		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.38.2
+	>=dev-util/gtk-doc-am-1.20
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+#  http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	>=x11-themes/adwaita-icon-theme-3.14
+	X? ( !<x11-base/xorg-server-1.11.4 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# see bug #525928
+	epatch "${FILESDIR}"/${PN}-non-bash-support.patch
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
+
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset DISPLAY #527682
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+
+	# add -framework Carbon to the .pc files
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
index 2eabd7e05fc8..53abdb8f99f4 100644
--- a/x11-libs/libQGLViewer/Manifest
+++ b/x11-libs/libQGLViewer/Manifest
@@ -1,3 +1,2 @@
-DIST libQGLViewer-2.5.3.tar.gz 3082104 SHA256 309ddbf77643b3c1bd9e68f1a9c9ea95c4ecbf6cde2d2d56541ac78b986e421e SHA512 7e70aa15553c023f053ed1a65cc756b26390d8068c7000fb6ca3e7820a36ed039beb93ccbc02abaf25749b70ea8b98148dbb59c0c7a55b9db79c444a05df609e WHIRLPOOL 8143d701771f34b25486d666b000d20104e7e15fe37fd43c30cee85b00d95ab2683eb57f2cd1ba7147d0bf3deef81eb4314841c1088770365bd265efb2341a3b
-DIST libQGLViewer-2.5.4.tar.gz 3082107 SHA256 0b36b0e72533b15914270d2d65c486a75b113460d66e8bbc36adf32db9dacfb7 SHA512 527e77d29cb8bb544c44a07d29c9035fb01f01e4305d988d026cdadc9f4c6645bb85f166e1d53ab43ed0b5888bd8abf2567c478314b4f59bb244199553e9033d WHIRLPOOL 1f3221c4ed20137339ca388239579c106eadc5b759a414ad03f7d9fc12acfd6420fde0e71d9e938920efd4984ef65eebaee984f69c0c9cfa205589d2d70407b4
 DIST libQGLViewer-2.6.0.tar.gz 3082520 SHA256 c8ed96c8eba63c9093be1c61fa4375af063c1e0b2da864a0c8473bf6259742fd SHA512 33165cbfc52b7c4e8a8e34b4d5a27fcae410e872439f390dac4ea388691e282046a128699b138ed65f28ceb66adae24067e63554b60f72bbbfa3353613662019 WHIRLPOOL 7b2d5a67e2e44a4e90054d05d62b389b85ec4c69b5d68158923a1dd9575b23787dcef7ee9751870d1dd7e0988cc34d97c0be2b125512dff1c45feddcd1994551
+DIST libQGLViewer-2.6.1.tar.gz 3083024 SHA256 e6a783061d31b77e9f8b3bfb10e20bc8166b400c24679312b7e7662a0f12d822 SHA512 525006e5e79625c9d98a037eb19cded6c83c9a1f38b6abce9b513dd8bdd8fe8bcbf9bd6228b55181227dd1124a5734331b5a078737b3cf233c8496a83678f576 WHIRLPOOL 2889ee5a135a526fa4eb490de3975f5e4964d30f338d50bdda963f879321049e429a4c0f4b46f6a20c8341c640105ac48fcf8426f845b8e5c401c4f37295f189
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.5.3.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.5.3.ebuild
deleted file mode 100644
index f6f095b774c1..000000000000
--- a/x11-libs/libQGLViewer/libQGLViewer-2.5.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libQGLViewer/libQGLViewer-2.5.3.ebuild,v 1.3 2014/10/29 10:08:55 aballier Exp $
-
-EAPI="5"
-
-inherit qt4-r2 multilib flag-o-matic
-
-DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
-HOMEPAGE="http://www.libqglviewer.com"
-SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="designer examples"
-
-DEPEND="virtual/opengl
-	dev-qt/qtopengl:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	designer? ( dev-qt/designer:4 )"
-
-src_configure() {
-	append-ldflags "-L${S}/QGLViewer"
-	sed -e 's#designerPlugin##' -i ${P}.pro || die
-	use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
-	eqmake4 ${P}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-	if use designer ; then
-		cd "${S}/designerPlugin"
-		eqmake4 designerPlugin.pro
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README
-
-	if use designer ; then
-		cd "${S}/designerPlugin"
-		emake INSTALL_ROOT="${D}" install
-	fi
-
-	if use examples ; then
-		exeinto /usr/bin/${PN}-examples
-		doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
-	fi
-}
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.5.4.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild
similarity index 91%
rename from x11-libs/libQGLViewer/libQGLViewer-2.5.4.ebuild
rename to x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild
index 236f697300c2..6317501c20ae 100644
--- a/x11-libs/libQGLViewer/libQGLViewer-2.5.4.ebuild
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libQGLViewer/libQGLViewer-2.5.4.ebuild,v 1.1 2014/11/07 10:08:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild,v 1.1 2015/01/26 13:21:01 aballier Exp $
 
 EAPI="5"
 
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~arm"
 IUSE="designer examples"
 
 DEPEND="virtual/opengl
+	virtual/glu
 	dev-qt/qtopengl:4
 	dev-qt/qtgui:4"
 RDEPEND="${DEPEND}
diff --git a/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
index 8a6f9b3af80d..c494d4035af6 100644
--- a/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
+++ b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild,v 1.3 2015/01/22 08:45:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild,v 1.4 2015/01/26 09:39:51 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://launchpad.net/${PN}/0.4/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +gconf glade gnome +introspection"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-libs/motif/motif-2.3.4-r3.ebuild b/x11-libs/motif/motif-2.3.4-r3.ebuild
index 1785749b5e6e..a74b73d6f6e8 100644
--- a/x11-libs/motif/motif-2.3.4-r3.ebuild
+++ b/x11-libs/motif/motif-2.3.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r3.ebuild,v 1.5 2015/01/25 21:07:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r3.ebuild,v 1.6 2015/01/26 10:37:55 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-s
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 371a31c55958..02a0986de3d6 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,5 +1,5 @@
 DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
 DIST vte-0.34.9.tar.xz 996756 SHA256 6f38c5edf57d0a5b870c4e5e210731cccfb4899d0856ba7a3dc599f2ba6e23e1 SHA512 57fff7d5916bcd8a8a13e3cf050f85ed78e9154fdf2510a6d6f594f938c6d56f512089c6bc3e06c9123d35d17f2eb3b3814a5407635027ec0116c25f73034688 WHIRLPOOL 2caf90fdbce7baaf6038c0fda674577724ace354e63b8a6977e46b7f2cea8860f1a687cf34d4e10c4b08eeb666f6c62c42c0f5cfb0c55498fcc44cf44c9570d8
-DIST vte-0.36.2.tar.xz 1009160 SHA256 f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345 SHA512 fafd368b95918024e6324c81f4fa6c35ad15138ad44af2f92164492d9773b127202d11824c9def4a26e17de44336f42e9c8906330dd300795c280ca068381632 WHIRLPOOL 034b6879131d2535e21a8a97e571753e250f98e01ef334d639038a0638fc0a6d214a267267f11822c30919629edaabc6f6a66a366a9b506ae57e2d4674efa724
 DIST vte-0.36.3.tar.xz 1013412 SHA256 54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c SHA512 9e0c4e60c5a271720d7b480c9618069752faec6c310cc2477e67cdb1c3e961f6981d39c9116716739390dc8e4bab9bf06cf6c5d7d2546062e48523f85d731c77 WHIRLPOOL 0c582f50a07b9a55e8e7b16ae371b913348e8f93fc50ff734ea04a481a5e1ca30ebf3c3781dcd20fd340f50b34cd8f516de76ca59093f3952f23b99a5b30ddca
 DIST vte-0.38.2.tar.xz 1005048 SHA256 b2daba79229c84de3fbc41fcbb160c8d7ca50523fc01dedefada27e75ecc7de5 SHA512 4c493e18cca4b50d66640d282d7d33a471d1ac4bd2dd929b059b829a42fed852d202669751b266adf7291502203e26c513b6852b3035458d41a433b900b0c6bb WHIRLPOOL 2bfe6562f4476a223d63d4db5e85ed251cdb45c307072bc37515b74efa6ac1a2be299139e452319299a270ccccdf96b5cfd973555be021f7878d4e7a568f1c87
+DIST vte-0.38.3.tar.xz 1005548 SHA256 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4 SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164 WHIRLPOOL 4f67b4f6060b4178d8dde717577ae534fe68f436ce6d3f10e914c40bad44ce01c48f135c600b3d85c4f78a6577af0652bffa0b7e877ff2dc22b9996c9da00d76
diff --git a/x11-libs/vte/vte-0.36.2.ebuild b/x11-libs/vte/vte-0.38.3.ebuild
similarity index 68%
rename from x11-libs/vte/vte-0.36.2.ebuild
rename to x11-libs/vte/vte-0.38.3.ebuild
index 2aac58cbbd8a..08a9631e482c 100644
--- a/x11-libs/vte/vte-0.36.2.ebuild
+++ b/x11-libs/vte/vte-0.38.3.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.36.2.ebuild,v 1.1 2014/05/31 09:14:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.38.3.ebuild,v 1.1 2015/01/26 13:17:41 pacho Exp $
 
 EAPI="5"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2
+inherit eutils gnome2 vala
 
 DESCRIPTION="Library providing a virtual terminal emulator widget"
 HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
-SLOT="2.90"
-IUSE="debug glade +introspection"
+SLOT="2.91"
+IUSE="debug glade +introspection vala"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-PDEPEND="=x11-libs/gnome-pty-helper-${PV}"
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
 RDEPEND="
-	>=dev-libs/glib-2.31.13:2
-	>=x11-libs/gtk+-3.1.9:3[introspection?]
+	>=dev-libs/glib-2.40:2
+	>=x11-libs/gtk+-3.8:3[introspection?]
 	>=x11-libs/pango-1.22.0
 
 	sys-libs/ncurses
@@ -29,16 +30,18 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
 "
 DEPEND="${RDEPEND}
+	$(vala_depend)
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
 "
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
 
 src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-	epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
-
+	vala_src_prepare
 	gnome2_src_prepare
 }
 
@@ -57,14 +60,17 @@ src_configure() {
 	# Do not disable gnome-pty-helper, bug #401389
 	gnome2_src_configure \
 		--disable-deprecation \
+		--disable-test-application \
 		--disable-static \
 		$(use_enable debug) \
 		$(use_enable glade glade-catalogue) \
-		$(use_enable introspection)
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
 }
 
 src_install() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	gnome2_src_install
-	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+	mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
 }
diff --git a/x11-misc/xlockmore/xlockmore-5.45.ebuild b/x11-misc/xlockmore/xlockmore-5.45.ebuild
index 37f6bc6a7e57..204b49314984 100644
--- a/x11-misc/xlockmore/xlockmore-5.45.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.45.ebuild,v 1.5 2015/01/18 08:36:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.45.ebuild,v 1.6 2015/01/26 09:44:27 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic pam
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
 IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc"
 
 REQUIRED_USE="
diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild
index c56b05c6b408..fc357629351e 100644
--- a/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild
+++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild,v 1.2 2015/01/22 08:41:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-otr/pidgin-otr-4.0.1.ebuild,v 1.3 2015/01/26 10:12:23 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/libgcrypt:0
diff --git a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
index 6804b29102ee..f9246f159076 100644
--- a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
+++ b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
@@ -1,12 +1,22 @@
---- fluxbox-1.3.6/util/fluxbox-generate_menu.in	2015-01-15 13:35:50.223367998 -0800
-+++ fluxbox-1.3.6-copy/util/fluxbox-generate_menu.in	2015-01-15 13:38:21.789755711 -0800
-@@ -331,7 +331,7 @@
+https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 525315c..33b0153 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -330,13 +330,13 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
      if [ -f "$entry_icon" ]; then
      # if icon exists and entry does not already exists, add it
-         if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
 -            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
++        if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
 +            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
          else 
-             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+-            : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
++            : echo "#    mapping already exists for ${execname}" >> $ICONMAPPING
          fi
-
+     else
+-        echo "# No icon file found for $entry_exec" >> $ICONMAPPING
++        echo "# No icon file found for $execname" >> $ICONMAPPING
+     fi
+ }
diff --git a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
index 629e74583de3..70f98a0a7d68 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.1 2015/01/26 02:37:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.2 2015/01/26 12:31:03 idella4 Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs prefix
@@ -69,7 +69,7 @@ src_configure() {
 		$(use_enable imlib imlib2) \
 		$(use_enable nls) \
 		$(use_enable slit ) \
-		$(use_enable toolbar ) \
+		$(use_enable toolbar systray ) \
 		$(use_enable truetype xft) \
 		$(use_enable xinerama) \
 		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
diff --git a/x11-wm/fluxbox/fluxbox-1.3.5.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5.ebuild
index 2ca1973512ec..602a0d10e9a8 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.5.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5.ebuild,v 1.4 2015/01/22 18:24:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5.ebuild,v 1.5 2015/01/26 10:18:03 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs prefix
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.lzma"
 HOMEPAGE="http://www.fluxbox.org"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	!!<=x11-misc/fbdesk-1.2.1
diff --git a/x11-wm/fluxbox/fluxbox-1.3.6.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6.ebuild
deleted file mode 100644
index 9034a8f492e5..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.6.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.6.ebuild,v 1.1 2015/01/11 17:18:40 titanofold Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	!!<=x11-misc/fbdesk-1.2.1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	truetype? ( media-libs/freetype )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
-	${RDEPEND}
-	bidi? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	x11-proto/xextproto
-"
-
-src_prepare() {
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
-	econf ${myconf} \
-		$(use_enable bidi fribidi ) \
-		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
-		$(use_enable slit ) \
-		$(use_enable toolbar ) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	# Call fluxbox-generate_menu through bash since it lacks +x
-	# chmod 744 may be an equal fix
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		bash "${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="" install
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	# Install the generated menu
-	insinto /usr/share/fluxbox
-	doins data/menu
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
-	# Styles menu framework
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxbox
-	doins "${FILESDIR}"/styles-menu-commonbox
-	doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index e249d2a60c9c..50dd49a48e02 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.13 2013/01/08 21:32:50 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.14 2015/01/26 12:31:03 idella4 Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils flag-o-matic toolchain-funcs git-2 prefix
 
 IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
@@ -12,29 +12,32 @@ DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
 EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
 SRC_URI=""
 HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS=""
 
-RDEPEND="x11-libs/libXpm
-	x11-libs/libXrandr
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
 	x11-libs/libXext
 	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
 	x11-libs/libXrender
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
 	xinerama? ( x11-libs/libXinerama )
-	truetype? ( media-libs/freetype )
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<=x11-misc/fbdesk-1.2.1"
-DEPEND="bidi? ( virtual/pkgconfig )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	x11-proto/xextproto
-	${RDEPEND}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS=""
+"
 
 src_prepare() {
 	./autogen.sh
@@ -45,6 +48,8 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
 	eprefixify util/fluxbox-generate_menu.in
 
+	epatch "${FILESDIR}"/osx-has-otool.patch
+
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
 		suffix="gentoo"
@@ -59,17 +64,17 @@ src_prepare() {
 src_configure() {
 	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
 
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
+	econf ${myconf} \
+		$(use_enable bidi fribidi ) \
 		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		$(use_enable bidi fribidi ) \
+		$(use_enable toolbar systray ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
 		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
-		${myconf}
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
 }
 
 src_compile() {
@@ -77,29 +82,30 @@ src_compile() {
 
 	ebegin "Creating a menu file (may take a while)"
 	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
 	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
 		CHECKINIT="no. go away." HOME="${T}/home" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
 		|| die "menu generation failed"
 	eend $?
 }
 
 src_install() {
-	dodir /usr/share/fluxbox
 	emake DESTDIR="${D}" STRIP="" install
 	dodoc README* AUTHORS TODO* ChangeLog NEWS
 
-	dodir /usr/share/xsessions
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/${PN}.desktop
 
 	exeinto /etc/X11/Sessions
 	newexe "${FILESDIR}"/${PN}.xsession fluxbox
 
-	dodir /usr/share/fluxbox/menu.d
-
 	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
 	insinto /usr/share/fluxbox/menu.d/styles
 	doins "${FILESDIR}"/styles-menu-fluxbox
 	doins "${FILESDIR}"/styles-menu-commonbox