diff --git a/app-accessibility/brltty/brltty-5.0-r3.ebuild b/app-accessibility/brltty/brltty-5.0-r3.ebuild
index 64bc5bdb0f39..7c29e924dc9b 100644
--- a/app-accessibility/brltty/brltty-5.0-r3.ebuild
+++ b/app-accessibility/brltty/brltty-5.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r3.ebuild,v 1.2 2014/08/06 21:30:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r3.ebuild,v 1.3 2014/08/13 18:44:41 teiresias Exp $
 
 EAPI=5
 
@@ -123,7 +123,7 @@ src_compile() {
 	if use python; then
 		python_build() {
 			cd "Bindings/Python" || die
-				emake
+			emake
 		}
 		python_foreach_impl run_in_build_dir python_build
 	fi
@@ -138,7 +138,8 @@ src_install() {
 
 	if use python; then
 		python_install() {
-				emake install
+			cd "Bindings/Python" || die
+			emake install
 		}
 		python_foreach_impl run_in_build_dir python_install
 	fi
diff --git a/app-admin/denyhosts/denyhosts-2.6-r10.ebuild b/app-admin/denyhosts/denyhosts-2.6-r10.ebuild
index 5b454c3de19f..4733b864850b 100644
--- a/app-admin/denyhosts/denyhosts-2.6-r10.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.6-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/denyhosts-2.6-r10.ebuild,v 1.3 2014/07/31 08:25:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/denyhosts-2.6-r10.ebuild,v 1.4 2014/08/14 16:49:18 phajdan.jr Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/lib_users/lib_users-0.9.ebuild b/app-admin/lib_users/lib_users-0.9.ebuild
index 7175ade9b397..b0b77616c4b8 100644
--- a/app-admin/lib_users/lib_users-0.9.ebuild
+++ b/app-admin/lib_users/lib_users-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.9.ebuild,v 1.1 2014/07/15 17:32:33 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.9.ebuild,v 1.3 2014/08/14 08:07:31 jer Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-arch/lz4/lz4-0_p106-r1.ebuild b/app-arch/lz4/lz4-0_p106-r1.ebuild
index 1840cc39bed8..b9013f113040 100644
--- a/app-arch/lz4/lz4-0_p106-r1.ebuild
+++ b/app-arch/lz4/lz4-0_p106-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.15 2014/08/03 18:19:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.16 2014/08/13 18:45:21 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [ ${PV} == "9999" ] ; then
 	ESVN_PROJECT="lz4-read-only"
 else
 	SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ~s390 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/lz4/lz4-0_p120.ebuild b/app-arch/lz4/lz4-0_p120.ebuild
index c2e925c99e89..5250db1042b6 100644
--- a/app-arch/lz4/lz4-0_p120.ebuild
+++ b/app-arch/lz4/lz4-0_p120.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.2 2014/08/05 08:43:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p120.ebuild,v 1.3 2014/08/13 18:45:21 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ else
 	MY_PV="r${PV##0_p}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index 9c6adf32ff87..19ff32aacfce 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.11 2014/07/24 21:19:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.12 2014/08/13 18:45:21 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/unrar/unrar-5.1.6.ebuild b/app-arch/unrar/unrar-5.1.6.ebuild
index b0fffc9ced1f..05158f1be41f 100644
--- a/app-arch/unrar/unrar-5.1.6.ebuild
+++ b/app-arch/unrar/unrar-5.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.1.6.ebuild,v 1.2 2014/08/06 09:22:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.1.6.ebuild,v 1.3 2014/08/14 16:28:57 phajdan.jr Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="unRAR"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index d43fa30a6708..d60aad29ec46 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,4 +1,2 @@
 DIST zopfli-1.0.0.zip 57873 SHA256 e20d73b56620285e6cce5b510d8e5da6835a81940e48cdf35a69090e666f3adb SHA512 77182f700531bdca8be869efc3d7c235ba3615990d0e50539862af960f3b345061afd1817861614d1238aed901e37dad4737ef0a1e3631c2f125f326b69a27ed WHIRLPOOL b83970e22dad089c2717d81e783c290dd0919a7a278f814f780f9549428130c900208fac9852f4f00d31493eaca994309194eeff661ccf3cd3ecc17ecf5d34ff
-DIST zopfli-1.0.0_p20131216.tar.bz2 303878 SHA256 b64ba140f26808974ecceb52359b30ffcba7d7ab7f17fabd7c82a790cc90b841 SHA512 3fa266257cf8fd7dea00a4fc0d9d82639682029f4920283f4458f390e92f1e76c240549b25b476dba6f2ca1ddc62f0e13d7a9a85f1679c2b23311ba036fd2378 WHIRLPOOL ee107de1ccd030f52910aaf5bbb0483eb2022a25baf3bed1ab4d8880f3271ff68a06533cd584d9a941191d880132042f770baac022889bcf137e8d71d561a301
-DIST zopfli-1.0.0_p20140623.tar.gz 125237 SHA256 d6913ce76eef23638d8ed1262d27a895da00e5e8b3cfafaafb7b3e242d08aca7 SHA512 e10125db0260bd8c83ac5289c4b8d9a6885a4a1eb851abf0601d74f55babb44b157b7e94b4169b3b80ca20ab990df9329ce0d531edf1b0d0d0512ec22ee95913 WHIRLPOOL 58ceb78098d0e1a37dadc0b14f8aee78ae752ef5677297a7a666d360d49c2551e6de38df29919d1e9f44f37a551c8e0de594c6052d1fa8cd503c0f7c621e0498
 DIST zopfli-1.0.0_p20140705.tar.gz 125759 SHA256 d0a1db54477c8da8b59b4ffe620e7fcb0bcb9192d6e5ef08d849bb463c05ffd1 SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca WHIRLPOOL 9affa8b1eb7ec9d509c90e26a385644cbf1f7c031813eab5986c297f47881454a74023cb1548e338cebe8c293d0f8876c048998185035377fa5a187d62e46fac
diff --git a/app-arch/zopfli/zopfli-1.0.0_p20131216.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20131216.ebuild
deleted file mode 100644
index 60a8987e79a3..000000000000
--- a/app-arch/zopfli/zopfli-1.0.0_p20131216.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/app-arch/zopfli/zopfli-1.0.0_p20131216.ebuild,v 1.3 2014/02/19 13:25:20 pinkbyte Exp $
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Compression library programmed in C to perform very good, but slow, deflate or zlib compression"
-HOMEPAGE="https://github.com/Hello71/zopfli/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# Respect compiler
-	tc-export CC CXX
-
-	epatch_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc CONTRIBUTORS README README.${PN}png
-}
diff --git a/app-arch/zopfli/zopfli-1.0.0_p20140623.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20140623.ebuild
deleted file mode 100644
index 71e3d22bbaa7..000000000000
--- a/app-arch/zopfli/zopfli-1.0.0_p20140623.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zopfli/zopfli-1.0.0_p20140623.ebuild,v 1.2 2014/08/10 01:43:12 patrick Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Compression library programmed in C to perform very good, but slow, deflate or zlib compression"
-HOMEPAGE="https://code.google.com/p/zopfli/"
-SRC_URI="https://zopfli.googlecode.com/archive/b831d9813d44d85b4f1497be9cb877e4d5c4bbd7.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	local target
-	for target in lib${PN} ${PN} ${PN}png; do
-		emake \
-			CC="$(tc-getCC)" \
-			CXX="$(tc-getCXX)" \
-			CFLAGS="-W -Wall -Wextra -ansi -pedantic -lm ${CFLAGS}" \
-			CXXFLAGS="-W -Wall -Wextra -ansi -pedantic ${CXXFLAGS}" \
-			${target}
-	done
-}
-
-src_install() {
-	dobin ${PN} ${PN}png
-
-	dodoc CONTRIBUTORS README README.${PN}png
-
-	dolib lib${PN}.so.*
-	dosym lib${PN}.so.* /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.* /usr/$(get_libdir)/lib${PN}.so.1
-
-	insinto /usr/include/${PN}/
-	doins src/${PN}/*.h
-}
diff --git a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
index e183980b291f..dc72ec5991e2 100644
--- a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild,v 1.1 2014/07/10 02:30:54 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild,v 1.2 2014/08/14 12:23:57 pinkbyte Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	tc-export CC CXX
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 91109d7c4652..11fe0b7f88db 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,3 +1,4 @@
 DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
 DIST gnupg-2.0.25.tar.bz2 4301689 SHA256 b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823 SHA512 8b80c86ec53ed3b82d15a8e316baf175691e06e1bcac28d66c61fd37d07e26196a7ee7855e6eb958c301cee764866cc3cf00e5ec0aef23abddf7427bb3d23fb1 WHIRLPOOL 786f3db3af0c96249e128ce3a30dee7e9fbec38d75ed29138f0dfdcbe4f4377c39d4152844087cec0147921eed73c1a01382b542c6a27e86e8bd9265f67e65e2
+DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
 DIST gnupg-2.1.0-beta751.tar.bz2 3078612 SHA256 5abd2bc02365ba3007ed484a256651341a87a1f2a03970bac4015809de09ade5 SHA512 230a2e37eea401465017053e3c5e47187a5963f06dc5528c9a3ff6c76ee9e2ff857cb9e4ddf0b72d8d79eadb50834858f5340c02625279c403f30ed709da4869 WHIRLPOOL ccf8426c4f11df69dc3ee96bb4444df1479228f2b1ed2a7da98fc0000f9a5b8c7d82624a36e9de78e5b87bf4296c6ca17c3351f29e1752b58ae73433b1b7d9ee
diff --git a/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch b/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
new file mode 100644
index 000000000000..4c9eff26fd58
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
@@ -0,0 +1,35 @@
+From a2dcc5cc49c3e79d64bd1a2ad7a5bc4df5b073ee Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Wed, 13 Aug 2014 11:13:34 +0200
+Subject: [PATCH] gpg: Need to init the trustdb for import.
+
+* g10/trustdb.c (clear_ownertrusts): Init trustdb.
+
+--
+
+This was fixed in 1.4 branch in commit
+23191d7851eae2217ecdac6484349849a24fd94a but was not applied to the
+2.0 branch that exhibits the same problem. This is actually a hack
+to fix a bug introduced with commit 2528178.
+
+GnuPG-bug-id: 1622
+---
+ g10/trustdb.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/g10/trustdb.c b/g10/trustdb.c
+index f96701a..7bfef25 100644
+--- a/g10/trustdb.c
++++ b/g10/trustdb.c
+@@ -923,6 +923,8 @@ clear_ownertrusts (PKT_public_key *pk)
+   TRUSTREC rec;
+   int rc;
+ 
++  init_trustdb();
++
+   if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
+     return 0;
+ 
+-- 
+1.8.5.5
+
diff --git a/app-crypt/gnupg/gnupg-2.0.26.ebuild b/app-crypt/gnupg/gnupg-2.0.26.ebuild
new file mode 100644
index 000000000000..902bf2b96515
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.26.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26.ebuild,v 1.1 2014/08/13 14:24:41 k_f Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.4:0=
+	>=dev-libs/libgpg-error-1.11
+	>=dev-libs/libksba-1.0.7
+	>=dev-libs/pth-1.3.7
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	adns? ( >=net-libs/adns-1.4 )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	static? (
+		>=dev-libs/libassuan-2[static-libs]
+		>=dev-libs/libgcrypt-1.4:0=[static-libs]
+		>=dev-libs/libgpg-error-1.11[static-libs]
+		>=dev-libs/libksba-1.0.7[static-libs]
+		>=dev-libs/pth-1.3.7[static-libs]
+		>=net-misc/curl-7.10[static-libs]
+		sys-libs/zlib[static-libs]
+		bzip2? ( app-arch/bzip2[static-libs] )
+	)
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+	${COMMON_DEPEND_BINS}
+	mta? ( virtual/mta )
+	!<=app-crypt/gnupg-2.0.1
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+	epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# 'USE=static' support was requested:
+	# gnupg1: bug #29299
+	# gnupg2: bug #159623
+	use static && append-ldflags -static
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-agent \
+		"${myconf[@]}" \
+		$(use_with adns) \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable mta mailto) \
+		$(use_enable ldap) \
+		$(use_with readline) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	default
+
+	# bug#192151
+	dobin tools/gpgsplit tools/gpg-zip
+
+	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+	rm "${ED}"/usr/share/gnupg/help* || die
+
+	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+	dosym gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+	if use ldap; then
+		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+	fi
+	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+	if use doc; then
+		dohtml doc/gnupg.html/* doc/*.png
+	fi
+}
+
+pkg_postinst() {
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate"
+	elog "the right viewer."
+	elog
+
+	if use smartcard; then
+		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+		elog " - sys-apps/pcsc-lite and a compatible reader device;"
+		elog " - dev-libs/openct and a compatible reader device;"
+		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+		elog ""
+		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+		elog "app-crypt/ccid first."
+	fi
+
+	ewarn "Please remember to restart gpg-agent if a different version"
+	ewarn "of the agent is currently used. If you are unsure of the gpg"
+	ewarn "agent you are using please run 'killall gpg-agent',"
+	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 645da147c828..bb9d6ac0df5f 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,2 +1,2 @@
-DIST krb5-1.11.4-signed.tar 11683840 SHA256 5c294612dcaf830958786056e898384931490eaf7b3290c3af5d2def2312fb97 SHA512 03d4d77681d7ba6f0324dc45f8457f6a5e3be23198c8ffa19fc9542b4455ec0738f78131a054e6d501396d3f66a29677d374726d068a83f6dddf7b7b7db18c6c WHIRLPOOL e710045332d21d5d52d22b746f46e9aa56dc5bf67a1d6e5e0b107f5b4aab6a4aba9ff31a374f865348123d0a61156546214a5929bd1c5a7b0a0e6f8ec599fa74
 DIST krb5-1.12.1-signed.tar 11950080 SHA256 72f1b6c166cb42c0b03814ab7ea10f91926d8a665a5ba1cee430a3f31e62c580 SHA512 bdb1541f6906e86fb00336a8d7c58f32c1203d1b23fe72bf6e943197a0d85a48a0b847cc2cf18388d3eec0b22aecc206ce804fd1009bb73423bac76900052a9e WHIRLPOOL 19021c52df7ceb64703c25e2cb9e643d2c62f180b65bf99aab04caeb2e0014b3c0e486609f4c36e618a00621c57d1291075299ea34b8550b255fe1000484291e
+DIST krb5-1.12.2-signed.tar 11991040 SHA256 09bd180107b5c2b3b7378c57c023fb02a103d4cac39d6f2dd600275d7a4f3744 SHA512 27ea2e4810e3770695865aa2bbc9d39793fe3eba82ff1ca85ccbcfa0272a3fe13de21bfff15dc5eef6b7c9d91f7f8d1c42fa4b85fa71958d2b38f867d55c5dff WHIRLPOOL 5f403c262fbb18cb50e80bb599344b9dc3bddca9fe5361db5352b49c88cbd312fb086cd112ca4a38d84b2c6a18954371772471b6379c4e055da762e89997c90d
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.11_uninitialized.patch b/app-crypt/mit-krb5/files/mit-krb5-1.11_uninitialized.patch
deleted file mode 100644
index 16f07d7423a3..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.11_uninitialized.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/src/slave/kprop.c
-+++ b/src/slave/kprop.c
-@@ -91,7 +91,7 @@ main(argc, argv)
-     int     argc;
-     char    **argv;
- {
--    int     fd, database_fd, database_size;
-+    int     fd = -1, database_fd, database_size;
-     krb5_error_code retval;
-     krb5_context context;
-     krb5_creds *my_creds;
---- a/src/kadmin/ktutil/ktutil_funcs.c
-+++ b/src/kadmin/ktutil/ktutil_funcs.c
-@@ -64,7 +64,7 @@
-     krb5_kt_list *list;
-     int idx;
- {
--    krb5_kt_list lp, prev;
-+    krb5_kt_list lp, prev = NULL;
-     int i;
- 
-     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
---- a/src/lib/kadm5/alt_prof.c
-+++ b/src/lib/kadm5/alt_prof.c
-@@ -164,7 +164,7 @@
-     char **values;
-     char *valp;
-     int idx;
--    krb5_boolean val;
-+    krb5_boolean val = 0;
- 
-     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
-     if (kret)
---- a/src/lib/krb5/unicode/ucstr.c
-+++ b/src/lib/krb5/unicode/ucstr.c
-@@ -109,7 +109,7 @@
-             krb5_data ** newdataptr,
-             unsigned flags)
- {
--    int i, j, len, clen, outpos, ucsoutlen, outsize;
-+    int i, j, len, clen, outpos = 0, ucsoutlen, outsize;
-     char *out = NULL, *outtmp, *s;
-     krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL;
-     krb5_data *newdata;
-diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c
-index 7dc5b47..cd90db8 100644
---- a/src/util/profile/prof_init.c
-+++ b/src/util/profile/prof_init.c
-@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile)
- {
-     errcode_t err;
-     void *cbdata;
--    profile_t new_profile;
-+    profile_t new_profile = NULL;
- 
-     *ret_new_profile = NULL;
- 
---- a/src/lib/krb5/krb/preauth2.c  2012-12-24 12:39:18.432678497 +0100
-+++ b/src/lib/krb5/krb/preauth2.c   2012-12-24 12:50:49.444099126 +0100
-@@ -956,7 +956,7 @@
-     size_t i, h;
-     int out_pa_list_size = 0;
-     krb5_pa_data **out_pa_list = NULL;
--    krb5_error_code ret, module_ret;
-+    krb5_error_code ret, module_ret = 0;
-     krb5_responder_fn responder = opte->opt_private->responder;
-     static const int paorder[] = { PA_INFO, PA_REAL };
-
---- a/src/tests/asn.1/trval.c	2013-04-12 12:51:36.000000000 -0500
-+++ b/src/tests/asn.1/trval.c	2013-05-24 04:31:14.077036380 -0500
-@@ -404,7 +404,7 @@
- {
-     int n;
-     int r = 0;
--    int rlen2;
-+    int rlen2 = 0;
-     int rlent;
-     int save_appl;
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.12_uninitialized.patch b/app-crypt/mit-krb5/files/mit-krb5-1.12_uninitialized.patch
deleted file mode 100644
index e6d1921dc008..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.12_uninitialized.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/src/slave/kprop.c
-+++ b/src/slave/kprop.c
-@@ -91,7 +91,7 @@ main(argc, argv)
-     int     argc;
-     char    **argv;
- {
--    int     fd, database_fd, database_size;
-+    int     fd = -1, database_fd, database_size;
-     krb5_error_code retval;
-     krb5_context context;
-     krb5_creds *my_creds;
---- a/src/kadmin/ktutil/ktutil_funcs.c
-+++ b/src/kadmin/ktutil/ktutil_funcs.c
-@@ -64,7 +64,7 @@
-     krb5_kt_list *list;
-     int idx;
- {
--    krb5_kt_list lp, prev;
-+    krb5_kt_list lp, prev = NULL;
-     int i;
- 
-     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
---- a/src/lib/kadm5/alt_prof.c
-+++ b/src/lib/kadm5/alt_prof.c
-@@ -164,7 +164,7 @@
-     char **values;
-     char *valp;
-     int idx;
--    krb5_boolean val;
-+    krb5_boolean val = 0;
- 
-     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
-     if (kret)
-
---- a/src/util/profile/prof_init.c
-+++ b/src/util/profile/prof_init.c
-@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile)
- {
-     errcode_t err;
-     void *cbdata;
--    profile_t new_profile;
-+    profile_t new_profile = NULL;
- 
-     *ret_new_profile = NULL;
- 
---- a/src/tests/asn.1/trval.c	2013-04-12 12:51:36.000000000 -0500
-+++ b/src/tests/asn.1/trval.c	2013-05-24 04:31:14.077036380 -0500
-@@ -404,7 +404,7 @@
- {
-     int n;
-     int r = 0;
--    int rlen2;
-+    int rlen2 = 0;
-     int rlent;
-     int save_appl;
diff --git a/app-crypt/mit-krb5/files/mit-krb5_krb5-config_LDFLAGS.patch b/app-crypt/mit-krb5/files/mit-krb5_krb5-config_LDFLAGS.patch
deleted file mode 100644
index 0b300cb44a37..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5_krb5-config_LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug #448778
---- krb5-1.11/src/krb5-config.in	2012-12-18 02:47:04.000000000 +0000
-+++ krb5-1.11/src/krb5-config.in	2012-12-28 07:13:16.582693363 +0000
-@@ -217,7 +217,7 @@
- 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
- 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
--	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
-+	    -e 's#\$(LDFLAGS)##' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)##'`
- 
diff --git a/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild
deleted file mode 100644
index e36a5546d7b2..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.4.ebuild,v 1.12 2014/07/14 18:51:41 tgall Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils flag-o-matic python-any-r1 versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	|| ( dev-libs/libverto[libev] dev-libs/libverto[libevent] dev-libs/libverto[tevent] )
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	pkinit? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-kerberos )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? ( ${PYTHON_DEPS}
-			dev-lang/tcl
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.11_uninitialized.patch"
-	epatch "${FILESDIR}/${PN}_krb5-config_LDFLAGS.patch"
-
-	# tcl-8.6 compatibility
-	sed -i -e 's/interp->result/Tcl_GetStringResult(interp)/' \
-		kadmin/testing/util/tcl_kadm5.c || die
-}
-
-src_configure() {
-	append-cppflags "-I${EPREFIX}/usr/include/et"
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	use keyutils || export ac_cv_header_keyutils_h=no
-	econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dohtml -r doc/html/*
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r1 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r1 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r1 mit-krb5kpropd
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.12.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.12.1.ebuild
deleted file mode 100644
index a7e2c3f179d2..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.12.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.12.1.ebuild,v 1.3 2014/05/17 14:37:08 swift Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit autotools eutils flag-o-matic python-any-r1 versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	|| ( dev-libs/libverto[libev] dev-libs/libverto[libevent] dev-libs/libverto[tevent] )
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	pkinit? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-kerberos )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? ( ${PYTHON_DEPS}
-			dev-lang/tcl
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
-
-	# tcl-8.6 compatibility
-	sed -i -e 's/interp->result/Tcl_GetStringResult(interp)/' \
-		kadmin/testing/util/tcl_kadm5.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-I${EPREFIX}/usr/include/et"
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-
-	use keyutils || export ac_cv_header_keyutils_h=no
-	WARN_CFLAGS="set" econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dohtml -r doc/html/*
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r1 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r1 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r1 mit-krb5kpropd
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.12.2.ebuild
similarity index 93%
rename from app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild
rename to app-crypt/mit-krb5/mit-krb5-1.12.2.ebuild
index d8159bfbb64e..098dab0464d9 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.12.1-r1.ebuild,v 1.9 2014/07/28 13:42:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.12.2.ebuild,v 1.2 2014/08/14 00:11:33 jer Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"
 
 RDEPEND="!!app-crypt/heimdal
@@ -55,10 +55,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
 	epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
 
-	# tcl-8.6 compatibility
-	sed -i -e 's/interp->result/Tcl_GetStringResult(interp)/' \
-		kadmin/testing/util/tcl_kadm5.c || die
-
 	eautoreconf
 }
 
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
index 5d70a8854bac..e289558e65dc 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild,v 1.4 2014/08/03 15:25:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.8.ebuild,v 1.5 2014/08/14 16:59:01 phajdan.jr Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 ~sh x86"
 IUSE="nls pkcs11 debug"
 
 COMMON_DEPEND="
diff --git a/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140508-r1.ebuild
new file mode 100644
index 000000000000..466565c2a4db
--- /dev/null
+++ b/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140508-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20140508-r1.ebuild,v 1.1 2014/08/14 08:42:00 pinkbyte Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="Boost-1.0 LGPL-2.1"
+KEYWORDS="-* ~amd64"
+
+IUSE="abi_x86_32"
+
+DEPEND=""
+RDEPEND="!abi_x86_32? (
+		~app-emulation/emul-linux-x86-baselibs-${PV}
+		!>=dev-libs/boost-1.55.0-r2[abi_x86_32(-)]
+	)
+	abi_x86_32? (
+		>=dev-libs/boost-1.55.0-r2[abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	emul-linux-x86_src_prepare
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f usr/lib32/libboost*
+}
diff --git a/app-emulation/free42/free42-1.5.3a.ebuild b/app-emulation/free42/free42-1.5.3a.ebuild
index 2e4b44051140..44e35e88e2ad 100644
--- a/app-emulation/free42/free42-1.5.3a.ebuild
+++ b/app-emulation/free42/free42-1.5.3a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.5.3a.ebuild,v 1.1 2014/06/24 08:47:11 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.5.3a.ebuild,v 1.2 2014/08/14 16:57:24 phajdan.jr 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-emulation/vagrant/vagrant-1.0.7.ebuild b/app-emulation/vagrant/vagrant-1.0.7.ebuild
index 554b07b2186c..7e2684301b39 100644
--- a/app-emulation/vagrant/vagrant-1.0.7.ebuild
+++ b/app-emulation/vagrant/vagrant-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.7.ebuild,v 1.1 2013/03/18 01:39:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.7.ebuild,v 1.2 2014/08/14 13:57:02 mrueg Exp $
 
 EAPI="5"
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index a7e82d0cd40e..9e54083bcfbd 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,4 +5,4 @@ DIST VirtualBox-4.3.14.tar.bz2 90833795 SHA256 bc893adde4449a2d35d8b4d0b8b247f0f
 DIST virtualbox-4.2.18-patches-01.tar.xz 3788 SHA256 9a147e3a3da7e1e07b70aed67042c822897c7874ccaa3690c9497862373d8222 SHA512 021f8a566ede223ead5a2605bff3917195165c543f760ee7af004ab97d5dcf0771e6ccb62148d7986a34872ea8c35db952286fb8534b1f69804e192701bd8108 WHIRLPOOL 9818df1703636fecfbda1bbeb4d167d845701fe9de2827a97573a26ffb3cb9feaa22ee2849c45d3ea700a9c305185eb404b15572b0f4e666f8a8e6158a48b9eb
 DIST virtualbox-4.2.26-patches-01.tar.xz 3804 SHA256 0cccbd963ae77e85e8c7bc1a5ec73f8eec0dfcbba30e8b85281c3adeb849e66f SHA512 7b5de7efe0087ee6148201ad7bb987a95cdf4e1a0625ed2f368fcbf1080505e8904f67be69aedbcc5469348f62351b6b913aae438f2ea8868f2b07a7a42d3538 WHIRLPOOL 99b981c05f877750bd5bbdb1ec9098ad8bb07805fa6ddaa81a8309def3ec40189b6b947115d5ea86cc8d887ac2cca64f3d13257ea6f872e8a0974c7da20c3e7d
 DIST virtualbox-4.3.12-patches-01.tar.xz 4248 SHA256 90f65d8911ea8ca16aaa08181aaae023fae08720b5085af1d4248ead0e4d2343 SHA512 ab66a86e7533c952ae3d64dfa30b8265b0fb96f95bef50f888e221ce11dabbe57454c116b478a5bb8ac8b542ae487da59b3b9427bb1cae9b0c3ece4dadf781dc WHIRLPOOL 531dca73bb18b7f23219398a11a56009f91a6318c7bc36e0bc1b7964676f62d5cb7a46fde0d0d7673c669c097fc9ca3f48967665cc143164f28a7f27ebf3ab4a
-DIST virtualbox-4.3.14-patches-02.tar.xz 4092 SHA256 25a02a44933e40734e7cd3ac90992ee86cc108862f5aea70aff7b358f458e917 SHA512 3e0700de76c48dac1e4edb780406aa6f4d8cf162405a65c01dcfa9dc80d06736c1cdacc7749e93821bb471b0e39b671f80d688f38ecc99a7d92200eedecf98b8 WHIRLPOOL db6c598ed3469ec34df805c53359bb99e3e9d805c161feda82b7b17a0c9c26b8073ca7c6b6e15e59dc0dde98d020710dfbf01628f3613c50c0947a8954aa3c7d
+DIST virtualbox-4.3.14-patches-03.tar.xz 4316 SHA256 843b024c650ac74de62ca0fab6a0874f9bbf435840b7ca8ba25285554e047980 SHA512 79acc69a6de9969cd984ab71dd7f057cc5ace59d4dda9cb646e57faef976fa33e3cdd3c48ec6235c1254c3dcb5d0a8ebcf296e13b4e6943332df633cbdacf393 WHIRLPOOL 6ce6a8ed3a629105f595e84d62a8f23590bb8646f5c2e1431c87d048abc35cb18bb28cbaf2f5a49de6afdc2d1a3ed5f9de6012df5028aaf35d8fb5354212a025
diff --git a/app-emulation/virtualbox/virtualbox-4.3.14.ebuild b/app-emulation/virtualbox/virtualbox-4.3.14.ebuild
index 173673a1a514..c3af764ba76f 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.14.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.14.ebuild,v 1.4 2014/07/30 19:25:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.14.ebuild,v 1.5 2014/08/14 12:48:38 polynomial-c Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ MY_PV="${PV/beta/BETA}"
 MY_PV="${MY_PV/rc/RC}"
 MY_P=VirtualBox-${MY_PV}
 SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.3.14-patches-02.tar.xz"
+	http://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-4.3.14-patches-03.tar.xz"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
diff --git a/app-leechcraft/lc-lackman/lc-lackman-0.6.60.ebuild b/app-leechcraft/lc-lackman/lc-lackman-0.6.60.ebuild
index e71ebf33ec31..3562d41bfb6d 100644
--- a/app-leechcraft/lc-lackman/lc-lackman-0.6.60.ebuild
+++ b/app-leechcraft/lc-lackman/lc-lackman-0.6.60.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-0.6.60.ebuild,v 1.3 2014/04/03 08:24:12 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-0.6.60.ebuild,v 1.4 2014/08/14 09:21:36 pinkbyte Exp $
 
 EAPI="4"
 
 inherit leechcraft
 
-DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc."
+DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
diff --git a/app-leechcraft/lc-lackman/lc-lackman-0.6.65.ebuild b/app-leechcraft/lc-lackman/lc-lackman-0.6.65.ebuild
index aa68884b7efd..46443ab4f5ac 100644
--- a/app-leechcraft/lc-lackman/lc-lackman-0.6.65.ebuild
+++ b/app-leechcraft/lc-lackman/lc-lackman-0.6.65.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-0.6.65.ebuild,v 1.1 2014/04/10 17:56:27 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-0.6.65.ebuild,v 1.2 2014/08/14 09:21:36 pinkbyte Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit leechcraft
 
-DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc."
+DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc"
 
 SLOT="0"
 KEYWORDS=" ~amd64 ~x86"
diff --git a/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild b/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild
index 047f2d92d56e..b2a8cf40251e 100644
--- a/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild
+++ b/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild,v 1.1 2014/08/03 18:54:33 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-0.6.70.ebuild,v 1.2 2014/08/14 09:21:36 pinkbyte Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit leechcraft
 
-DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc."
+DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc"
 
 SLOT="0"
 KEYWORDS=" ~amd64 ~x86"
diff --git a/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild b/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild
index 27492cde94d5..75d58a35d537 100644
--- a/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild
+++ b/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild,v 1.1 2013/03/08 21:59:38 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild,v 1.2 2014/08/14 09:21:36 pinkbyte Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit leechcraft
 
-DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc."
+DESCRIPTION="LeechCraft Package Manager for extensions, scripts, themes etc"
 
 SLOT="0"
 KEYWORDS=""
diff --git a/app-misc/anki/anki-2.0.28.ebuild b/app-misc/anki/anki-2.0.28.ebuild
index 7cb34a9db6b3..5ce6f4295e7c 100644
--- a/app-misc/anki/anki-2.0.28.ebuild
+++ b/app-misc/anki/anki-2.0.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.28.ebuild,v 1.1 2014/07/21 11:39:22 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/anki/anki-2.0.28.ebuild,v 1.2 2014/08/14 16:50:56 phajdan.jr Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="latex +recording +sound"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild b/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild
index 0a398ffc2eb5..22724a635772 100644
--- a/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild
+++ b/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild,v 1.2 2014/07/21 07:31:30 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beanstalkd/beanstalkd-1.9-r1.ebuild,v 1.3 2014/08/14 17:24:34 phajdan.jr 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/unfoo/unfoo-1.0.8.ebuild b/app-misc/unfoo/unfoo-1.0.8.ebuild
index ef65c84043f3..45b18c36f034 100644
--- a/app-misc/unfoo/unfoo-1.0.8.ebuild
+++ b/app-misc/unfoo/unfoo-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/unfoo/unfoo-1.0.8.ebuild,v 1.1 2014/07/17 08:28:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/unfoo/unfoo-1.0.8.ebuild,v 1.2 2014/08/14 16:24:55 phajdan.jr Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jlec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="+minimal test"
 
 COMMON_DEPS="
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0a3d8ff11875..e686187d44da 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,2 @@
-DIST scribus-1.4.1.tar.xz 63039820 SHA256 6853fc40cd178d0dcefcc9305fba6824bbe7fd915b0eb277d742b13297f8c7d8 SHA512 726c5f05644e573c13e741ed356ce5bd8366b824c71e587167b9c73f5f1ab6eeb7c78f26f2146cbaf09921fd583b1758dc1d3cf1d1c79d1bb8be586df88f055c WHIRLPOOL 0592405daa4b092d2861c6697a835d3564b30fa4fcbd50bdb5d743269ac8113f4dd5d8f187dd1fdcdd2358b28772905f46c3737bea79dfb5f1120b107bfc8c30
 DIST scribus-1.4.3.tar.xz 70503072 SHA256 c72ef314c32f995895ca5025127e65ffeccbe2d445c358bca334a7249ea0afff SHA512 e4841b346803bc096c2e00b2071d03ce3bae6af8d7317353ebf8e724b5a9b6461d95406bee61c2a316bc6ee5d9e302e3fee7b51dd89eae9adc9e69b3aa40454e WHIRLPOOL fbcbd4ecaadb868d836848ef2656df4a1dba58ce7f7b27a810818604f9a2875c948e91484475a68b034d0cdcd9457b925701a8435a687c7cea0c2606f4d8cfca
 DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
diff --git a/app-office/scribus/files/scribus-1.5.0-docs.patch b/app-office/scribus/files/scribus-1.5.0-docs.patch
index 8e342cd612f2..831323847314 100644
--- a/app-office/scribus/files/scribus-1.5.0-docs.patch
+++ b/app-office/scribus/files/scribus-1.5.0-docs.patch
@@ -1,11 +1,11 @@
- CMakeLists.txt |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f34048..4880594 100644
+index c97080b..46742c7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2)
+@@ -244,7 +244,7 @@ ELSE (WIN32 OR OS2)
      SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
    ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
          IF(NOT WANT_VERSIONING)
@@ -14,11 +14,11 @@ index 3f34048..4880594 100644
          ELSE(NOT WANT_VERSIONING)
              SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
          ENDIF(NOT WANT_VERSIONING)
-@@ -801,7 +801,6 @@ INSTALL(FILES
-   BUILDING
-   ChangeLog
-   ChangeLogSVN
--  COPYING
-   LINKS
-   NEWS
-   PACKAGING
+@@ -883,7 +883,6 @@ INSTALL(FILES
+ 	BUILDING
+ 	ChangeLog
+ 	ChangeLogSVN
+-	COPYING
+ 	LINKS
+ 	NEWS
+ 	PACKAGING
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 5e62e84f4d54..7b8b492736f7 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="linguas_sa">Language support for sa</flag>
     <flag name="linguas_sk_SK">Language support for sk_SK</flag>
     <flag name="linguas_th_TH">Language support for th_TH</flag>
+    <flag name="poppler">Native pdf import</flag>
     <flag name="scripts">Install the scripts</flag>
     <flag name="tk">Install tk based scripts e.g. FontSample.py</flag>
   </use>
diff --git a/app-office/scribus/scribus-1.4.1-r1.ebuild b/app-office/scribus/scribus-1.4.1-r1.ebuild
deleted file mode 100644
index d83f4a96c7ef..000000000000
--- a/app-office/scribus/scribus-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.1-r1.ebuild,v 1.6 2013/07/02 13:55:01 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit cmake-utils fdo-mime multilib python
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="cairo debug examples +minimal +pdf spell templates"
-
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-COMMON_DEPEND="
-	dev-libs/hyphen
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	virtual/jpeg
-	spell? ( app-text/aspell )
-	pdf? ( app-text/podofo )
-	cairo? ( x11-libs/cairo[X,svg] )"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost"
-
-S="${WORKDIR}"/Scribus
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
-#	"${FILESDIR}"/${P}-export.patch
-	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
-	)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	cat > cmake/modules/FindZLIB.cmake <<- EOF
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	rm scribus/{ioapi,unzip}.[ch] || die
-
-	if ! use templates; then
-		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die
-	fi
-	if ! use examples; then
-		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		use linguas_${lang} && langs+=",${lang}"
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY=$(python_get_library)
-		-DWANT_NORPATH=ON
-		-DWANT_QTARTHUR=ON
-		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
-		-DWANT_GUI_LANG=${langs#,}
-		$(cmake-utils_use_has spell ASPELL)
-		$(cmake-utils_use_has pdf PODOFO)
-		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
-		$(cmake-utils_use_want debug DEBUG)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-	use linguas_de || rm -rf "${ED}"/usr/share/doc/${PF}/de
-	use linguas_it || rm -rf "${ED}"/usr/share/doc/${PF}/it
-	docompress -x /usr/share/doc/${PF}/en
-	doicon resources/icons/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_preinst() {
-	# 399595
-	rm -vf "${ED}"/usr/share/doc/${PF}/en* || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/app-office/scribus/scribus-1.4.3.ebuild b/app-office/scribus/scribus-1.4.3.ebuild
index da22d706e6a1..6c1740a8663b 100644
--- a/app-office/scribus/scribus-1.4.3.ebuild
+++ b/app-office/scribus/scribus-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v 1.7 2014/08/02 18:10:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v 1.9 2014/08/14 07:15:15 jlec Exp $
 
 EAPI=5
 
diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild
index 98fb13f221ff..a58484f0b13c 100644
--- a/app-office/scribus/scribus-1.4.9999.ebuild
+++ b/app-office/scribus/scribus-1.4.9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.8 2013/09/17 15:58:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.9 2014/08/14 07:15:15 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE=tk
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
 
 inherit cmake-utils fdo-mime multilib python-single-r1 subversion
 
@@ -18,17 +18,18 @@ ESVN_PROJECT=Scribus-1.4
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cairo debug examples hunspell +minimal +pdf templates"
+IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
 IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
 	dev-libs/boost
 	dev-libs/hyphen
 	dev-libs/libxml2
@@ -43,8 +44,12 @@ COMMON_DEPEND="
 	sys-libs/zlib[minizip]
 	virtual/jpeg
 	cairo? ( x11-libs/cairo[X,svg] )
+	!cairo? ( media-libs/libart_lgpl )
+	hunspell? ( app-text/hunspell )
 	pdf? ( app-text/podofo )
-	hunspell? ( app-text/hunspell )"
+	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
 DEPEND="${COMMON_DEPEND}
@@ -52,7 +57,6 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-docs.patch
-	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
 	)
 
 src_prepare() {
@@ -65,6 +69,10 @@ src_prepare() {
 	EOF
 
 	rm scribus/{ioapi,unzip}.[ch] || die
+	sed \
+		-e "/^\s*unzip\.[ch]/d" \
+		-e "/^\s*ioapi\.[ch]/d" \
+		-i scribus/CMakeLists.txt || die
 
 	sed \
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
@@ -86,21 +94,21 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
 		-DWANT_NORPATH=ON
-		-DWANT_QTARTHUR=ON
 		-DWANT_QT3SUPPORT=OFF
 		-DGENTOOVERSION=${PVR}
 		-DWANT_GUI_LANG=${langs#,}
 		$(cmake-utils_use_with pdf PODOFO)
 		$(cmake-utils_use_want cairo)
+		$(cmake-utils_use_want !cairo QTARTHUR)
 		$(cmake-utils_use_want debug DEBUG)
 		$(cmake-utils_use_want minimal NOHEADERINSTALL)
 		$(cmake-utils_use_want hunspell HUNSPELL)
+		$(cmake-utils_use_want !examples NOEXAMPLES)
+		$(cmake-utils_use_want !templates NOTEMPLATES)
 		)
-	use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
-	use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
 	cmake-utils_src_configure
 }
 
@@ -115,6 +123,15 @@ src_install() {
 		fi
 	done
 
+	if ! use scripts; then
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	elif ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+
+	python_fix_shebang "${ED}"/usr/share/scribus/scripts
+	python_optimize "${ED}"/usr/share/scribus/scripts
+
 	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
 	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
 	docompress -x /usr/share/doc/${PF}/en
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index a27b6d1dbf43..27b1c572d8ab 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.9 2013/09/17 15:58:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.10 2014/08/14 07:15:15 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE=tk
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
 
 inherit cmake-utils fdo-mime multilib python-single-r1 subversion
 
@@ -18,17 +18,18 @@ ESVN_PROJECT=Scribus-1.5
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +pdf templates"
+IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +pdf poppler scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
 IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
 	dev-libs/boost
 	dev-libs/hyphen
 	dev-libs/libxml2
@@ -43,10 +44,15 @@ COMMON_DEPEND="
 	sys-libs/zlib[minizip]
 	virtual/jpeg
 	cairo? ( x11-libs/cairo[X,svg] )
+	!cairo? ( media-libs/libart_lgpl )
+	hunspell? ( app-text/hunspell )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo )
-	hunspell? ( app-text/hunspell )"
+	poppler? ( app-text/poppler )
+	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
 DEPEND="${COMMON_DEPEND}
@@ -65,7 +71,6 @@ src_prepare() {
 	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
 	EOF
 
-	rm scribus/{ioapi,unzip}.[ch] || die
 	sed \
 		-e "/^\s*unzip\.[ch]/d" \
 		-e "/^\s*ioapi\.[ch]/d" \
@@ -91,8 +96,8 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
 		-DWANT_NORPATH=ON
 		-DWANT_QTARTHUR=ON
 		-DWANT_QT3SUPPORT=OFF
@@ -105,9 +110,9 @@ src_configure() {
 		$(cmake-utils_use_want debug DEBUG)
 		$(cmake-utils_use_want minimal NOHEADERINSTALL)
 		$(cmake-utils_use_want hunspell HUNSPELL)
+		$(cmake-utils_use_want !examples NOEXAMPLES)
+		$(cmake-utils_use_want !templates NOTEMPLATES)
 		)
-	use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
-	use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
 	cmake-utils_src_configure
 }
 
@@ -122,6 +127,15 @@ src_install() {
 		fi
 	done
 
+	if ! use scripts; then
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	elif ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+
+	python_fix_shebang "${ED}"/usr/share/scribus/scripts
+	python_optimize "${ED}"/usr/share/scribus/scripts
+
 	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
 	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
 	docompress -x /usr/share/doc/${PF}/en
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
index 20c4430fdbc5..f9de413fe947 100644
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.5.ebuild,v 1.5 2014/08/05 14:46:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.5.ebuild,v 1.6 2014/08/14 13:20:41 zlogene Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="|| ( Artistic GPL-2 )"
 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"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 2649e2852dee..35cdac8396d6 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,3 +1,3 @@
 DIST portpeek-2.0.25.tar.gz 11367 SHA256 38de327bdefdd853166ec0ecdae03ccd508fb27c9762b99cea9926ce38801f5b SHA512 ea4b996787f4f956e3146f6618189f389f78f7a3778297ba1a2118b048c5f2e950221fbe4f9c52249a043f1fc65b4c45a01b799bb52b61e337527702f2149d9d WHIRLPOOL b57636fb820d6e5f0cb1611ca0e417c8d6b04a2c0fc50f9b32da78b940984c687c3ea1dc9a00660ce395108daca372fc3b9d90d9158cab51c502aa6677fd282d
-DIST portpeek-2.1.13.tar.gz 11960 SHA256 5703fc16bf137ac53df694d649df832f6a8dd76232990236135e29cb8c1af316 SHA512 e1e69d64739a20466262973f1cf3b4a9cb56682ecb8eb6a7ec18d0d784655a38bfb73f148f37f8ab2ee8bd5a3a442dc98d03ace3483e64648d55d011bce406b6 WHIRLPOOL 50fa9a7f53962b5667cc9b4e973ffdff1d61de26629895917f5cde0401d023bddcfa9f24e47d65a4cfb5312976ae52883bf857946568bcc9009f1d71b0adb842
+DIST portpeek-2.1.14.tar.gz 12137 SHA256 4c4b754e57b596990c4b2e11a06fe7465e1cf239dff6cff85c31f251d6616e1b SHA512 b52f1d909fde2200bdbcac4a9be74c3210b602496e597a92228b0c2c1d9f23cfdcef91e349559a9ecfbaed000c4c834d0b52368b5a8c9d2046139027a1fc2913 WHIRLPOOL 4034673a14b88d6322eb30f82f6d56d21996eadd5d91830efc21d74f8966708f76a21b3ac2c03d2623bdbd44e252a28d968365cb281ca579ce0df1d8a9998919
 DIST portpeek-2.1.9.tar.gz 11827 SHA256 46d7fe52bdc1113e9a790d9d77fc7284721ec6e99817a553204800d7cad19382 SHA512 751b313c605355d92a4fc11d4b717bdaf30cf9e1dd3f78346761fd0c9ed64ce195efdc33cc541f136370b264f60d1438191eae6f1ef6c10d499c6a7e084cefb5 WHIRLPOOL 3f1a18376756d837202268565fa695be0898ff4c27e297ddd3fa4c80670e9d03759e4ad4ec7b6d3032b1230769cc224e6c6444d539c8890aa57beadda2314d71
diff --git a/app-portage/portpeek/portpeek-2.1.13.ebuild b/app-portage/portpeek/portpeek-2.1.14.ebuild
similarity index 93%
rename from app-portage/portpeek/portpeek-2.1.13.ebuild
rename to app-portage/portpeek/portpeek-2.1.14.ebuild
index 04f3e09d8fa4..1f3553e2a9b3 100644
--- a/app-portage/portpeek/portpeek-2.1.13.ebuild
+++ b/app-portage/portpeek/portpeek-2.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.13.ebuild,v 1.1 2014/07/25 13:16:29 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-2.1.14.ebuild,v 1.1 2014/08/14 00:19:49 mpagano Exp $
 
 EAPI="5"
 
diff --git a/app-text/dos2unix/dos2unix-6.0.5.ebuild b/app-text/dos2unix/dos2unix-6.0.5.ebuild
index 054ea3954b60..b166fb5a8dd9 100644
--- a/app-text/dos2unix/dos2unix-6.0.5.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.5.ebuild,v 1.2 2014/08/06 09:31:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.5.ebuild,v 1.3 2014/08/14 17:19:01 phajdan.jr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls"
 
 RDEPEND="
diff --git a/app-text/jist/jist-1.3.0.ebuild b/app-text/jist/jist-1.3.0.ebuild
index 5f20004c7dfb..a6378ae12835 100644
--- a/app-text/jist/jist-1.3.0.ebuild
+++ b/app-text/jist/jist-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.3.0.ebuild,v 1.1 2012/12/10 20:45:50 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.3.0.ebuild,v 1.2 2014/08/14 13:54:50 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/app-text/jist/jist-1.3.1.ebuild b/app-text/jist/jist-1.3.1.ebuild
index a9df631abf32..f640a28f8577 100644
--- a/app-text/jist/jist-1.3.1.ebuild
+++ b/app-text/jist/jist-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.3.1.ebuild,v 1.1 2013/01/04 23:34:44 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.3.1.ebuild,v 1.2 2014/08/14 13:54:50 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/app-text/jist/jist-1.4.0.ebuild b/app-text/jist/jist-1.4.0.ebuild
index 94c31250c8c7..3d9aba442119 100644
--- a/app-text/jist/jist-1.4.0.ebuild
+++ b/app-text/jist/jist-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.4.0.ebuild,v 1.1 2013/03/22 22:46:00 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.4.0.ebuild,v 1.2 2014/08/14 13:54:50 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/app-text/jist/jist-1.5.0.ebuild b/app-text/jist/jist-1.5.0.ebuild
index db7f800cf9d1..dbe7405f47d2 100644
--- a/app-text/jist/jist-1.5.0.ebuild
+++ b/app-text/jist/jist-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.5.0.ebuild,v 1.1 2013/04/13 00:13:39 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.5.0.ebuild,v 1.2 2014/08/14 13:54:50 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/app-text/jist/jist-1.5.1.ebuild b/app-text/jist/jist-1.5.1.ebuild
index f1df68da2aab..9da344f9e07e 100644
--- a/app-text/jist/jist-1.5.1.ebuild
+++ b/app-text/jist/jist-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.5.1.ebuild,v 1.4 2013/10/26 13:56:02 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jist/jist-1.5.1.ebuild,v 1.5 2014/08/14 13:54:50 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index a6b285115ed9..cd15f145f588 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,6 +1,2 @@
-DIST multitail-5.2.12.tgz 163735 SHA256 681d87cd49e11aab1d82ad7818ee639c88a3d305db8accf0859977beda6c493c SHA512 d2ce9c119b619857c22dde098f3013fe8d9c8a410f1f6cc56e97cc2bf3fc19eddeff1485019be16587791f44b0b680431087c9e9be66ecc1c999ea0507b6b99c WHIRLPOOL 73ed263561b066f871aa2193a408f5c22f99261fbf08f7c83f020fc1e2799f67884dd5519cd8adcea07d45ae7a4a98b9d49402f6d14ab54ac9bf78c403c54039
 DIST multitail-5.2.13.tgz 164018 SHA256 8692a9d8513093877e337673a8437075dcd34522a0840b2438e5cd1e6a5bafab SHA512 fa8b057e445d845544afb52c0fa314a14dec08e64789e515fe86ebe22875c9626141476ad704ed4208301546c4ac794944165dcfcd8475d79d7d03e1725e5a51 WHIRLPOOL 9bb3a05262ed19e465c59d737d3eff3d07f6a5be71bc7d3b77d9b3f365e915d568da3f9ca1fcc7dc2791767c05807716e6f7c9afd73f37f495f3a3fa748c02e1
-DIST multitail-6.0.tgz 163969 SHA256 0daeb62204491fcf76ab5706d13036e05b941a8cdbe8f9eacd1a4cae7a63eb5d SHA512 f6005d341f88e0fdd361ff7a19d77f10d58abaa44e0e0cfbcca1f21b4bc176374bccbea0327c516936310e42d7e1abb7bb84c9853d69a2206fefea306b6c8250 WHIRLPOOL 175a6f393794b0c1da0a75281b463a4151e3108fe7f9103c26087674871590313dfdd76b961fdec9f77c0ff93fe0a2a3aaa1e69fb110895d7e5c243770b56aee
-DIST multitail-6.1.tgz 164646 SHA256 69a4266c40d8ccc3387fca31929385d828d1e33fbdb5091781bea3b324174331 SHA512 8bb7223643aea4327d7806bbc1f696824eff671f86771a63e7b28f6bde02e223567690328e4bf552c014d8daa46a121e5af7c4fa70319bc5df7e77be132f30e1 WHIRLPOOL 55903faadf2c2988c3fe6b3d78ccf324541c627597ecfaa89da76f3f0ebd8d5f75b0abdd5a33e6b11af0f9b88fa3b278baa36e4e1cb3d5a1be10bd10eb22683e
 DIST multitail-6.2.1.tgz 166049 SHA256 1e586cd62c3cdb8089062c9670a6d8588359e2f8030b8b18dbc715ea59d92e11 SHA512 e1515c000c25be6532f590a2d030c44419866994c2744140d124c1b6ac73acf460b3a41ba6e0e8398350c180030eb69d13b537005b0744047d5c5a374b4cb123 WHIRLPOOL a14ec63145f412b21d7c769452c957fda1170daae725113991a8f4c1da19430516b7a27582f183b312a3388a6944beac0de64753684d60cc7255453254c2fd1c
-DIST multitail-6.2.tgz 166006 SHA256 06fa98421874b3eef55e0e375b6d1ecdf41ddb2c951c25cd9c777ce87076cd1b SHA512 bce3bf7d1b02f72ed9bc66b30a38bf3480b32b8070a58ead5b1d86a63c100abc9e747f716c62825d33f99426daf695863b65791a5a64fb85557eed95852435d2 WHIRLPOOL b3c8328d5fa4ba8a59533e6acc2cf36b1efc3e24c25b25fb7c8d305aaaa20d8354a8befda1dab19f13218701fb20a6a8cab034d6e0f5b200a01380c929bb0d46
diff --git a/app-text/multitail/multitail-5.2.12.ebuild b/app-text/multitail/multitail-5.2.12.ebuild
deleted file mode 100644
index 94cc6d4a8e82..000000000000
--- a/app-text/multitail/multitail-5.2.12.ebuild
+++ /dev/null
@@ -1,50 +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/multitail/multitail-5.2.12.ebuild,v 1.9 2013/03/09 19:09:30 ago Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="debug doc examples"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
-
-	sed -e '/gcc/d' -i Makefile || die
-
-	tc-export CC PKG_CONFIG
-}
-
-src_configure() {
-	use debug && append-flags "-D_DEBUG"
-	use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile
-}
-
-src_install () {
-	dobin multitail
-
-	insinto /etc
-	doins multitail.conf
-
-	dodoc Changes readme.txt thanks.txt
-	doman multitail.1
-
-	use doc && dohtml manual.html
-
-	docinto examples
-	use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
-}
diff --git a/app-text/multitail/multitail-6.0.ebuild b/app-text/multitail/multitail-6.0.ebuild
deleted file mode 100644
index 94c5c3d766fe..000000000000
--- a/app-text/multitail/multitail-6.0.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/app-text/multitail/multitail-6.0.ebuild,v 1.1 2013/11/27 07:39:19 jlec Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test" # bug #492270
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
-
-	sed \
-		-e '/gcc/d' \
-		-e '/scan-build/d' \
-		-e 's:make clean::g' \
-		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
-		-i Makefile || die
-
-	tc-export CC PKG_CONFIG
-
-	use debug && append-flags "-D_DEBUG"
-}
-
-src_configure() {
-	emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install () {
-	dobin multitail
-
-	insinto /etc
-	doins multitail.conf
-
-	dodoc Changes readme.txt thanks.txt
-	doman multitail.1
-
-	dohtml manual.html
-
-	docinto examples
-	use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
-}
diff --git a/app-text/multitail/multitail-6.1.ebuild b/app-text/multitail/multitail-6.1.ebuild
deleted file mode 100644
index d39436816484..000000000000
--- a/app-text/multitail/multitail-6.1.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-text/multitail/multitail-6.1.ebuild,v 1.1 2014/02/13 07:59:26 jlec Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test" # bug #492270
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.0-as-needed.patch
-
-	use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
-
-	sed \
-		-e '/gcc/d' \
-		-e '/scan-build/d' \
-		-e 's:make clean::g' \
-		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
-		-i Makefile || die
-
-	tc-export CC PKG_CONFIG
-
-	use debug && append-flags "-D_DEBUG"
-}
-
-src_configure() {
-	emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install () {
-	dobin multitail
-
-	insinto /etc
-	doins multitail.conf
-
-	dodoc Changes readme.txt thanks.txt
-	doman multitail.1
-
-	dohtml manual.html
-
-	docinto examples
-	use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
-}
diff --git a/app-text/multitail/multitail-6.2.ebuild b/app-text/multitail/multitail-6.2.ebuild
deleted file mode 100644
index f6b95fab9ec5..000000000000
--- a/app-text/multitail/multitail-6.2.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-text/multitail/multitail-6.2.ebuild,v 1.1 2014/02/14 07:11:51 jlec Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test" # bug #492270
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.0-as-needed.patch
-
-	use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch
-
-	sed \
-		-e '/gcc/d' \
-		-e '/scan-build/d' \
-		-e 's:make clean::g' \
-		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
-		-i Makefile || die
-
-	tc-export CC PKG_CONFIG
-
-	use debug && append-flags "-D_DEBUG"
-}
-
-src_configure() {
-	emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install () {
-	dobin multitail
-
-	insinto /etc
-	doins multitail.conf
-
-	dodoc Changes readme.txt thanks.txt
-	doman multitail.1
-
-	dohtml manual.html
-
-	docinto examples
-	use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl
-}
diff --git a/app-vim/command-t/command-t-1.5.1.ebuild b/app-vim/command-t/command-t-1.5.1.ebuild
index 6a1e938280e7..3155da05f142 100644
--- a/app-vim/command-t/command-t-1.5.1.ebuild
+++ b/app-vim/command-t/command-t-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.5.1.ebuild,v 1.1 2013/09/26 07:54:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.5.1.ebuild,v 1.2 2014/08/14 13:51:56 mrueg Exp $
 
 EAPI="5"
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 inherit vim-plugin ruby-ng
 
diff --git a/app-vim/command-t/command-t-1.6.1.ebuild b/app-vim/command-t/command-t-1.6.1.ebuild
index 064458397f98..adf99ec0b9a6 100644
--- a/app-vim/command-t/command-t-1.6.1.ebuild
+++ b/app-vim/command-t/command-t-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.6.1.ebuild,v 1.1 2013/12/23 07:03:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.6.1.ebuild,v 1.2 2014/08/14 13:51:56 mrueg Exp $
 
 EAPI="5"
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 inherit vim-plugin ruby-ng
 
diff --git a/app-vim/command-t/command-t-1.6.ebuild b/app-vim/command-t/command-t-1.6.ebuild
index 515818377fa5..fe30db7ff46a 100644
--- a/app-vim/command-t/command-t-1.6.ebuild
+++ b/app-vim/command-t/command-t-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.6.ebuild,v 1.1 2013/12/17 09:12:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.6.ebuild,v 1.2 2014/08/14 13:51:56 mrueg Exp $
 
 EAPI="5"
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 inherit vim-plugin ruby-ng
 
diff --git a/app-vim/command-t/command-t-1.7.ebuild b/app-vim/command-t/command-t-1.7.ebuild
index 04987ff78e6f..3c21db0f4731 100644
--- a/app-vim/command-t/command-t-1.7.ebuild
+++ b/app-vim/command-t/command-t-1.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.7.ebuild,v 1.1 2014/03/11 03:39:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.7.ebuild,v 1.2 2014/08/14 13:51:56 mrueg Exp $
 
 EAPI="5"
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 inherit vim-plugin ruby-ng
 
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index bd67715fbc04..d7c3e653ca6f 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1,3 +1 @@
-DIST gnus-1.91-pkg.tar.gz 3495969 SHA256 c7b736365158aeb9165e664017bf334277b4a8e260c5583321eaeab075e9d73a SHA512 10cb6de2ddbbc4276b585b02f0076da141ed131f7287031625ba7c85a3c0dcfe8d66a12916218387e01c1431a5ef1215073a476dfd5b9ff16673f1f0f0fa6906 WHIRLPOOL 590d80a5583263211a3160cc6cc9f6398ac6faac42467194301984367ff2a19daa12bf1fbb4b0ad94b16f4c32e029cbd7ee6479a4c63efe39b05b8b9bc037cbd
-DIST gnus-1.94-pkg.tar.gz 3495935 SHA256 8314bc716b51005aa816d9629131b88397cb5040c9d51e57012771b411f5fb5b SHA512 f5b8e548e6f7307c16d4703ccf23f0dd5e34bc8cfd1ac5d5be3e581b01e21aa578804ec5878801b61355bc726dd30e56e7642974a4962e1a802a471d5e5b0465 WHIRLPOOL a2a06391fc719022882e764d2d4381970e2beabb49262d8029d83d0f01f1d8750577b321b44e6c38947becba155973d28676f4750544add14a8cf1a7be74da50
 DIST gnus-1.99-pkg.tar.gz 3636886 SHA256 e513bf0c604552e94b42c5ebfe5c23dcfa66923798cec379307b610fa1b6249a SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79 WHIRLPOOL 9d0cd9534831d7e8025c33926cf06dc37200921993cbe083e00d97a478ae9e5f65265fef7d183e130c2c4f269dce009ba3b28cdaf2e39d1c78901385a8235833
diff --git a/app-xemacs/gnus/gnus-1.91.ebuild b/app-xemacs/gnus/gnus-1.91.ebuild
deleted file mode 100644
index 202461c68fdd..000000000000
--- a/app-xemacs/gnus/gnus-1.91.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/app-xemacs/gnus/gnus-1.91.ebuild,v 1.8 2014/08/10 19:04:53 slyfox Exp $
-
-SLOT="0"
-IUSE=""
-DESCRIPTION="The Gnus Newsreader and Mailreader"
-PKG_CAT="standard"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/os-utils
-app-xemacs/dired
-app-xemacs/mh-e
-app-xemacs/sieve
-app-xemacs/ps-print
-app-xemacs/w3
-app-xemacs/pgg
-app-xemacs/mailcrypt
-app-xemacs/ecrypto
-app-xemacs/sasl
-"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/gnus/gnus-1.94.ebuild b/app-xemacs/gnus/gnus-1.94.ebuild
deleted file mode 100644
index d74da4b1bf7e..000000000000
--- a/app-xemacs/gnus/gnus-1.94.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/app-xemacs/gnus/gnus-1.94.ebuild,v 1.7 2014/08/10 19:04:53 slyfox Exp $
-
-SLOT="0"
-IUSE=""
-DESCRIPTION="The Gnus Newsreader and Mailreader"
-PKG_CAT="standard"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/os-utils
-app-xemacs/dired
-app-xemacs/mh-e
-app-xemacs/sieve
-app-xemacs/ps-print
-app-xemacs/w3
-app-xemacs/pgg
-app-xemacs/mailcrypt
-app-xemacs/ecrypto
-app-xemacs/sasl
-"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index 3aaf009580f6..72b67254e412 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -1,3 +1 @@
-DIST mail-lib-1.79-pkg.tar.gz 215370 SHA256 50a1e8c4e266b3bc70364ca60b26935f488af9f10dab1849dc9129900b1bf02b SHA512 f0ca0758b9b77f2004ed82c7ab7c87ffed6dc5cc21a1dad0fe7b5e11c5513653c2085ba6bba0e11e1eb95e906fd1a6daf95dcf01459df6c19efaa52dba2d5efb WHIRLPOOL 39bc78eaea2dd20e8b08b806fbba7a44c28c0c6c4362b087b3b2217373af2bafaec0cd9d5b5ab62fb391ccc2cbbdef81c58d28a69863d08b211196ac3e874acd
-DIST mail-lib-1.80-pkg.tar.gz 215436 SHA256 17678d8a8203e4fec431217250e062c766ebc660ebb5a8b9661912178646769a SHA512 8c30453fba657322cb98d85bf80bd3261cc3edb038eb174262710d264be13d4349ea89ce9c3006ea89369ae99d1c266e8e29e77d3283eb90994c2d6f184a1c08 WHIRLPOOL f7dff35e556a8f015c171a897f34fe17b7032d720fc0f5ebf6babf2233315ff7ccd062473b5aed5f7067a9ae6b287439e9672266d14bb338005e554313eac1fb
 DIST mail-lib-1.83-pkg.tar.gz 211862 SHA256 feba4927009238f6eae1269e24697c546d32dd90d3027022d71f7fbba45080ae SHA512 09149c96e3716c2df054654a6111cd45f0bc86c47ea5a8c699e8c7822052c68885a01392e07611ad7b5f721679aa1a9c5da0694d1a0aef6af3a51b4290c31162 WHIRLPOOL 7231cbe90f1a79214bd1af6ccfeaf3b9faa8ad9476263985225cb8245511f6776a5b6a4f9c4119f2d75ff8cd2aa19d0ae2e49797d1ce7d42f967b10c588dc444
diff --git a/app-xemacs/mail-lib/mail-lib-1.79.ebuild b/app-xemacs/mail-lib/mail-lib-1.79.ebuild
deleted file mode 100644
index e935ad76e7fe..000000000000
--- a/app-xemacs/mail-lib/mail-lib-1.79.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/app-xemacs/mail-lib/mail-lib-1.79.ebuild,v 1.8 2014/08/10 19:12:06 slyfox Exp $
-
-SLOT="0"
-IUSE=""
-DESCRIPTION="Fundamental lisp files for providing email support"
-PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-eterm
-app-xemacs/xemacs-base
-app-xemacs/fsf-compat
-app-xemacs/sh-script
-app-xemacs/ecrypto
-"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/mail-lib-1.80.ebuild b/app-xemacs/mail-lib/mail-lib-1.80.ebuild
deleted file mode 100644
index c8dfecd8fc64..000000000000
--- a/app-xemacs/mail-lib/mail-lib-1.80.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/app-xemacs/mail-lib/mail-lib-1.80.ebuild,v 1.7 2014/08/10 19:12:06 slyfox Exp $
-
-SLOT="0"
-IUSE=""
-DESCRIPTION="Fundamental lisp files for providing email support"
-PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-eterm
-app-xemacs/xemacs-base
-app-xemacs/fsf-compat
-app-xemacs/sh-script
-app-xemacs/ecrypto
-"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
index 5be0138b1f14..94545cf72ac0 100644
--- a/app-xemacs/tramp/Manifest
+++ b/app-xemacs/tramp/Manifest
@@ -1,3 +1 @@
-DIST tramp-1.37-pkg.tar.gz 298584 SHA256 5f56b5312c41d4689c95fe43a9b22b3061876f8d488f4e8218f3684638e835c9 SHA512 ff44ef5d83be3e28f792f45b0c402d1aac02b2a8cec5ab3e275a3aef4e19c6d1171d71ba745e3e4561779dec59a79811024b28c146da7eb87a221c81e8297937 WHIRLPOOL ab8353defb38ff58789689f0ab41ed0c3754d30488b13cf1743c72446433227368264f2431a9d05bbf932f95978ece1a5be8ea79551fa4f46512a2d6e8ac68d3
-DIST tramp-1.40-pkg.tar.gz 304372 SHA256 16355e4ee481c392e0a36a7020a8637a5a4c44fa014b9d75b7ae01262d00f80c SHA512 8303071862194578cd12c1305cc81f764bb342de4d1d24e48a5fca5057f875cc90ccf187fe0fe1236b5d4aa173c366d501e14138d6f17a4fcd789c847d1fae99 WHIRLPOOL 6be11298f161cfeafeb61264516a37ce940c184f821a063fd8644e5d56639cba24ff039009f489dc78fe2d5c0b43571c1d6220037cdb982e3fa4dc372fc7ed3f
 DIST tramp-1.52-pkg.tar.gz 396316 SHA256 e3185e7bd8e3dd7076c8d4009014a8a70cd1953dcf4102f4408d181b7c148383 SHA512 ce61fe02bf0803a845bf34df7d9c7c0f72a28bcc84e2ebbcd8b80b1a28a5304bcffd5756a5a61d297b537e79a7d90e60821ba857a4c06911d4c098f2694897c6 WHIRLPOOL 6a45807355081ebc25fd3da40bae5d178f44345d87be430a629310962c40d65ff9bb0a8d216260d6bc2963b65a3a169b6af912836bcf2687cac144c17359cac5
diff --git a/app-xemacs/tramp/tramp-1.37.ebuild b/app-xemacs/tramp/tramp-1.37.ebuild
deleted file mode 100644
index ffa99f13f8f9..000000000000
--- a/app-xemacs/tramp/tramp-1.37.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tramp/tramp-1.37.ebuild,v 1.8 2014/08/10 19:40:34 slyfox Exp $
-
-SLOT="0"
-IUSE=""
-DESCRIPTION="Remote shell-based file editing"
-PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/vc
-app-xemacs/efs
-app-xemacs/dired
-app-xemacs/mail-lib
-app-xemacs/gnus
-app-xemacs/ediff
-app-xemacs/sh-script
-"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/tramp/tramp-1.40.ebuild b/app-xemacs/tramp/tramp-1.40.ebuild
deleted file mode 100644
index 60ecfacecc24..000000000000
--- a/app-xemacs/tramp/tramp-1.40.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tramp/tramp-1.40.ebuild,v 1.7 2014/08/10 19:40:34 slyfox Exp $
-
-SLOT="0"
-IUSE=""
-DESCRIPTION="Remote shell-based file editing"
-PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/vc
-app-xemacs/efs
-app-xemacs/dired
-app-xemacs/mail-lib
-app-xemacs/gnus
-app-xemacs/ediff
-app-xemacs/sh-script
-app-xemacs/edebug
-"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/dev-cpp/eigen/eigen-3.1.3.ebuild b/dev-cpp/eigen/eigen-3.1.3.ebuild
index 3e3b721fd112..6f426c94e642 100644
--- a/dev-cpp/eigen/eigen-3.1.3.ebuild
+++ b/dev-cpp/eigen/eigen-3.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-3.1.3.ebuild,v 1.1 2013/04/19 07:20:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-3.1.3.ebuild,v 1.2 2014/08/14 17:21:40 phajdan.jr Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://eigen.tuxfamily.org/"
 SRC_URI="http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="LGPL-2 GPL-3"
-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"
 SLOT="3"
 IUSE="debug doc"
 
diff --git a/dev-db/lmdb/lmdb-0.9.11.ebuild b/dev-db/lmdb/lmdb-0.9.11.ebuild
index 33e40d5ddb41..5a9daf01dbeb 100644
--- a/dev-db/lmdb/lmdb-0.9.11.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.5 2014/08/08 09:40:58 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.6 2014/08/14 16:16:30 phajdan.jr Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="https://gitorious.org/mdb/mdb/archive/aa3463ec7c5e979420b13c8f37caa377e
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
index e94ac90eb1c2..3caaac40a2ee 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.1 2014/08/03 21:42:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.2 2014/08/13 20:53:43 grknight Exp $
 
 EAPI=4
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="none"
 BUILD="cmake"
 
 # PBXT
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
index faa725e269ed..d1d73edbb8cd 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild,v 1.1 2014/08/03 21:42:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild,v 1.2 2014/08/13 20:53:43 grknight Exp $
 
 EAPI=4
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="none"
 BUILD="cmake"
 
 # PBXT
diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index f2b825bc1211..6044dd563bba 100644
--- a/dev-db/mysql/mysql-5.5.39.ebuild
+++ b/dev-db/mysql/mysql-5.5.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.9 2014/08/10 17:27:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.10 2014/08/13 15:26:18 maekke Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ IUSE="$IUSE"
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 6ed67f84fd3a..2daf6d1cc87b 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,7 +1,5 @@
-DIST phpMyAdmin-4.0.5-all-languages.tar.xz 4572884 SHA256 f4df1190441ce5e094183cfadf8aec4af3a4f131339599e6380a1c6ac0a11fe4 SHA512 fea613e28b5124ac8a53e5158f19bed66e576a7f021671ff85ab7522e73974d99b51fc3a84345d99ce81cb7aaa5751ff473b7e609def1edd46df26c78866da6d WHIRLPOOL 41749912e2f9ff81bbb839308bca87a4a4f373241cd40638644e7a9390bbf48512efb6b57bfae36c1ddfb73e1f447681a4e7d39530b1f9cb9ba36cc1e8691ab8
-DIST phpMyAdmin-4.0.6-all-languages.tar.xz 4753244 SHA256 0ced3883edc540ea525419727b4a5cc54c73ef67f48c0d721ade5cda5e820ba7 SHA512 9c1b3868a73137da20df79314e48f41d990287863d68ef18201048dec5ea816e2580c38781c61571742100b7201ae3d9d12b5a2d6ef2b0756cf2f92e52cf8695 WHIRLPOOL 8d9d1ee4d2b582788f921cd4ad4ab3c1c830734d324ae544cd80517dd51736316027ae692ac8d4c511a6a72edb4cbd72285efa18717448ce3bd2a7e32a9bad57
+DIST phpMyAdmin-4.0.10.1-all-languages.tar.xz 4702872 SHA256 eadde9eca1a5d704c244b4bdab3b0e7f88c29201fbf71b09e221db0ce623f3ed SHA512 7b69806f88eb7eab4312b18e48cb68c6de33e6d29248daeed2c564cffa06cbd98defb9a23da17c6a6dfbe27269dccebbdd3b4aeaf945774ee6d05a1238696d4e WHIRLPOOL 98263f5974caa71170e871e5b31025ee9ac6d7313f0bb974a6df996371832afb0d17c3f37e299abce4556bf18c399dc7c662db4805dd9637fcc211b2defe01d6
 DIST phpMyAdmin-4.1.14-all-languages.tar.xz 4810240 SHA256 a124fd8cccc059cfe43e2b7b3a1858bb549fc00ef2c6d329418ee596aa9e8d8f SHA512 b27829f10e68f66cdfc3b97f0d3b45f513e35ce36a1b16b99f0672f4b3ab3d5e8dda0426c62f63131a2c7b6011e1939c69799e1bfeea6aa7b9e0c9f8161fbec2 WHIRLPOOL fd9488b34acfda851a11c2a4c465f77c36fbe2804935fdd200b41d8bdb2a6a53c5cbbcf3edf0c3201e0114d458e9c23f6048d4a36fe3bcfe7fd1cce711300596
-DIST phpMyAdmin-4.1.4-all-languages.tar.xz 4901576 SHA256 4bd23cda85b3ac4e44a1e472a461638230020af78bd03d7178f60d55b8bb1331 SHA512 c600fc16a44cd395cda5fb16e8ab6ec1d5399651ce8b6c083e030fd3216d58fa8eac682cc7ba4e9c86b3aa1c91c483024fff6a10c11375c4914a523caf3e13e3 WHIRLPOOL d1547f0e7a484c308d91ded0cce47a258c7bbf191b7f592b1f54482ab736d4e244dc0181c5e8052ba47ae0a41da466bdcbf83946a37ba137c87da05770c5ebed
+DIST phpMyAdmin-4.1.14.2-all-languages.tar.xz 4809288 SHA256 c93efeba0ce8ba1ebd00a084eb7b5835d391dffcdb791670f0482f749250e843 SHA512 dc5a1ad8367edd87bce7fd90cba5d91885aa1a5c677cf3a30fd47e46f61993b29a69072b3e45460f780d2fe285fb460b3bb9237e1b965af8566ff3d9803240c9 WHIRLPOOL f55a3909e11042154f23db36e829df7e845702d22e03898d314cc111ea9510230cea447e36c7f210bd327ba7e876eb15be68bb244b06f448760b950f470298a8
 DIST phpMyAdmin-4.1.7-all-languages.tar.xz 4807196 SHA256 d8c0b5ee3cbe3f4ac3ad23d68305ecb5c6e7c9a319d4667a14ecbc055f9a4ce3 SHA512 31503398d20537bf932b2d551a4594ecd135f003d07a24b2c39d806f70824454cc89da9973c5d3356368ce2ef864fa2893154a4ed57becdd6adac9ec0be07237 WHIRLPOOL 7386a0052683a0b2ebee58fbdef7924bd9ad8513b454dcd875b53508c17ba4f281e43d49a12889d25a01ddae0669cb22697084aefde78642ffe6ffbea22aeb1a
-DIST phpMyAdmin-4.1.8-all-languages.tar.xz 4795320 SHA256 857f133911eddcec16824f3ecc7a68f93288ab2a2f1943bfce3b06b58b625cd6 SHA512 92771c8e3ba54abb42eef2e24e615b4503065e9005b0c5a5dea5017ab8105bdb4ed67cef515dead9d761e9d96d24b1ded4d46c02e9a60d24309e811d37274eff WHIRLPOOL c80424cb74dd3ac3caf8c4340e5e7886a8bcb2a9ff8f5cb4d8a35d07e18caac597f4cf75f0bdaa6c504f09f7610aef8da4b2eb94c857e0b126552acc6b5e1ae7
-DIST phpMyAdmin-4.2.2-all-languages.tar.xz 5156760 SHA256 a3fcf51ada5ef03b0dbf7978deebaca7add773fcdc15afc9f87bb98a43d91e69 SHA512 93190b9d94465660b397ac2b7353179e1518c7b4093323e5a2b31904725bb8652dba41fbe541c7f2e98c043d05f1cedc7b315787bb054a8b78e460150daee461 WHIRLPOOL 36fbb6df88e05a9417175dd6116beb7b50f842f315101c56a7d58e0024a0df1ef2ce55d4de782cad0ed70aa1624648e37da9ba598c90eb07c5449bf18fd86ca4
+DIST phpMyAdmin-4.2.7-all-languages.tar.xz 5137872 SHA256 5d101dd88a99a869bc0c684a7f687cf290abc4bf306daac73337cbde2d7743e4 SHA512 e596b075c404d8bbc6c0b18fe4c588638c8b1b5fe2644d3d825a5c83ac67a21993f72031d6e08d4f7e7911fcc4f17950cd3ff08a95ee687a8e90cbf3479ea2d4 WHIRLPOOL 600e58872f0d379c6c6f67b0930a87142fd3afd9a2e2a67670be92c461da95a4480a7d36e9d02ba49884e150b2d5ddbd8ada88b429ad20101d091d99ac167c86
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.1.ebuild
similarity index 96%
rename from dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.0.10.1.ebuild
index 6d4107e9fa20..63a449331a10 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.4.ebuild,v 1.1 2014/01/14 01:41:12 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.10.1.ebuild,v 1.1 2014/08/14 12:34:29 jmbsvicetto Exp $
 
 EAPI="4"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild
deleted file mode 100644
index 04f213c7d0f0..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.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/dev-db/phpmyadmin/phpmyadmin-4.0.5.ebuild,v 1.8 2013/08/24 12:35:25 ago Exp $
-
-EAPI="4"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild
deleted file mode 100644
index 964b8dfe2dc1..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.6.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/dev-db/phpmyadmin/phpmyadmin-4.0.6.ebuild,v 1.1 2013/09/13 06:44:58 patrick Exp $
-
-EAPI="4"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.1.8.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.1.14.2.ebuild
similarity index 96%
rename from dev-db/phpmyadmin/phpmyadmin-4.1.8.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.1.14.2.ebuild
index d5f42e08021d..1181462a5c38 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.8.ebuild,v 1.1 2014/02/23 18:01:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.2.ebuild,v 1.1 2014/08/14 12:34:29 jmbsvicetto Exp $
 
 EAPI="4"
 
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.2.7.ebuild
similarity index 96%
rename from dev-db/phpmyadmin/phpmyadmin-4.2.2.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.2.7.ebuild
index 30b6e7f19dc1..ae2967b15598 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.2.ebuild,v 1.1 2014/05/26 10:28:12 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.7.ebuild,v 1.1 2014/08/14 12:34:29 jmbsvicetto Exp $
 
 EAPI="4"
 
diff --git a/dev-db/sqlite/sqlite-3.8.5.ebuild b/dev-db/sqlite/sqlite-3.8.5.ebuild
index c9adf0f76ce5..c4035bb67491 100644
--- a/dev-db/sqlite/sqlite-3.8.5.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.5.ebuild,v 1.3 2014/08/09 09:38:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.5.ebuild,v 1.4 2014/08/14 17:25:31 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ SRC_URI="doc? ( http://sqlite.org/2014/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 
 RDEPEND="icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
diff --git a/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild b/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild
index e5b1faaaebe0..525bd89151ce 100644
--- a/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild,v 1.3 2014/07/25 09:16:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild,v 1.4 2014/08/13 15:26:42 nativemad 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="+pdf +postscript +svg"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
index 932c05e3572f..7f539c37212c 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild,v 1.1 2012/07/13 13:47:12 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild,v 1.2 2014/08/14 17:02:49 phajdan.jr Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/jcommon/jcommon-1.0.18.ebuild b/dev-java/jcommon/jcommon-1.0.18.ebuild
index f00e47852d34..bfd4e32692b8 100644
--- a/dev-java/jcommon/jcommon-1.0.18.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-1.0.18.ebuild,v 1.2 2014/08/10 20:17:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcommon/jcommon-1.0.18.ebuild,v 1.3 2014/08/14 16:52:39 phajdan.jr Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/dev-java/jsch/jsch-0.1.49.ebuild b/dev-java/jsch/jsch-0.1.49.ebuild
index f1744c9310a4..d69ea9ad0f97 100644
--- a/dev-java/jsch/jsch-0.1.49.ebuild
+++ b/dev-java/jsch/jsch-0.1.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.49.ebuild,v 1.2 2014/08/10 20:19:59 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.49.ebuild,v 1.3 2014/08/14 17:06:37 phajdan.jr Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source examples"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jcraft.com/jsch/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 RDEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/nekohtml/nekohtml-1.9.18.ebuild b/dev-java/nekohtml/nekohtml-1.9.18.ebuild
index e071ce36c010..f0bbbb98c853 100644
--- a/dev-java/nekohtml/nekohtml-1.9.18.ebuild
+++ b/dev-java/nekohtml/nekohtml-1.9.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-1.9.18.ebuild,v 1.2 2014/08/10 20:21:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-1.9.18.ebuild,v 1.3 2014/08/14 17:09:19 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 COMMON_DEP=">=dev-java/xerces-2.7"
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-lang/go/go-1.3.ebuild b/dev-lang/go/go-1.3.ebuild
index 3be07d9e9a61..921d47040bbd 100644
--- a/dev-lang/go/go-1.3.ebuild
+++ b/dev-lang/go/go-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.ebuild,v 1.4 2014/08/04 07:25:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.ebuild,v 1.5 2014/08/14 17:13:22 phajdan.jr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 	# Upstream only supports go on amd64, arm and x86 architectures.
-	KEYWORDS="-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+	KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A concurrent garbage collected and typesafe programming language"
diff --git a/dev-lang/jimtcl/files/jimtcl-0.75-bootstrap.patch b/dev-lang/jimtcl/files/jimtcl-0.75-bootstrap.patch
new file mode 100644
index 000000000000..60850e0b6d0b
--- /dev/null
+++ b/dev-lang/jimtcl/files/jimtcl-0.75-bootstrap.patch
@@ -0,0 +1,15 @@
+always do a bootstrap w/local jimsh0 to avoid requiring tcl or jimtcl
+to be installed first.  the bootstrap prog is small too.
+
+--- a/autosetup/find-tclsh
++++ b/autosetup/find-tclsh
+@@ -4,9 +4,6 @@
+ d=`dirname "$0"`
+ { "$d/jimsh0" "$d/test-tclsh"; } 2>/dev/null && exit 0
+ PATH="$PATH:$d"; export PATH
+-for tclsh in jimsh tclsh tclsh8.5 tclsh8.6; do
+-	{ $tclsh "$d/test-tclsh"; } 2>/dev/null && exit 0
+-done
+ echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
+ for cc in ${CC_FOR_BUILD:-cc} gcc; do
+ 	{ $cc -o "$d/jimsh0" "$d/jimsh0.c"; } 2>/dev/null || continue
diff --git a/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild b/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
new file mode 100644
index 000000000000..42a1209affd9
--- /dev/null
+++ b/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild,v 1.1 2014/08/14 01:45:51 vapier Exp $
+
+EAPI="5"
+
+inherit multiprocessing eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git"
+	inherit git-2
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"
+	KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86"
+fi
+
+DESCRIPTION="Small footprint implementation of Tcl programming language"
+HOMEPAGE="http://jim.tcl.tk/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="doc? ( app-text/asciidoc )
+	app-arch/unzip"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		default
+		cd "${WORKDIR}"/msteveb-jimtcl-*
+		S=${PWD}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.75-bootstrap.patch
+}
+
+src_configure() {
+	multijob_init
+	CCACHE=None multijob_child_init econf --with-jim-shared
+	if use static-libs ; then
+		# The build does not support doing both simultaneously.
+		mkdir static-libs
+		cd static-libs
+		CCACHE=None ECONF_SOURCE=${S} multijob_child_init econf
+	fi
+	multijob_finish
+}
+
+src_compile() {
+	# Must build static-libs first.
+	use static-libs && emake -C static-libs libjim.a
+	emake all
+	use doc && emake docs
+}
+
+src_install() {
+	dobin jimsh
+	use static-libs && dolib.a static-libs/libjim.a
+	ln -sf libjim.so.* libjim.so
+	dolib.so libjim.so*
+	insinto /usr/include
+	doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \
+		jim-win32compat.h jim-eventloop.h jim-config.h
+	dodoc AUTHORS README TODO
+	use doc && dohtml Tcl.html
+}
diff --git a/dev-lang/jimtcl/jimtcl-9999.ebuild b/dev-lang/jimtcl/jimtcl-9999.ebuild
index f73fa4ac23f1..fe7855a8cba1 100644
--- a/dev-lang/jimtcl/jimtcl-9999.ebuild
+++ b/dev-lang/jimtcl/jimtcl-9999.ebuild
@@ -1,44 +1,72 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild,v 1.8 2013/09/17 19:16:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild,v 1.9 2014/08/14 01:45:51 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit multilib git-2
+inherit multiprocessing eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git"
+	inherit git-2
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"
+	KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86"
+fi
 
 DESCRIPTION="Small footprint implementation of Tcl programming language"
-HOMEPAGE="http://jim.tcl.tk"
-EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git"
+HOMEPAGE="http://jim.tcl.tk/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc static-libs"
+
+RDEPEND=""
 DEPEND="doc? ( app-text/asciidoc )
 	app-arch/unzip"
 
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+	else
+		default
+		cd "${WORKDIR}"/msteveb-jimtcl-*
+		S=${PWD}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.75-bootstrap.patch
+}
+
 src_configure() {
-	! use static-libs && myconf=--with-jim-shared
-	econf ${myconf}
+	multijob_init
+	CCACHE=None multijob_child_init econf --with-jim-shared
+	if use static-libs ; then
+		# The build does not support doing both simultaneously.
+		mkdir static-libs
+		cd static-libs
+		CCACHE=None ECONF_SOURCE=${S} multijob_child_init econf
+	fi
+	multijob_finish
 }
 
 src_compile() {
+	# Must build static-libs first.
+	use static-libs && emake -C static-libs libjim.a
 	emake all
 	use doc && emake docs
 }
 
 src_install() {
 	dobin jimsh
-	use static-libs && {
-		dolib.a libjim.a
-	} || {
-		dolib.so libjim.so*
-		dosym /usr/$(get_libdir)/libjim.so* \
-			/usr/$(get_libdir)/libjim.so
-	}
+	use static-libs && dolib.a static-libs/libjim.a
+	ln -sf libjim.so.* libjim.so
+	dolib.so libjim.so*
 	insinto /usr/include
-	doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h
-	doins jim-win32compat.h jim-eventloop.h jim-config.h
+	doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \
+		jim-win32compat.h jim-eventloop.h jim-config.h
 	dodoc AUTHORS README TODO
 	use doc && dohtml Tcl.html
 }
diff --git a/dev-libs/boost/boost-1.52.0-r7.ebuild b/dev-libs/boost/boost-1.52.0-r7.ebuild
index f7a61822c078..c680b896a5a3 100644
--- a/dev-libs/boost/boost-1.52.0-r7.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r7.ebuild,v 1.8 2014/08/09 09:40:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r7.ebuild,v 1.10 2014/08/14 09:07:39 pinkbyte Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 LICENSE="Boost-1.0"
 MAJOR_V="$(get_version_component_range 1-2)"
 SLOT="0/${MAJOR_V}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc icu +nls mpi python static-libs +threads tools"
 
 RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
diff --git a/dev-libs/boost/boost-1.53.0-r1.ebuild b/dev-libs/boost/boost-1.53.0-r1.ebuild
index fd24c88da212..a27a7b4e14f4 100644
--- a/dev-libs/boost/boost-1.53.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.53.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0-r1.ebuild,v 1.5 2014/07/29 13:32:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0-r1.ebuild,v 1.6 2014/08/14 08:44:41 pinkbyte Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
diff --git a/dev-libs/boost/boost-1.54.0-r1.ebuild b/dev-libs/boost/boost-1.54.0-r1.ebuild
index f213e98a7610..9601604f817c 100644
--- a/dev-libs/boost/boost-1.54.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.54.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0-r1.ebuild,v 1.5 2014/07/29 13:32:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0-r1.ebuild,v 1.6 2014/08/14 08:44:41 pinkbyte Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
diff --git a/dev-libs/boost/boost-1.55.0-r1.ebuild b/dev-libs/boost/boost-1.55.0-r1.ebuild
index 310eac1b49ce..36999368ff94 100644
--- a/dev-libs/boost/boost-1.55.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.55.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.7 2014/07/29 13:32:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.8 2014/08/14 08:44:41 pinkbyte Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
diff --git a/dev-libs/boost/boost-1.55.0-r2.ebuild b/dev-libs/boost/boost-1.55.0-r2.ebuild
index 7161b187b308..2f7983375076 100644
--- a/dev-libs/boost/boost-1.55.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.55.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r2.ebuild,v 1.1 2014/08/12 10:09:35 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r2.ebuild,v 1.3 2014/08/14 08:52:11 pinkbyte Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
+inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
 
 MY_P="${PN}_$(replace_all_version_separators _)"
 MAJOR_V="$(get_version_component_range 1-2)"
@@ -20,7 +20,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
 
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
 	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
 	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
 	python? ( ${PYTHON_DEPS} )
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
index d37185059d04..6f5b86c35258 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild,v 1.8 2014/08/10 17:26:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild,v 1.9 2014/08/13 15:23:37 maekke Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/11" # subslot = soname major version
-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libuv/libuv-0.11.25-r1.ebuild b/dev-libs/libuv/libuv-0.11.25-r1.ebuild
index 2019b215aa29..70771c82558f 100644
--- a/dev-libs/libuv/libuv-0.11.25-r1.ebuild
+++ b/dev-libs/libuv/libuv-0.11.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-0.11.25-r1.ebuild,v 1.1 2014/05/23 17:47:51 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libuv/libuv-0.11.25-r1.ebuild,v 1.2 2014/08/14 16:39:15 phajdan.jr Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/joyent/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="virtual/pkgconfig"
diff --git a/dev-libs/newt/newt-0.52.15.ebuild b/dev-libs/newt/newt-0.52.15.ebuild
index 88468539c98c..c71440ca485f 100644
--- a/dev-libs/newt/newt-0.52.15.ebuild
+++ b/dev-libs/newt/newt-0.52.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.15.ebuild,v 1.10 2014/07/31 09:01:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.15.ebuild,v 1.11 2014/08/14 16:51:44 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="gpm tcl nls"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/openssl/openssl-0.9.8z_p2.ebuild b/dev-libs/openssl/openssl-0.9.8z_p2.ebuild
index e361bb9c0695..e1187f829e9d 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p2.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p2.ebuild,v 1.4 2014/08/11 04:26:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p2.ebuild,v 1.6 2014/08/13 20:53:07 mgorny Exp $
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos sse2 test zlib"
 
 RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
@@ -63,6 +63,16 @@ src_prepare() {
 		-e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \
 		Configure || die
 
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
 	chmod a+rx gentoo.config
diff --git a/dev-libs/openssl/openssl-1.0.1i.ebuild b/dev-libs/openssl/openssl-1.0.1i.ebuild
index cb2e3085cce3..21caafcf558a 100644
--- a/dev-libs/openssl/openssl-1.0.1i.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1i.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1i.ebuild,v 1.6 2014/08/11 04:26:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1i.ebuild,v 1.8 2014/08/13 20:53:07 mgorny Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
 
 # The blocks are temporary just to make sure people upgrade to a
@@ -81,6 +81,16 @@ src_prepare() {
 	# show the actual commands in the log
 	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
 
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
 	chmod a+rx gentoo.config
diff --git a/dev-libs/openssl/openssl-1.0.2_beta2.ebuild b/dev-libs/openssl/openssl-1.0.2_beta2.ebuild
index 313c2c443bbb..b5a15c73b3c3 100644
--- a/dev-libs/openssl/openssl-1.0.2_beta2.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta2.ebuild,v 1.1 2014/07/23 05:26:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta2.ebuild,v 1.2 2014/08/13 20:53:07 mgorny Exp $
 
 EAPI="4"
 
@@ -80,6 +80,16 @@ src_prepare() {
 	# show the actual commands in the log
 	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
 
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
 	# allow openssl to be cross-compiled
 	cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
 	chmod a+rx gentoo.config
diff --git a/dev-libs/protobuf-c/protobuf-c-0.15.ebuild b/dev-libs/protobuf-c/protobuf-c-0.15.ebuild
index e8cb2daa3950..86a56ad8f16e 100644
--- a/dev-libs/protobuf-c/protobuf-c-0.15.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf-c/protobuf-c-0.15.ebuild,v 1.4 2014/06/24 19:22:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf-c/protobuf-c-0.15.ebuild,v 1.5 2014/08/13 17:37:58 blueness Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://protobuf-c.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/protobuf"
diff --git a/dev-libs/protobuf/protobuf-2.4.0a.ebuild b/dev-libs/protobuf/protobuf-2.4.0a.ebuild
index 1d68fd0ea88b..0c0aac126928 100644
--- a/dev-libs/protobuf/protobuf-2.4.0a.ebuild
+++ b/dev-libs/protobuf/protobuf-2.4.0a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.0a.ebuild,v 1.9 2013/04/02 18:19:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.0a.ebuild,v 1.10 2014/08/14 00:03:40 jer Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 -hppa ppc ppc64 x86 ~x64-macos"
 IUSE="emacs examples java python static-libs vim-syntax"
 
 DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
diff --git a/dev-libs/protobuf/protobuf-2.4.1.ebuild b/dev-libs/protobuf/protobuf-2.4.1.ebuild
index 3d779602a599..4eea1dcfba99 100644
--- a/dev-libs/protobuf/protobuf-2.4.1.ebuild
+++ b/dev-libs/protobuf/protobuf-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.1.ebuild,v 1.12 2013/07/23 20:00:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.1.ebuild,v 1.13 2014/08/14 00:03:40 jer Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm -hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples java python static-libs vim-syntax"
 
 DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
diff --git a/dev-libs/protobuf/protobuf-2.5.0.ebuild b/dev-libs/protobuf/protobuf-2.5.0.ebuild
index b33246eaef79..5c80f2dd5bd2 100644
--- a/dev-libs/protobuf/protobuf-2.5.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.12 2014/03/06 10:56:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.13 2014/08/14 00:03:40 jer Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="source"
@@ -15,7 +15,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 ~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/wayland/wayland-1.4.0.ebuild b/dev-libs/wayland/wayland-1.4.0.ebuild
index 8e478eedae15..b9a06077da09 100644
--- a/dev-libs/wayland/wayland-1.4.0.ebuild
+++ b/dev-libs/wayland/wayland-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.4.0.ebuild,v 1.13 2014/06/18 19:18:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.4.0.ebuild,v 1.14 2014/08/13 17:16:56 armin76 Exp $
 
 EAPI=5
 
@@ -18,10 +18,10 @@ HOMEPAGE="http://wayland.freedesktop.org/"
 
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 else
 	SRC_URI="http://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/wayland-1.5.0.ebuild b/dev-libs/wayland/wayland-1.5.0.ebuild
index 64e500552e05..1851a525baca 100644
--- a/dev-libs/wayland/wayland-1.5.0.ebuild
+++ b/dev-libs/wayland/wayland-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.5.0.ebuild,v 1.2 2014/06/18 19:18:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wayland/wayland-1.5.0.ebuild,v 1.3 2014/08/13 17:16:56 armin76 Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
diff --git a/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.80.0.ebuild b/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.80.0.ebuild
index 6b5bbcae3d0d..342918445f1a 100644
--- a/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.80.0.ebuild
+++ b/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.80.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.80.0.ebuild,v 1.1 2013/11/02 17:06:43 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Linux-DesktopFiles/Linux-DesktopFiles-0.80.0.ebuild,v 1.2 2014/08/14 16:18:16 phajdan.jr Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl module to get and parse the Linux .desktop files"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.14.0[gdbm]"
diff --git a/dev-perl/Math-ModInt/Manifest b/dev-perl/Math-ModInt/Manifest
new file mode 100644
index 000000000000..67d872af6c08
--- /dev/null
+++ b/dev-perl/Math-ModInt/Manifest
@@ -0,0 +1 @@
+DIST Math-ModInt-0.007.tar.gz 37509 SHA256 961744ac23539c04e29e245ce5e2f1abdd4354b9afc6833c4f4893aa412115dd SHA512 84789d48b55e130541e6564ccde95f45da3d8553da7c5cef073d1068910a72d33da1ac2ce3dc22a8cff868dfee62f35416a44bee5773be74eccccce96548b8e5 WHIRLPOOL e7481c54207755f1657a5adaf39b77e4eabea30414d80b5b13f1d7901cd11617043ba13ff21944052c0441df97d0b629da725754cdada7a1c4a4f77df8a4fea6
diff --git a/dev-perl/Math-ModInt/Math-ModInt-0.7.0.ebuild b/dev-perl/Math-ModInt/Math-ModInt-0.7.0.ebuild
new file mode 100644
index 000000000000..a96274cf3620
--- /dev/null
+++ b/dev-perl/Math-ModInt/Math-ModInt-0.7.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Math-ModInt/Math-ModInt-0.7.0.ebuild,v 1.1 2014/08/13 14:43:26 chainsaw Exp $
+
+EAPI=5
+
+MODULE_AUTHOR="MHASCH"
+MODULE_VERSION="0.007"
+
+inherit perl-module
+
+DESCRIPTION="modular integer arithmetic"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-perl/Math-BigInt-GMP
+	dev-lang/perl"
diff --git a/dev-perl/Math-ModInt/metadata.xml b/dev-perl/Math-ModInt/metadata.xml
new file mode 100644
index 000000000000..a78853c5113b
--- /dev/null
+++ b/dev-perl/Math-ModInt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>perl</herd>
+  <upstream>
+    <remote-id type="cpan">Math-ModInt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
similarity index 76%
rename from dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
rename to dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
index 82068eeff67f..c2e877c3427f 100644
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild
+++ b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r3.ebuild,v 1.2 2014/06/12 07:30:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild,v 1.2 2014/08/14 15:04:37 zlogene Exp $
+
+EAPI=5
 
 inherit perl-module eutils prefix
+
 DESCRIPTION="Portage abstraction layer for perl"
 HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
 SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
@@ -17,13 +20,12 @@ DEPEND="dev-lang/perl
 	virtual/perl-Term-ANSIColor
 	dev-perl/Shell-EnvImporter
 	!minimal? ( dev-perl/IO-Socket-SSL
-				virtual/perl-Sys-Syslog )"
+		    virtual/perl-Sys-Syslog )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch
 	epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch
+
 	eprefixify \
 		lib/PortageXS/Core.pm \
 		lib/PortageXS.pm \
@@ -31,19 +33,19 @@ src_unpack() {
 		usr/sbin/portagexsd
 
 	if use minimal ; then
-		rm -r "${S}"/usr
-		rm -r "${S}"/etc/init.d
-		rm -r "${S}"/etc/pxs/certs
-		rm "${S}"/etc/pxs/portagexsd.conf
-		rm -r "${S}"/lib/PortageXS/examples
+		rm -r "${S}"/usr || die
+		rm -r "${S}"/etc/init.d || die
+		rm -r "${S}"/etc/pxs/certs || die
+		rm "${S}"/etc/pxs/portagexsd.conf || die
+		rm -r "${S}"/lib/PortageXS/examples || die
 	fi
 }
 
 pkg_preinst() {
 	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}"
+		cp -r "${S}"/usr "${D}${EPREFIX}" || die
 	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}"
+	cp -r "${S}"/etc "${D}${EPREFIX}" || die
 }
 
 pkg_postinst() {
diff --git a/dev-python/argh/argh-0.25.0.ebuild b/dev-python/argh/argh-0.25.0.ebuild
index 16391d2b9808..c746dfa5f252 100644
--- a/dev-python/argh/argh-0.25.0.ebuild
+++ b/dev-python/argh/argh-0.25.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.25.0.ebuild,v 1.2 2014/07/16 07:38:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.25.0.ebuild,v 1.3 2014/08/14 16:32:46 phajdan.jr 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/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild
index a8c73549e0f7..a88d90e8a701 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild,v 1.6 2014/03/31 20:26:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.4.0.2.ebuild,v 1.7 2014/08/13 18:23:26 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index 84ab7435b399..2e1376acd66d 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/backports/backports-1.0.ebuild,v 1.5 2014/03/31 20:24:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/backports/backports-1.0.ebuild,v 1.6 2014/08/13 18:22:48 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -13,6 +13,6 @@ SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/cffi/cffi-0.8.1.ebuild b/dev-python/cffi/cffi-0.8.1.ebuild
index 9273ef32e9d9..f67e5eea5ed1 100644
--- a/dev-python/cffi/cffi-0.8.1.ebuild
+++ b/dev-python/cffi/cffi-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.1.ebuild,v 1.13 2014/08/10 21:08:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.1.ebuild,v 1.14 2014/08/13 17:19:08 blueness Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="virtual/libffi
diff --git a/dev-python/cffi/cffi-0.8.2.ebuild b/dev-python/cffi/cffi-0.8.2.ebuild
index 4d22cc3cc54f..0681e6781972 100644
--- a/dev-python/cffi/cffi-0.8.2.ebuild
+++ b/dev-python/cffi/cffi-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.2.ebuild,v 1.9 2014/08/10 21:08:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.2.ebuild,v 1.10 2014/08/13 17:19:08 blueness Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="virtual/libffi
diff --git a/dev-python/cffi/cffi-0.8.6.ebuild b/dev-python/cffi/cffi-0.8.6.ebuild
index e501e0c1b532..50d64fcc34c6 100644
--- a/dev-python/cffi/cffi-0.8.6.ebuild
+++ b/dev-python/cffi/cffi-0.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.6.ebuild,v 1.2 2014/08/10 21:08:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cffi/cffi-0.8.6.ebuild,v 1.3 2014/08/13 17:19:08 blueness Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="virtual/libffi
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.3.ebuild
index e51a6a042adb..26e345a7e61d 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.3.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.3.ebuild,v 1.5 2014/06/27 02:47:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.3.ebuild,v 1.6 2014/08/13 17:21:42 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.4.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.4.ebuild
index 615c3d9af03f..70f576def29d 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.4.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.4.ebuild,v 1.5 2014/06/27 02:47:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.4.ebuild,v 1.6 2014/08/13 17:21:42 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.5.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.5.1.ebuild
index f31b1ada1635..b1c312ba9bcc 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.5.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.5.1.ebuild,v 1.1 2014/07/08 03:13:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.5.1.ebuild,v 1.2 2014/08/13 17:21:42 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.5.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.5.2.ebuild
index 6abc72bcecd5..8e9d959c4ac7 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.5.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.5.2.ebuild,v 1.1 2014/07/10 23:54:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.5.2.ebuild,v 1.2 2014/08/13 17:21:42 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-0.5.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-0.5.3.ebuild
index 17feac4c6e3f..555832454e33 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-0.5.3.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.5.3.ebuild,v 1.1 2014/08/08 17:04:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography-vectors/cryptography-vectors-0.5.3.ebuild,v 1.2 2014/08/13 17:21:42 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cryptography/cryptography-0.4-r1.ebuild b/dev-python/cryptography/cryptography-0.4-r1.ebuild
index 9fa64d8033f1..7d7ecca7dc2d 100644
--- a/dev-python/cryptography/cryptography-0.4-r1.ebuild
+++ b/dev-python/cryptography/cryptography-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.4-r1.ebuild,v 1.4 2014/07/03 13:42:57 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.4-r1.ebuild,v 1.5 2014/08/13 17:26:55 blueness 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="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-libs/openssl:0
diff --git a/dev-python/cryptography/cryptography-0.4-r2.ebuild b/dev-python/cryptography/cryptography-0.4-r2.ebuild
index 94808bb1c232..8723939f3f27 100644
--- a/dev-python/cryptography/cryptography-0.4-r2.ebuild
+++ b/dev-python/cryptography/cryptography-0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.4-r2.ebuild,v 1.2 2014/07/03 13:42:57 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.4-r2.ebuild,v 1.3 2014/08/13 17:26:54 blueness 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="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-libs/openssl:0
diff --git a/dev-python/cryptography/cryptography-0.5.1.ebuild b/dev-python/cryptography/cryptography-0.5.1.ebuild
index 69944c65256c..48002eea8d2b 100644
--- a/dev-python/cryptography/cryptography-0.5.1.ebuild
+++ b/dev-python/cryptography/cryptography-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.5.1.ebuild,v 1.1 2014/07/08 03:23:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.5.1.ebuild,v 1.2 2014/08/13 17:26:54 blueness 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="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-libs/openssl:0
diff --git a/dev-python/cryptography/cryptography-0.5.2.ebuild b/dev-python/cryptography/cryptography-0.5.2.ebuild
index f732f5dd0632..f171c16d4efe 100644
--- a/dev-python/cryptography/cryptography-0.5.2.ebuild
+++ b/dev-python/cryptography/cryptography-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.5.2.ebuild,v 1.1 2014/07/11 00:04:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.5.2.ebuild,v 1.2 2014/08/13 17:26:54 blueness 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="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-libs/openssl:0
diff --git a/dev-python/cryptography/cryptography-0.5.3.ebuild b/dev-python/cryptography/cryptography-0.5.3.ebuild
index 97996a2e4542..d9038c9aa86e 100644
--- a/dev-python/cryptography/cryptography-0.5.3.ebuild
+++ b/dev-python/cryptography/cryptography-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.5.3.ebuild,v 1.1 2014/08/08 17:25:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.5.3.ebuild,v 1.2 2014/08/13 17:26:55 blueness 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="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="dev-libs/openssl:0
diff --git a/dev-python/foolscap/foolscap-0.6.4-r1.ebuild b/dev-python/foolscap/foolscap-0.6.4-r1.ebuild
index e21c9b8df713..1b2d0d63f0ec 100644
--- a/dev-python/foolscap/foolscap-0.6.4-r1.ebuild
+++ b/dev-python/foolscap/foolscap-0.6.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.4-r1.ebuild,v 1.1 2013/08/25 21:07:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.4-r1.ebuild,v 1.2 2014/08/14 16:38:20 phajdan.jr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
 RDEPEND=">=dev-python/twisted-core-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/html5lib/html5lib-0.95-r1.ebuild b/dev-python/html5lib/html5lib-0.95-r1.ebuild
index 716dc5cd98f5..244caae19dc7 100644
--- a/dev-python/html5lib/html5lib-0.95-r1.ebuild
+++ b/dev-python/html5lib/html5lib-0.95-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.95-r1.ebuild,v 1.11 2014/08/01 10:04:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.95-r1.ebuild,v 1.12 2014/08/13 17:43:24 blueness Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 # unittest2 used by our python_test()
diff --git a/dev-python/html5lib/html5lib-0.999.ebuild b/dev-python/html5lib/html5lib-0.999.ebuild
index 595d18e552a5..39e94ba568dd 100644
--- a/dev-python/html5lib/html5lib-0.999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.999.ebuild,v 1.5 2014/08/01 10:04:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.999.ebuild,v 1.6 2014/08/13 17:43:24 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index 55090c78d770..101e7e8a8ee5 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.10.ebuild,v 1.8 2014/06/08 12:10:41 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.10.ebuild,v 1.9 2014/08/13 17:24:03 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/iso8601-0.1.4-r1.ebuild b/dev-python/iso8601/iso8601-0.1.4-r1.ebuild
index 85416cd91ddc..18551f6179f0 100644
--- a/dev-python/iso8601/iso8601-0.1.4-r1.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.4-r1.ebuild,v 1.5 2014/06/08 12:10:41 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.4-r1.ebuild,v 1.6 2014/08/13 17:24:03 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/iso8601-0.1.4.ebuild b/dev-python/iso8601/iso8601-0.1.4.ebuild
index 2105064a52c5..7673baa34937 100644
--- a/dev-python/iso8601/iso8601-0.1.4.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.4.ebuild,v 1.3 2014/06/08 12:10:41 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.4.ebuild,v 1.4 2014/08/13 17:24:03 blueness Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/iso8601/iso8601-0.1.8.ebuild b/dev-python/iso8601/iso8601-0.1.8.ebuild
index 0255adac485c..5ed60ec97585 100644
--- a/dev-python/iso8601/iso8601-0.1.8.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.8.ebuild,v 1.7 2014/06/08 12:10:41 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iso8601/iso8601-0.1.8.ebuild,v 1.8 2014/08/13 17:24:03 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nevow/nevow-0.11.1.ebuild b/dev-python/nevow/nevow-0.11.1.ebuild
index c360f33516f6..6ae1dea0527a 100644
--- a/dev-python/nevow/nevow-0.11.1.ebuild
+++ b/dev-python/nevow/nevow-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.11.1.ebuild,v 1.2 2014/08/10 21:14:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.11.1.ebuild,v 1.3 2014/08/14 16:36:59 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild
index 032cd5af995e..9759b430be2e 100644
--- a/dev-python/numpy/numpy-1.8.1.ebuild
+++ b/dev-python/numpy/numpy-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.1.ebuild,v 1.1 2014/04/08 23:33:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.8.1.ebuild,v 1.2 2014/08/14 06:23:42 jlec Exp $
 
 EAPI=5
 
@@ -134,13 +134,12 @@ python_install_all() {
 
 	dodoc COMPATIBILITY DEV_README.txt THANKS.txt
 
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt
-	doman numpy/f2py/f2py.1
-
 	if use doc; then
 		dohtml -r "${WORKDIR}"/html/*
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+		dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
 	fi
+
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt
+	doman numpy/f2py/f2py.1
 }
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 8e39391f8c7d..3f6adb2c1fcd 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,3 +2,4 @@ DIST pandas-0.12.0.tar.gz 3155059 SHA256 be9b4c3611801b366873531bc87a87dd16b19e7
 DIST pandas-0.13.0.tar.gz 3604253 SHA256 5bb3f7a5f24fe8280e84e5407dc129364e7825cbe366b79676bd5f37a9b2bf0e SHA512 c5e2673f9a3b1e28d038bf3e5911445c8e77f4669eb5df5849062b41c96f93b6f09fa87421ae7382ba50f53c9ac0cf9564bbff5b300f097bf929fca366a500a6 WHIRLPOOL 91257ed915f7ead4d68e0ebf360f326e4e32e8de51c79c315902f297e3c05bd3a525861e6f575419c6c6eb141ecbb0228e6886c02be49a565324b319b0a65fd0
 DIST pandas-0.13.1.tar.gz 6096890 SHA256 6813746caa796550969ed98069f16627f070f6d8d60686cfb3fa0e66c2e0312b SHA512 a5fc36141f1b9269ce69ea35f8308abea3e6a77e54fe5df3d3614f1b9ea79f1c4b1c07da1b78d5d26f7ccf238a7c569a978caaa411217c290f7a1870e878e1f2 WHIRLPOOL a091570987c55190fe3650443392b4858938e7a77145a25859f2f9e479d1701876fa06a75610ef2771543cf8574ae992793c9377b6a246cab371edbd16a5eb40
 DIST pandas-0.14.0.tar.gz 6526846 SHA256 f7997debca756c4dd5ccdf5a010dfe3d1c7dac98ee706b715d994cf7c9d35528 SHA512 905782956e6aa1bc15c8dd407d2cb731b8bdeb38e4e85d149d1ba665b88c47ff38566b19e382a83a17ef5d09a19a627d77b9afdd96dc0c0abda62ad9152b4083 WHIRLPOOL 9e8bb971cef93fd15faba7a2a4f032f266849d5f1e7d2a8f0233b73cf26c97fa78044de8617ea54b3d991591758c57bec2cb2a913b7d7735d858c420fe6bef65
+DIST pandas-0.14.1.tar.gz 6713272 SHA256 8d36f69e63f4c36999d142d60e476a6359c77069ad0ed1e4aa16a7005884dd21 SHA512 9447aff4004cef215914cc8ce448dbffff9c6442e4895f217b240d3cddc709d0c4f3c2d43b145eb3cbf48a0492ddefc4647c44304987e205b2a2aef081a247a8 WHIRLPOOL 7091c3e1861af787710cd4afa7c74499f28082fff6382201f9706d8d36c6af81730c3f5364ee22810fb8509c60357be0cf17480e35150163f32f858b9431dd25
diff --git a/dev-python/pandas/pandas-0.14.0.ebuild b/dev-python/pandas/pandas-0.14.0.ebuild
index a9dccbe83361..935840ab6e05 100644
--- a/dev-python/pandas/pandas-0.14.0.ebuild
+++ b/dev-python/pandas/pandas-0.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.14.0.ebuild,v 1.3 2014/06/25 11:27:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.14.0.ebuild,v 1.4 2014/08/14 15:30:09 idella4 Exp $
 
 EAPI=5
 
@@ -33,6 +33,7 @@ DEPEND="${CDEPEND}
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		<dev-python/openpyxl-2.0[${PYTHON_USEDEP}]
 		dev-python/pytables[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/rpy[$(python_gen_usedep 'python2_7')]
diff --git a/dev-python/pandas/pandas-0.14.1.ebuild b/dev-python/pandas/pandas-0.14.1.ebuild
new file mode 100644
index 000000000000..4813e970f012
--- /dev/null
+++ b/dev-python/pandas/pandas-0.14.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.14.1.ebuild,v 1.1 2014/08/14 15:30:09 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1 virtualx flag-o-matic
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.sourceforge.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples excel html test R"
+
+REQUIRED_USE="
+	excel? ( !python_targets_python3_2 )
+	doc? ( !python_targets_python3_2 )
+	R? ( !python_targets_python3_2 )"
+
+CDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	doc? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		<dev-python/openpyxl-2.0[${PYTHON_USEDEP}]
+		dev-python/pytables[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[$(python_gen_usedep 'python2_7')]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+		sci-libs/scikits_timeseries[$(python_gen_usedep 'python2_7')]
+		x11-misc/xclip
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${CDEPEND}
+	dev-python/numexpr[${PYTHON_USEDEP}]
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	excel? (
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+		dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+	)
+	html? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		|| (
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}] )
+	)
+	R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )"
+
+python_prepare_all() {
+	if use doc; then
+		# Prevent un-needed download during build
+		sed -e "/^              'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
+	fi
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		local CXXFLAGS=${CXXFLAGS}
+		export CFLAGS
+		export CXXFLAGS
+		append-cflags -fno-strict-aliasing
+		append-cxxflags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+src_test() {
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+		VIRTUALX_COMMAND="nosetests --verbosity=3 pandas" \
+		virtualmake || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r "${BUILD_DIR}"/lib/doc/build/html/
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pathlib/pathlib-1.0.ebuild b/dev-python/pathlib/pathlib-1.0.ebuild
index a54f20cac406..1381230d315d 100644
--- a/dev-python/pathlib/pathlib-1.0.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pathlib/pathlib-1.0.ebuild,v 1.1 2014/03/30 19:42:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pathlib/pathlib-1.0.ebuild,v 1.2 2014/08/14 16:24:01 phajdan.jr 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/pathtools/pathtools-0.1.2.ebuild b/dev-python/pathtools/pathtools-0.1.2.ebuild
index b52c5bd4f447..3d8414dd3f53 100644
--- a/dev-python/pathtools/pathtools-0.1.2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pathtools/pathtools-0.1.2.ebuild,v 1.2 2014/06/21 22:52:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pathtools/pathtools-0.1.2.ebuild,v 1.3 2014/08/14 16:31:20 phajdan.jr Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pdfrw/pdfrw-0.1.ebuild b/dev-python/pdfrw/pdfrw-0.1.ebuild
index e2c89968ab5e..0c11a501abf2 100644
--- a/dev-python/pdfrw/pdfrw-0.1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pdfrw/pdfrw-0.1.ebuild,v 1.5 2014/08/03 18:24:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pdfrw/pdfrw-0.1.ebuild,v 1.6 2014/08/13 18:37:53 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
diff --git a/dev-python/pmw/pmw-1.3.3-r2.ebuild b/dev-python/pmw/pmw-1.3.3-r2.ebuild
index 132fef327e60..70e794e212e3 100644
--- a/dev-python/pmw/pmw-1.3.3-r2.ebuild
+++ b/dev-python/pmw/pmw-1.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.3.3-r2.ebuild,v 1.2 2014/05/27 20:01:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.3.3-r2.ebuild,v 1.3 2014/08/13 14:30:49 nativemad Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="py2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples"
 
 DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/polygon/Manifest b/dev-python/polygon/Manifest
index 714379287703..db1df5af7fe2 100644
--- a/dev-python/polygon/Manifest
+++ b/dev-python/polygon/Manifest
@@ -1,4 +1,4 @@
 DIST Polygon-2.0.4.zip 73544 SHA256 a9a85d81cc9faabba398001b1e9d32444e98147ac6e31cbdc5ef512c4f7c43dd SHA512 1d1b6a6f601298fc2a05f2fa30ff7ed81feb3e3651f4579524a3f2bb6403ceb404ab7a41545fc742ee8be626d034fd32d5e3554fec56811b1631f8c5b8352dd5 WHIRLPOOL db6342be7594666af6d441b36c825e9c0e8aa333ad5b77c18ca64ac27367b897bd7bcae0ea83fcb748007f3331514d16acafe3101ea1404e04f530441d566d7e
 DIST Polygon-3.0.4a-src.zip 163024 SHA256 2ebef747544660a17a4aefc5a5a8429b6c64af8e0044130f98ed241b48e8fd9d SHA512 9dd743c9df139dc698a6c2f01615d32a62db63af473336f669be9510d8fd5e4676804238b630cc9540e07b73f96a67333f13e2c239e11d9a1f3a40ef28f92b03 WHIRLPOOL 5167cb0397f5da8b735fb6dcd54d385ef66c0010997e27c96fd509efe371e36731b7b00aff15a5f31c4b2948aff3f30a95d3d74bc8a2dc0ca2069c28d42e9360
 DIST Polygon2-2.0.6.zip 73551 SHA256 3e0e1a5125e892faa5964523de28c0349b573ed102547e12a1affc3fed2cac3b SHA512 d0827fe3299449842e201598b59e423bf3029302037ffb9329dae0045b2be1727eb33951dfd22f560476360836305526be58e55d9d4cff36f3d9a4b0262b7aed WHIRLPOOL 50b176f05ade1780e21f8280d884996f04df3894a8479b5d82b1410cc53961c0faedea1b20b431b0eeb2996619abf91392e4c9291856a63c8b080605f646c67b
-DIST Polygon3-3.0.6.zip 74357 SHA256 dea5b66870a9fd3031290f54f72d823c33bb8b8c21bec97c510d04df2608c637 SHA512 7e30f4c8c9b6fd6e62dcc43a9412bb19e1cb3bb14953c5ca59dab87502f4a18042bf95bdc22266f98b104d1b3acec846d18d794378302df3db1680aed53d7337 WHIRLPOOL e8b8019fab2cff621e7664d810d3a842b6a03b4918b1a59a8e441605307cc4e350d252c8b03d83efcd389e010a51a7ce2fc4c09b47b87d7cd2049e4049f4c5fd
+DIST Polygon3-3.0.7.zip 76193 SHA256 627852f50fd6002b9a59eef291bb38c075d95e67c47a8d3b32713426ee137744 SHA512 e30cd8e51ad69a2d76b61a7d92ead4ac352e729093546b965f649866fd9c6a860e3cdcd9fcd7f8cc9f8d7735ccd1128fb5af00b3de89e4efd7128e446a70b33b WHIRLPOOL 7123420e402e3cb5034ad3ffaba561a8c250e6788ee6b89ca8376ed6a037a889611afcd34f135b1ee16261e2504a22895c491d91a691e1559628673682e1dead
diff --git a/dev-python/polygon/polygon-2.0.6.ebuild b/dev-python/polygon/polygon-2.0.6.ebuild
index 1a797ea1c1f2..86965f14aa84 100644
--- a/dev-python/polygon/polygon-2.0.6.ebuild
+++ b/dev-python/polygon/polygon-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/polygon/polygon-2.0.6.ebuild,v 1.2 2014/07/06 13:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/polygon/polygon-2.0.6.ebuild,v 1.4 2014/08/14 05:23:53 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -21,9 +21,6 @@ S=${WORKDIR}/Polygon2-${PV}
 
 DOCS=( HISTORY doc/Polygon.txt )
 
-src_test() {
-	python_test() {
-		PYTHONPATH="${BUILD_DIR}/lib" ${EPYTHON} test/Test.py || die
-	}
-	python_foreach_impl python_test
+python_test() {
+	${PYTHON} test/Test.py || die "Tests failed"
 }
diff --git a/dev-python/polygon/polygon-3.0.6.ebuild b/dev-python/polygon/polygon-3.0.7.ebuild
similarity index 54%
rename from dev-python/polygon/polygon-3.0.6.ebuild
rename to dev-python/polygon/polygon-3.0.7.ebuild
index 6b63e0d51637..961b0a1c74ba 100644
--- a/dev-python/polygon/polygon-3.0.6.ebuild
+++ b/dev-python/polygon/polygon-3.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/polygon/polygon-3.0.6.ebuild,v 1.2 2014/07/06 13:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/polygon/polygon-3.0.7.ebuild,v 1.1 2014/08/14 00:08:27 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python3_{2,3,4} )
@@ -13,17 +13,28 @@ SRC_URI="https://www.bitbucket.org/jraedler/${PN}3/downloads/Polygon3-${PV}.zip"
 
 LICENSE="LGPL-2"
 SLOT="3"
+IUSE="examples"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/Polygon3-${PV}
 
-DOCS=( HISTORY doc/Polygon.txt )
+DOCS=( doc/{Polygon.txt,Polygon.pdf} )
 
-src_test() {
-	python_test() {
-		PYTHONPATH="${BUILD_DIR}/lib" ${EPYTHON} test/Test.py || die
-	}
-	python_foreach_impl python_test
+python_prepare_all() {
+	if use examples; then
+		mkdir examples || die
+		mv doc/{Examples.py,testpoly.gpf} examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} test/Test.py || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/pretend/pretend-1.0.7.ebuild b/dev-python/pretend/pretend-1.0.7.ebuild
index d9e051fad0ed..e97e8eb9e014 100644
--- a/dev-python/pretend/pretend-1.0.7.ebuild
+++ b/dev-python/pretend/pretend-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pretend/pretend-1.0.7.ebuild,v 1.8 2014/06/08 11:06:05 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pretend/pretend-1.0.7.ebuild,v 1.9 2014/08/13 17:25:59 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index 00b14be96691..1f52034217a6 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pretend/pretend-1.0.8.ebuild,v 1.4 2014/06/22 12:40:23 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pretend/pretend-1.0.8.ebuild,v 1.5 2014/08/13 17:25:59 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index cbde6e79e775..2049e17d67a7 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -8,6 +8,7 @@ DIST py-1.4.17.tar.gz 190429 SHA256 45d74855a614c73f97b0cbbe5615e5be34fa623ecf5e
 DIST py-1.4.18.tar.gz 190792 SHA256 2aa6e23a43fd8582e5ef35ce08e72d9184abea532a1e337397b0c15460f91ca2 SHA512 cc2d547b5ddad98128c32f97afec4c022069540d9c15d469e9c45a4a1a59a5bc4916da2029bea587b4d1480c0867731fd2a4e46f465988754a371b2454e7bf07 WHIRLPOOL 7a29499381bcc032098f3b284ec9f18c2b359598c7a98f6ab8a10d573579277239426df90a51103a68d09f6b7303458f82af15d422cd5d56cf8f318bda1d9833
 DIST py-1.4.20.tar.gz 185583 SHA256 23c99d99ebb2a60eb7023b7577bfc988acb0092082257a57189f100ce84b72f1 SHA512 db392bd8d52ac2bf7b4785e18aaf58564596f66f15d355ee6f6e4169f6da7847331096ac7118c758ee5ce3f1865502a45f92ca2c99f411c12ee316760ca2b212 WHIRLPOOL 536e2a9da3185c3d104e1a3da113a625f4da48af032e55e9a2922a563bc4b7cd3ee63cbf5810ede5fa98a89cf9854809585a5a8004737800373353ebfa32e11a
 DIST py-1.4.22.tar.gz 189283 SHA256 1ef0c4eb8f12f970dd831f32755f95a36af66a8ca9c35991100146428fd42474 SHA512 3cbc75257a7de345f0f23b6374a542608392d05f6600ba8ab743eea4fc46cc88ccaa829c1e2370eabb9892fbef8a16df9f5eb7956571d6f2b465a75817f70d7a WHIRLPOOL 86f46ec40bd2b080cd33eb3ac2538f1a801a2cbaa1aab65d0f95057013cd7573902521f8e2709b31a5ef1eb51de1e3c2eaf3a78755fa6a985f9e91188fbe7e37
+DIST py-1.4.23.tar.gz 189520 SHA256 ba8f2a3894caf1121799a2b239d67873a56bd0dfa24e1673d92990a8ae7370ca SHA512 1a38edb1855094a76362eff2afd370eca9ac796ee75a101bd4c3d566a8c75064a790f2032b4ea958f16836e22bea83a53ee9adbb7ca200b0ecb64677fec08515 WHIRLPOOL e46566f084329af324ab509bb23e716856cf8227954e155d2fc6b62fec5cbed0ecff26b8cb7c9744f0cbce425b9df84b1d2ecac900ba1f2536561d9c126fad23
 DIST py-1.4.5.zip 225478 SHA256 8425c7140cfc5acf5b67cfb2f2af8d835ab2f6663ee2ca3d7206c1d81e1d35ea SHA512 d82a28599d930508ffbd96e7bedb6a3655b176fc42310184c69a4befd868ea4d6c9936eb5e4e8d5d89482e6e925211f8517d767509a1ea8db072a7fba32fdcb1 WHIRLPOOL 2301988868b61c8f571aab92b73cff76a3b5470b4fb8af5fff7ab1b3721f03775032e80f6a3447147bd31662de9d5515e035b709ad949392dff4986fda4e006d
 DIST py-1.4.7.zip 227360 SHA256 b66ec2289357146be31a5a2050e1e298654da33c95a50b890bc09c764b905ff2 SHA512 091a4e0e73b3716ea91d343066eff0d05e5ae4d20c0416e63d75a4f8b243306eaec7cf8a0a740169f0db8085212a92fa4451393edf94e498d0cfd32296369e78 WHIRLPOOL 45b35cf757af0d60ed92b913fd899ce33175c31917d756a8dd1c1bd5ddf19bd30d59e9efec0192e11a44238acb64e3803fa16bb98d36651ba44cdebca435c1d5
 DIST py-1.4.8.zip 228276 SHA256 e29f881fc54919e0faecc2c44913d1c32ff6fbb7097889bc9b384ddadb4949a5 SHA512 a4221a375e2fb03ff5aa494bdaf29d361ba93d2e57671289c9e27a41c11b5dc3d4d3cae4aac84c7ca0637f44befba7a11f27afd356347c02151aa9f40d6adb32 WHIRLPOOL 32d4a88effcd79cf9fffbbab56ef6f138d008aa02f3e81ff826f665aa1e514c18e7b15df1c17d188b0f9282d00ef879f1881e16f3c038202b5aa54dfa5e17bd0
diff --git a/dev-python/py/py-1.4.23.ebuild b/dev-python/py/py-1.4.23.ebuild
new file mode 100644
index 000000000000..506a0504c2c9
--- /dev/null
+++ b/dev-python/py/py-1.4.23.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.23.ebuild,v 1.1 2014/08/14 05:00:01 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	py.test || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycparser/pycparser-2.10.ebuild b/dev-python/pycparser/pycparser-2.10.ebuild
index 24d452533b3a..84593fc8c8a4 100644
--- a/dev-python/pycparser/pycparser-2.10.ebuild
+++ b/dev-python/pycparser/pycparser-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.10.ebuild,v 1.13 2014/06/23 11:09:50 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycparser/pycparser-2.10.ebuild,v 1.14 2014/08/13 17:13:53 blueness Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
index c07d93e11e8a..cac795c0c401 100644
--- a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild,v 1.3 2013/09/05 18:47:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild,v 1.4 2014/08/14 16:36:00 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="dev-libs/crypto++"
diff --git a/dev-python/pyopenssl/pyopenssl-0.14.ebuild b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
index 3299ca1794bc..8d4f3b46298c 100644
--- a/dev-python/pyopenssl/pyopenssl-0.14.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14.ebuild,v 1.12 2014/06/23 15:26:18 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.14.ebuild,v 1.13 2014/08/13 17:28:35 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 0d68b5c60a8b..f3969971b626 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,3 +2,4 @@ DIST pytest-2.3.4.zip 527214 SHA256 5616f744a311c5f5fbb44943aaa41c32df70ba132159
 DIST pytest-2.3.5.tar.gz 426328 SHA256 804c28bef415fc6a54de7934f05b2d67a9cc8a230de98685fca274d9fcbe8b1c SHA512 4cda3149ca4b69b88c2df65d7c474506e852ee1daa9e6b1ca3dbde8b7ffe0cce09f2fb4ef696f54df7f6ce807cd472dd8447cfc32686902b2b214b18e5719060 WHIRLPOOL a2dd7c319d73e6c32077685d65785c672dbb6faa01ac4ed116520128a1b03b3a10b88e65957b736132fbc3a667b43840c28081ef4a4a8ddd2cd73f8727c778cf
 DIST pytest-2.4.2.tar.gz 553004 SHA256 bccbbed432b1e95381fbb958c27aabcb751ccc337769091de8b7e5cd25ca00e0 SHA512 2ffbc74c536fa4542b9f9afb257428cde98648c76335bdc8d3fd515fd094410fe1e71e502918d780f1d8070bebf4e4c24b33cab04d0f48ca983d907bfc43d3db WHIRLPOOL e51543a549622dfd204551f3625c62cdac84b33107e5dd493574a6f05f4ee55a830ec52ce23580733471df89450caa0d389cc77c9966186bd9d2d64e57403638
 DIST pytest-2.5.2.tar.gz 608703 SHA256 962452611799878616d6df5e7674cc2c356f902ed005dc4dae9d4e79bb8abda4 SHA512 d291f229f4c0a2132c437dde6ca04bf87701fe270c2fa314104badad9221ab866251890c66387d23fefd3ab1f928ee3b290dac21e3d62e7660af8903e85a2f36 WHIRLPOOL 47588d3a2b62f9a8f4df248b2f8b4c8b4b86365839e766bf644ea6c54d0f75c92ae139050cd6a5db080c076b9f867be48fe9c81da19db5285a382c1cda918310
+DIST pytest-2.6.1.tar.gz 627761 SHA256 994dabcb3149659d259add2aa7d11bff4d35efb7cf4c8233fa9b0b62c1255c3c SHA512 1bfbe27491800943484616a37cfe0f2f8677e3b2a25aee19f842bdf66a9c0205af8c2aecaeb50823970ab9f7042b1bb9115e3c4d689fe568a17a062c50ead829 WHIRLPOOL cae1ea28723c62b87a027e3a78ab417e99cb12d412c83131058b185cffae12a215ef07459144c30b7028e202407549db76d877cd1c9fbe6cb2e39bc5da9df421
diff --git a/dev-python/pytest/pytest-2.6.1.ebuild b/dev-python/pytest/pytest-2.6.1.ebuild
new file mode 100644
index 000000000000..1d4edc39efeb
--- /dev/null
+++ b/dev-python/pytest/pytest-2.6.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.6.1.ebuild,v 1.1 2014/08/14 07:39:48 idella4 Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+inherit distutils-r1 eutils
+
+DESCRIPTION="py.test: simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.22"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python*')
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Prevent un-needed d'loading
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir doc/en/.build || die
+		emake -C doc/en html
+	fi
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+		--ignore=doc/en/example/nonpython/test_simple.yml \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && dohtml -r doc/en/_build/html/
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rdflib/rdflib-4.0.1.ebuild b/dev-python/rdflib/rdflib-4.0.1.ebuild
index af019758ff57..f2c2b3de8d8a 100644
--- a/dev-python/rdflib/rdflib-4.0.1.ebuild
+++ b/dev-python/rdflib/rdflib-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.0.1.ebuild,v 1.4 2013/09/12 22:29:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.0.1.ebuild,v 1.5 2014/08/13 17:47:38 blueness Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/rdflib/rdflib-4.1.0.ebuild b/dev-python/rdflib/rdflib-4.1.0.ebuild
index 0582d19c527b..8792e55bfa3e 100644
--- a/dev-python/rdflib/rdflib-4.1.0.ebuild
+++ b/dev-python/rdflib/rdflib-4.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.0.ebuild,v 1.1 2014/01/14 05:37:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.0.ebuild,v 1.2 2014/08/13 17:47:38 blueness Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/rdflib/rdflib-4.1.1.ebuild b/dev-python/rdflib/rdflib-4.1.1.ebuild
index 7e61f9cce8f1..21042dcdac10 100644
--- a/dev-python/rdflib/rdflib-4.1.1.ebuild
+++ b/dev-python/rdflib/rdflib-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.1.ebuild,v 1.1 2014/04/22 09:23:00 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.1.ebuild,v 1.2 2014/08/13 17:47:38 blueness Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/rdflib/rdflib-4.1.2.ebuild b/dev-python/rdflib/rdflib-4.1.2.ebuild
index 620873d71a2a..97b25373f26e 100644
--- a/dev-python/rdflib/rdflib-4.1.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.2.ebuild,v 1.4 2014/07/29 02:40:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.1.2.ebuild,v 1.5 2014/08/13 17:47:38 blueness Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
index 433ca2168969..6f246e2a6000 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild,v 1.3 2014/08/03 18:25:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild,v 1.4 2014/08/13 18:39:18 blueness Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,7 @@ SRC_URI="http://rst2pdf.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="svg"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild
index 8fd7fad3e9ea..7674d6b7da7e 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild,v 1.1 2014/07/29 02:45:18 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild,v 1.2 2014/08/13 17:46:50 blueness Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 35778e69a68c..55a483adccf5 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -2,3 +2,4 @@ DIST sphinxcontrib-httpdomain-1.1.8.tar.gz 8844 SHA256 29ff90b9e51a8e0cee4372c8f
 DIST sphinxcontrib-httpdomain-1.1.9.tar.gz 9589 SHA256 560eec7b60872cb570dd6a4f29f8d717a2217dfec775919651e8adf0e55a585a SHA512 015ff76b7f6f6639e6b9e228209b8dc06ce435049d08cf513d40914015c17ca21df905f7d505951508e7255ce273c95700e3ae415f54afdebc8ef03fd3707283 WHIRLPOOL 49049c807163ff1496dd777ba4dd439d49dd6ffbdeb1a4fd45d70d8a6167928b342429d03e7b023f192e2580e79b05b9b3de1ad3f58c82fe6f870315415238d6
 DIST sphinxcontrib-httpdomain-1.2.0.tar.gz 10054 SHA256 015e2e4327278a5903a4c060a19bfae821df2d33179c960a301c5383523a4c62 SHA512 d8c2158c81e0b0691c99176dc50d217e69b564d55e72e2878847e032dc60a4097d767bfb717f2425c2e5d37f9462cb95e15b1072b6dbb5191b9f402bc4981fe1 WHIRLPOOL 0c2482047b038f0a14b4b999ce3d24e932d3e7372af17a65fd1bb3a977acaf5a265e5df649eb06765919191181145e6bea69d03cf6b6f4b94fb5364d281b1c1a
 DIST sphinxcontrib-httpdomain-1.2.1.tar.gz 10061 SHA256 68b7cca5910309dcf89b1d7fc978f2bb64c7b7e45e5b67438defed7356d96562 SHA512 0e6605e12312468ebd8d8173ac58e6ceae8823d06c9db13ee6857c9e436f8ddb14241304f1c0632cf15e616eab574107b00c79da9179e530aec099b573ad581e WHIRLPOOL a9f6d8c1a6bda6b97204855fc9809ce3658811dec981b2f7e0c3cb1e95c5a24d83ceca72374a0caa699646fee6a041da2ea77e14a075f8fc52aef0b5fb1971f9
+DIST sphinxcontrib-httpdomain-1.3.0.tar.gz 11486 SHA256 ba8fbe82eddc96cfa9d7b975b0422801a14ace9d7e051b8b2c725b92ea6137b5 SHA512 2f6df6375337d651f4ed26c2aaf20929a4b31fae881ebc68fcab5cd085f52661c00a943872a9e7199d5af893b3f77434346fd493925cd148681da048aead20af WHIRLPOOL 52539d525114a2fc1b0f288cea82918724d7c4ad7af22c27efda3dcdae10ba9f800933ea163f840b12bc78413f06f0ca9bec361e0fb2da8c9430f413b1f89f7a
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild
new file mode 100644
index 000000000000..f6af083596de
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.ebuild,v 1.1 2014/08/14 09:32:39 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
+HOMEPAGE="http://bitbucket.org/birkenfeld/sphinx-contrib/ \
+	http://packages.python.org/sphinxcontrib-httpdomain/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/watchdog/watchdog-0.8.0.ebuild b/dev-python/watchdog/watchdog-0.8.0.ebuild
index ed7054cdeabe..a9b7cbeeefa1 100644
--- a/dev-python/watchdog/watchdog-0.8.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/watchdog/watchdog-0.8.0.ebuild,v 1.1 2014/07/06 11:29:08 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/watchdog/watchdog-0.8.0.ebuild,v 1.2 2014/08/14 16:32:05 phajdan.jr Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/zbase32/zbase32-1.1.5.ebuild b/dev-python/zbase32/zbase32-1.1.5.ebuild
index 5aa8d1f6d3ad..aae17c2f5642 100644
--- a/dev-python/zbase32/zbase32-1.1.5.ebuild
+++ b/dev-python/zbase32/zbase32-1.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zbase32/zbase32-1.1.5.ebuild,v 1.1 2013/08/01 01:40:51 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zbase32/zbase32-1.1.5.ebuild,v 1.2 2014/08/14 16:34:29 phajdan.jr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/z/zbase32/zbase32-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pyutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/zfec/zfec-1.4.24.ebuild b/dev-python/zfec/zfec-1.4.24.ebuild
index 3a567bb45c3b..4126f1920a89 100644
--- a/dev-python/zfec/zfec-1.4.24.ebuild
+++ b/dev-python/zfec/zfec-1.4.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zfec/zfec-1.4.24.ebuild,v 1.3 2014/07/06 12:51:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zfec/zfec-1.4.24.ebuild,v 1.4 2014/08/14 16:35:13 phajdan.jr Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/z/zfec/zfec-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 COMMON_DEPEND=""
diff --git a/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild b/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild
index 692b53b76a4e..d3cd6f8e86bb 100644
--- a/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild
+++ b/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild,v 1.1 2014/08/02 02:38:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild,v 1.2 2014/08/13 18:50:51 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -16,6 +16,6 @@ DESCRIPTION="Ruby library that pretty prints Ruby objects in full color with pro
 HOMEPAGE="http://github.com/michaeldv/awesome_print"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/bluecloth/bluecloth-2.2.0-r2.ebuild b/dev-ruby/bluecloth/bluecloth-2.2.0-r2.ebuild
index 871f5de9f7ca..5da5b2afddbb 100644
--- a/dev-ruby/bluecloth/bluecloth-2.2.0-r2.ebuild
+++ b/dev-ruby/bluecloth/bluecloth-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bluecloth/bluecloth-2.2.0-r2.ebuild,v 1.4 2014/07/01 05:59:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bluecloth/bluecloth-2.2.0-r2.ebuild,v 1.5 2014/08/13 18:49:57 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.deveiate.org/projects/BlueCloth"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 DEPEND+=" doc? ( dev-lang/perl )"
diff --git a/dev-ruby/childprocess/childprocess-0.4.2.ebuild b/dev-ruby/childprocess/childprocess-0.4.2.ebuild
index dd2e53fdb794..f4f0c8b24e88 100644
--- a/dev-ruby/childprocess/childprocess-0.4.2.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.4.2.ebuild,v 1.4 2014/08/05 16:00:42 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.4.2.ebuild,v 1.5 2014/08/13 18:48:19 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )"
diff --git a/dev-ruby/childprocess/childprocess-0.5.1.ebuild b/dev-ruby/childprocess/childprocess-0.5.1.ebuild
index e3fce533c8ae..2414e4ead249 100644
--- a/dev-ruby/childprocess/childprocess-0.5.1.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.5.1.ebuild,v 1.2 2014/08/05 16:00:42 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.5.1.ebuild,v 1.3 2014/08/13 18:48:19 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )"
diff --git a/dev-ruby/childprocess/childprocess-0.5.3.ebuild b/dev-ruby/childprocess/childprocess-0.5.3.ebuild
index b18a7a6a350b..385182a34362 100644
--- a/dev-ruby/childprocess/childprocess-0.5.3.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.5.3.ebuild,v 1.3 2014/08/05 16:00:42 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.5.3.ebuild,v 1.4 2014/08/13 18:48:19 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )"
diff --git a/dev-ruby/classifier-reborn/Manifest b/dev-ruby/classifier-reborn/Manifest
new file mode 100644
index 000000000000..86c1f0f62193
--- /dev/null
+++ b/dev-ruby/classifier-reborn/Manifest
@@ -0,0 +1 @@
+DIST classifier-reborn-2.0.0.tar.gz 22187 SHA256 72f3a7868c7955c3ecd1caacb73c102e16504bca375a894d6363f1900e143ca3 SHA512 d72d80fc06301c38786df8f4b61bba9a7aff505db6255f06a7e7aa31ee2568c95dafdf4ed1f7eafdbcb5ae44af9be7f875fc1435cb4b874c6dc46d1408746e3c WHIRLPOOL 29a83a61f6bd4b6a028e2471bd44e3efe9628249a801d3265b64e44b3dcd43f7cc776047c587683cdc609f117b0e38726caa3980e0323983ab86c7e1703460d0
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.0.0.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.0.0.ebuild
new file mode 100644
index 000000000000..1af12097d295
--- /dev/null
+++ b/dev-ruby/classifier-reborn/classifier-reborn-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/classifier-reborn/classifier-reborn-2.0.0.ebuild,v 1.2 2014/08/13 16:38:40 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Module to allow Bayesian and other types of classifications"
+HOMEPAGE="https://github.com/jekyll/classifier-reborn"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gsl"
+
+ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
+	!!dev-ruby/classifier
+	gsl? ( dev-ruby/rb-gsl )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	if use !gsl; then
+		sed -e 's/$GSL = true/$GSL = false/' -i lib/${PN}/lsi.rb || die
+	fi
+}
diff --git a/dev-ruby/classifier-reborn/metadata.xml b/dev-ruby/classifier-reborn/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/classifier-reborn/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
diff --git a/dev-ruby/classifier/classifier-1.3.4.ebuild b/dev-ruby/classifier/classifier-1.3.4.ebuild
index c029076cec54..c41df6af3525 100644
--- a/dev-ruby/classifier/classifier-1.3.4.ebuild
+++ b/dev-ruby/classifier/classifier-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/classifier/classifier-1.3.4.ebuild,v 1.2 2014/07/25 13:23:08 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/classifier/classifier-1.3.4.ebuild,v 1.5 2014/08/14 02:44:44 patrick Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -18,8 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gsl"
 
-ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0"
-ruby_add_rdepend "gsl? ( dev-ruby/rb-gsl )"
+ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
+	!!dev-ruby/classifier-reborn
+	gsl? ( dev-ruby/rb-gsl )"
 
 all_ruby_prepare() {
 	sed -i -e "s/PKG_VERSION/\"${PV}\"/" \
diff --git a/dev-ruby/coderay/coderay-1.1.0-r2.ebuild b/dev-ruby/coderay/coderay-1.1.0-r2.ebuild
index 112facad219a..3fe2a3f9ced4 100644
--- a/dev-ruby/coderay/coderay-1.1.0-r2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.1.0-r2.ebuild,v 1.3 2014/08/05 16:00:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coderay/coderay-1.1.0-r2.ebuild,v 1.4 2014/08/13 18:39:15 armin76 Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Redcloth is optional but automagically tested, so we add this
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
index c3a711532474..f146fb670f9c 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild,v 1.3 2014/06/16 15:41:03 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild,v 1.4 2014/08/13 18:31:24 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/facter/facter-1.7.6.ebuild b/dev-ruby/facter/facter-1.7.6.ebuild
index fe82c7fc2704..fdafe2040ca0 100644
--- a/dev-ruby/facter/facter-1.7.6.ebuild
+++ b/dev-ruby/facter/facter-1.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.6.ebuild,v 1.6 2014/08/09 10:48:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.6.ebuild,v 1.7 2014/08/13 17:37:37 armin76 Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+dmi +pciutils"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 
 CDEPEND="
 	sys-apps/net-tools
diff --git a/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild b/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild
index 87d51c3669c3..33a59105ed0f 100644
--- a/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild,v 1.2 2014/08/05 16:00:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakefs/fakefs-0.5.2-r1.ebuild,v 1.3 2014/08/13 18:35:57 armin76 Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://github.com/defunkt/fakefs"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/ffi/ffi-1.9.3.ebuild b/dev-ruby/ffi/ffi-1.9.3.ebuild
index 7188000fa14e..98279247924e 100644
--- a/dev-ruby/ffi/ffi-1.9.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.3.ebuild,v 1.8 2014/06/16 15:40:09 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ffi/ffi-1.9.3.ebuild,v 1.9 2014/08/13 18:46:24 armin76 Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.t
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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/hiera/hiera-1.3.4-r1.ebuild b/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
index af24c14e10d1..864b5eb130e2 100644
--- a/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
+++ b/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.4-r1.ebuild,v 1.1 2014/06/16 05:24:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.4-r1.ebuild,v 1.2 2014/08/13 18:49:46 armin76 Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://projects.puppetlabs.com/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/hiera/hiera-1.3.4.ebuild b/dev-ruby/hiera/hiera-1.3.4.ebuild
index bac27421ba4d..e8e09a59641d 100644
--- a/dev-ruby/hiera/hiera-1.3.4.ebuild
+++ b/dev-ruby/hiera/hiera-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.4.ebuild,v 1.3 2014/08/09 10:30:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.4.ebuild,v 1.4 2014/08/13 18:49:46 armin76 Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://projects.puppetlabs.com/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 hppa ~ppc ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/levenshtein/levenshtein-0.2.2-r1.ebuild b/dev-ruby/levenshtein/levenshtein-0.2.2-r1.ebuild
index d63932fa957a..e0a1cd4625d0 100644
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r1.ebuild
+++ b/dev-ruby/levenshtein/levenshtein-0.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/levenshtein/levenshtein-0.2.2-r1.ebuild,v 1.5 2014/08/05 16:00:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/levenshtein/levenshtein-0.2.2-r1.ebuild,v 1.6 2014/08/13 18:12:10 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="http://github.com/mbleigh/mash"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
index 0aebbb6aeeb4..5231f64b37d2 100644
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
+++ b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild,v 1.3 2014/08/05 16:00:34 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild,v 1.4 2014/08/13 18:39:56 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -17,7 +17,7 @@ HOMEPAGE="http://github.com/mbleigh/mash"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/locale/locale-2.1.0-r1.ebuild b/dev-ruby/locale/locale-2.1.0-r1.ebuild
index 323ac7ef1f35..e098c20ec78e 100644
--- a/dev-ruby/locale/locale-2.1.0-r1.ebuild
+++ b/dev-ruby/locale/locale-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/locale-2.1.0-r1.ebuild,v 1.12 2014/08/05 16:00:38 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/locale-2.1.0-r1.ebuild,v 1.13 2014/08/13 18:45:42 armin76 Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~x86-macos"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/locale/locale-2.1.0-r2.ebuild b/dev-ruby/locale/locale-2.1.0-r2.ebuild
index 71901b69bc52..51b86daadd13 100644
--- a/dev-ruby/locale/locale-2.1.0-r2.ebuild
+++ b/dev-ruby/locale/locale-2.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/locale-2.1.0-r2.ebuild,v 1.3 2014/08/05 16:00:38 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/locale/locale-2.1.0-r2.ebuild,v 1.4 2014/08/13 18:45:42 armin76 Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
index 7d0e8e8352b9..6f747f9b333b 100644
--- a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.10.5-r2.ebuild,v 1.2 2014/06/16 15:49:52 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.10.5-r2.ebuild,v 1.3 2014/08/13 18:43:33 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://mocha.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
index 9d6dfdbe1b42..261874a90b5c 100644
--- a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.11.4-r1.ebuild,v 1.2 2014/06/16 15:49:52 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.11.4-r1.ebuild,v 1.3 2014/08/13 18:43:33 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.12.10-r1.ebuild b/dev-ruby/mocha/mocha-0.12.10-r1.ebuild
index 57448bd037ef..56340c0dcba4 100644
--- a/dev-ruby/mocha/mocha-0.12.10-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.12.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.10-r1.ebuild,v 1.1 2014/06/16 05:37:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.10-r1.ebuild,v 1.2 2014/08/13 18:43:33 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 jruby ruby20 ruby21"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.12"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.12.10.ebuild b/dev-ruby/mocha/mocha-0.12.10.ebuild
index 3c9777b6a3e5..25e4c07a8eae 100644
--- a/dev-ruby/mocha/mocha-0.12.10.ebuild
+++ b/dev-ruby/mocha/mocha-0.12.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.10.ebuild,v 1.11 2014/08/09 10:14:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.10.ebuild,v 1.12 2014/08/13 18:43:33 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 jruby ruby20"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.12"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.13.3-r1.ebuild b/dev-ruby/mocha/mocha-0.13.3-r1.ebuild
index ebf55084eb92..32e91bd4e2fa 100644
--- a/dev-ruby/mocha/mocha-0.13.3-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.13.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3-r1.ebuild,v 1.11 2014/08/09 10:14:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3-r1.ebuild,v 1.12 2014/08/13 18:43:33 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.13"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-0.13.3-r2.ebuild b/dev-ruby/mocha/mocha-0.13.3-r2.ebuild
index ff0f42504be6..e9bd5281f6d4 100644
--- a/dev-ruby/mocha/mocha-0.13.3-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.13.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3-r2.ebuild,v 1.1 2014/06/16 05:37:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3-r2.ebuild,v 1.2 2014/08/13 18:43:33 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -20,7 +20,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.13"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/redcloth/redcloth-4.2.9-r2.ebuild b/dev-ruby/redcloth/redcloth-4.2.9-r2.ebuild
index 8b7064494a79..75cc45d46f49 100644
--- a/dev-ruby/redcloth/redcloth-4.2.9-r2.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.9-r2.ebuild,v 1.2 2014/06/16 15:39:09 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.9-r2.ebuild,v 1.3 2014/08/13 18:39:05 armin76 Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ RUBY_S="${GITHUB_USER}-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" dev-util/ragel"
diff --git a/dev-ruby/rr/rr-1.1.2-r1.ebuild b/dev-ruby/rr/rr-1.1.2-r1.ebuild
index cd41f737ca6c..71e97f5efac9 100644
--- a/dev-ruby/rr/rr-1.1.2-r1.ebuild
+++ b/dev-ruby/rr/rr-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rr/rr-1.1.2-r1.ebuild,v 1.2 2014/06/16 15:42:01 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rr/rr-1.1.2-r1.ebuild,v 1.3 2014/08/13 18:43:32 armin76 Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="http://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
index 0eeabd480db3..027fa565c3b0 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild,v 1.8 2014/08/05 16:00:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.4.8.ebuild,v 1.9 2014/08/14 16:44:31 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
 
 # Block on older versions of rrdtool that install the bindings themselves.
 # requires rrd_xport which requires rrd_graph 
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r1.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r1.ebuild
index fa219cc19b77..59d0a1b1cfa2 100644
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r1.ebuild,v 1.3 2014/06/16 15:41:14 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.14.8-r1.ebuild,v 1.4 2014/08/13 18:38:21 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.0.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.0.ebuild
index aa93e43a692e..ff874da16810 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.0.ebuild,v 1.2 2014/07/22 15:58:57 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.0.ebuild,v 1.3 2014/08/13 18:38:21 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.1.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.1.ebuild
index e485a8452a17..a94b65220df9 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.1.ebuild,v 1.1 2014/07/07 06:27:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-2.99.1.ebuild,v 1.2 2014/08/13 18:38:21 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
index 39c9f144fe52..1f448a40b24b 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild,v 1.2 2014/06/16 15:41:26 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild,v 1.3 2014/08/13 18:32:48 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.0.ebuild
index b2854fbeacb9..60863c0c01e9 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.0.ebuild,v 1.2 2014/07/22 15:58:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.0.ebuild,v 1.3 2014/08/13 18:32:48 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.1.ebuild
index f7fcd17650ec..c50eb7900401 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.1.ebuild,v 1.2 2014/08/02 06:07:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.1.ebuild,v 1.3 2014/08/13 18:32:48 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index 8a28b4a426d4..2286bfc932c9 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild,v 1.2 2014/08/02 06:07:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild,v 1.3 2014/08/13 18:32:48 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
index b85efa4a88a8..ec3a24769af4 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild,v 1.2 2014/06/16 15:41:37 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild,v 1.3 2014/08/13 18:33:41 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.0.ebuild
index 6d5ffcbc1633..847b1b3950a7 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.0.ebuild,v 1.2 2014/07/22 15:58:33 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.0.ebuild,v 1.3 2014/08/13 18:33:41 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.1.ebuild
index ecde2793fcf3..3ede2f9d05d4 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.1.ebuild,v 1.2 2014/08/02 06:09:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.1.ebuild,v 1.3 2014/08/13 18:33:41 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index a813f454d190..927146aac851 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild,v 1.1 2014/08/02 06:14:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild,v 1.2 2014/08/13 18:33:41 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec/rspec-1.3.2-r1.ebuild b/dev-ruby/rspec/rspec-1.3.2-r1.ebuild
index 2c85ddff6343..748273fde7f6 100644
--- a/dev-ruby/rspec/rspec-1.3.2-r1.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2-r1.ebuild,v 1.2 2014/07/10 10:06:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.2-r1.ebuild,v 1.3 2014/08/13 18:37:02 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -21,7 +21,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 # it's actually optional, but tests fail if it's not installed and
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
index 5eda706c8df7..65a3943bbc34 100644
--- a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
+++ b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.14.1-r1.ebuild,v 1.2 2014/06/16 15:41:50 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.14.1-r1.ebuild,v 1.3 2014/08/13 18:30:37 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index f9c5b13f9a2b..dbe586c8ff9f 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.99.0.ebuild,v 1.2 2014/07/22 15:58:21 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-2.99.0.ebuild,v 1.3 2014/08/13 18:30:37 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-2.3.8.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-2.3.8.ebuild
index f29195ce085c..71135fe009b1 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-2.3.8.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-2.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-2.3.8.ebuild,v 1.10 2014/06/17 18:48:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-2.3.8.ebuild,v 1.11 2014/08/13 18:16:21 armin76 Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ inherit ruby-fakegem
 DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="Ruby"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
index 7f2e6e373cd5..cbf0f91b98e0 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild,v 1.5 2014/07/21 14:55:39 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild,v 1.6 2014/08/13 18:46:30 armin76 Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ inherit ruby-fakegem
 DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
 
-KEYWORDS="alpha ~amd64 arm hppa ia64"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~sparc"
 IUSE="doc test"
 SLOT="0"
 LICENSE="Ruby"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
index 12e37f43ea1b..34df30328bf2 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild,v 1.3 2014/07/14 17:11:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild,v 1.4 2014/08/13 18:46:30 armin76 Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ inherit ruby-fakegem
 DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="Ruby"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.3.ebuild
index 585f29444df1..8d8069ff267b 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.3.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.3.ebuild,v 1.1 2014/07/31 07:50:32 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-3.1.3.ebuild,v 1.2 2014/08/13 18:46:30 armin76 Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ inherit ruby-fakegem
 DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="http://ruby-gettext.github.io/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
index ed17752cc84f..19344b17e847 100644
--- a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
+++ b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild,v 1.1 2014/08/06 01:32:42 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r2.ebuild,v 1.2 2014/08/13 18:52:38 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/caiges/Ruby-RC4"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/spork/spork-0.9.2-r2.ebuild b/dev-ruby/spork/spork-0.9.2-r2.ebuild
index ffe845b5ffca..a2bf6eece6e2 100644
--- a/dev-ruby/spork/spork-0.9.2-r2.ebuild
+++ b/dev-ruby/spork/spork-0.9.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2-r2.ebuild,v 1.1 2014/08/02 00:09:10 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2-r2.ebuild,v 1.2 2014/08/13 18:50:42 armin76 Exp $
 
 EAPI=5
 
@@ -17,6 +17,6 @@ DESCRIPTION="Spork is Tim Harper's implementation of test server"
 HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild
index 9d7b35ec56f4..6cbbf45ca4ce 100644
--- a/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild,v 1.1 2014/04/20 18:53:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild,v 1.2 2014/08/13 18:50:24 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -15,7 +15,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="http://rubyforge.org/projects/sqlite-ruby/"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~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"
 SLOT="0"
 IUSE=""
 
@@ -66,7 +66,7 @@ each_ruby_install() {
 	# sqlite3` was already part of sqlite3-ruby requirements.
 	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
 # generated by ebuild
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild,v 1.1 2014/04/20 18:53:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sqlite3/sqlite3-1.3.9-r1.ebuild,v 1.2 2014/08/13 18:50:24 armin76 Exp $
 Gem::Specification.new do |s|
 	s.name = "sqlite3-ruby"
 	s.version = "${RUBY_FAKEGEM_VERSION}"
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 4292422a8bfc..6c2efabc5ce2 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1 +1,2 @@
 DIST syntax-1.0.0.gem 15360 SHA256 605e2f62770bad04e849b3a1a2234e45b2904a8592f2f4dcc0bb14dce09c23fd SHA512 196c0bd125903f3579d7a02528be16b09db75dbf91f6f8efbaa4cd69229a52a2ae00841343c3b17bada86e6bda51d6cc7c0c119615a5d779332f61976af96c04 WHIRLPOOL f41df19ef0adddf0ef0424bf9e1070c2b2417bacba5f4a1d37051a5a19f82a75ada729f2ebd41f70dac7b455722b5c4d5e94dde1f7ec8235ea15116a968a4b86
+DIST syntax-1.2.0.tar.gz 40797 SHA256 9cec12fac6b6dc4f3fee263f5765333880ae26d4194b9670f3de26d4674dde9b SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548 WHIRLPOOL 4eb23d481dbd56878ac024643d10069f644ac182813dc744fa61ea44a418d04caa738915a7a60ca85aff5bf90c35e92187e18a1adf168cd17265c06f2b3a4e66
diff --git a/dev-ruby/syntax/syntax-1.2.0.ebuild b/dev-ruby/syntax/syntax-1.2.0.ebuild
new file mode 100644
index 000000000000..7d49658ba354
--- /dev/null
+++ b/dev-ruby/syntax/syntax-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/syntax/syntax-1.2.0.ebuild,v 1.1 2014/08/14 14:08:20 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Syntax highlighting for sourcecode and HTML"
+HOMEPAGE="https://github.com/dblock/syntax"
+SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
index a1656336c141..5c7b27a84aa2 100644
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild,v 1.3 2014/08/05 16:00:29 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild,v 1.4 2014/08/13 18:44:55 armin76 Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://rubyforge.org/projects/test-unit/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
diff --git a/dev-ruby/text/text-1.2.3-r1.ebuild b/dev-ruby/text/text-1.2.3-r1.ebuild
index 9d7b778f2b84..13f7949683ba 100644
--- a/dev-ruby/text/text-1.2.3-r1.ebuild
+++ b/dev-ruby/text/text-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.2.3-r1.ebuild,v 1.12 2014/07/21 14:56:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.2.3-r1.ebuild,v 1.13 2014/08/13 18:15:20 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 jruby"
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/threedaymonk/text"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/text/text-1.2.3-r2.ebuild b/dev-ruby/text/text-1.2.3-r2.ebuild
index 16a3e74f8fcb..b8f92fafe6a8 100644
--- a/dev-ruby/text/text-1.2.3-r2.ebuild
+++ b/dev-ruby/text/text-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.2.3-r2.ebuild,v 1.4 2014/07/15 05:36:43 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.2.3-r2.ebuild,v 1.5 2014/08/13 18:15:20 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/threedaymonk/text"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/text/text-1.3.0.ebuild b/dev-ruby/text/text-1.3.0.ebuild
index 8a1f3cc3b515..30f0c2d04521 100644
--- a/dev-ruby/text/text-1.3.0.ebuild
+++ b/dev-ruby/text/text-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.3.0.ebuild,v 1.2 2014/07/15 05:36:43 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text/text-1.3.0.ebuild,v 1.3 2014/08/13 18:15:20 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/threedaymonk/text"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild
index af6e572f7ebf..1e62ebc47d9f 100644
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild
+++ b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild,v 1.3 2014/08/05 16:00:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.14-r2.ebuild,v 1.4 2014/08/13 18:48:37 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -16,7 +16,7 @@ HOMEPAGE="http://github.com/carld/tidy"
 
 LICENSE="HTML-Tidy"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index ac597b8c493a..da74a02e7568 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -2,3 +2,4 @@ DIST tins-0.13.1.gem 35328 SHA256 c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594
 DIST tins-0.13.2.gem 35328 SHA256 5e68e998325fdbc92b01ca21229278e68d14d2b1d77c1ccc55a61fb515a9f3f9 SHA512 87ca02f7c0610506d45cc7889f13f97597ed3b5218e63888b55f1d9516729b85b3800aa68965dbbcd992ac1c062a47c299dfcbcca161a48ea41d908a9435ec81 WHIRLPOOL b924ab12cf4355be3096df3895076931cfbf72a8bab5509d7d80f7b323f0f5caee0112cd2b68a5eef339a5121dd3c55b99f7d8c6df5365314397fef9a60be166
 DIST tins-1.1.0.gem 299008 SHA256 5964d11f3784651370b685ea2751f3f88c75f4def29a1b04b19f224e0161ad49 SHA512 1122cba2649ab57b1af7e2f8231c23e72328159262b40cf91840aa9b547ceab7bfaf43aace72bdb2205c8b129d9d0abbd83f5da7fc226fe23b0266dae3ecb959 WHIRLPOOL 558dd6d5549798e51a59add0e0184ecbe4287e90db7623987a511d39231e10c31fa4b1262b4e149bb3f30c0a751d21f1869207d6d56ccdc4bde772431ee9c423
 DIST tins-1.3.0.gem 299008 SHA256 b1ad5c07aef3f26b80f329c701bfedf83f1bc560e7516e0ce284d774fd2caafb SHA512 afbbd34c8242f0e665fee35300fe86c257e7e5fbbec6fc1cf7d73314b67796115cad6304683d47139e40224005b297ab652b4d7ce68948fb4cfd7c577cece778 WHIRLPOOL be2fcfc60649c8014e7af3ce47f46c79d7b11d2f9cb455c875afd31e345c5d7a5247c9a4b9296d6ba5a93b5b174841ba257a1932c3552cd08ec072197faf8247
+DIST tins-1.3.1.gem 297472 SHA256 8a5865abb586fef662ce94d7260df1f2d384d30b5bbf0087ca03db1428ad30ed SHA512 96760597fc22ba33681da1e1c1ae7aa5ed0521a7e930a7ce44c2deb850b327a30cfbd2d8a6f3f01dc665fa17363840e164559ed3a8e861e9373e05884011f936 WHIRLPOOL 11b822e39f068aa89442e3cac17a894d7a21e5a5506746a7d782388ae4b0386585d73dde63f10acbbeab874245e6ea25953c47b8f77be9726c08f61a93ddeb52
diff --git a/dev-ruby/tins/tins-1.3.1.ebuild b/dev-ruby/tins/tins-1.3.1.ebuild
new file mode 100644
index 000000000000..e40501dba8a5
--- /dev/null
+++ b/dev-ruby/tins/tins-1.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tins/tins-1.3.1.ebuild,v 1.1 2014/08/14 14:11:37 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="http://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/uuidtools/Manifest b/dev-ruby/uuidtools/Manifest
index b62032ffa035..408ee5ec70f7 100644
--- a/dev-ruby/uuidtools/Manifest
+++ b/dev-ruby/uuidtools/Manifest
@@ -1,2 +1,3 @@
 DIST uuidtools-2.1.3.tgz 20229 SHA256 0e05a22276f813376eafbbb93bbd395c168750fa186d3ad683d9eb9d6bb39568 SHA512 553145e942e8fa33286728a22df99228057ab6259d745cfb1a4e623f440155bbd989cd9c67875a4a563af69156d7c71cd729d5119e2e164163617afd5ecff2ba WHIRLPOOL f9733546d35371eed7c6aac4b06b6d9cba3acfefa644835d1453462655b9cd64e8131eaaa87ed41cd47dc3958579473d2f2285dbdeb3ff2f22cbd445da91580b
 DIST uuidtools-2.1.4.gem 25600 SHA256 439b6432ed2199490d133954e9c8bab273355d7653b9d2fd70259472a7850bf0 SHA512 e813cfcafd61493e4050b82d30c52aa7e3d0b1dde332181da49d6180f880604eff32ee656cfb6c5b92fa7c79dcc2b1c983690b8f35b19604dec393fa3da5ae09 WHIRLPOOL 3157432e97dd1d5adf42a433b77c4d86c9405771c12443f0910bd95300121c8321044dcdd3bbcab4b89fbf74d7fa316a23f531131431cf9cf7f801c0c5f4bd0c
+DIST uuidtools-2.1.5.gem 25600 SHA256 af6c85f2fca731cbf45ebc55b96bf5c94d0d46663dfc4a7d32f2db9c65c05b7e SHA512 c56e6329e48638bd5049d348beedec7fadb9ee7a133a5013ddd41ae98baa8213d8944903059729c9ca4f38b24d9b565b5653332685982337a4233f11d4865ac0 WHIRLPOOL 25e8839bbbaec0d9c4ff7a4f819731969d7ec78e71b591e81486bdb6cd8b443a560a97d04febc52444b564c73f2f1c0164ba30891e2164494ec5af584b3e486b
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild
new file mode 100644
index 000000000000..e1d14709a3cb
--- /dev/null
+++ b/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild,v 1.1 2014/08/14 14:11:15 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC="-f tasks/yard.rake doc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple library to generate UUIDs"
+HOMEPAGE="http://uuidtools.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/yard/yard-0.8.7.3-r1.ebuild b/dev-ruby/yard/yard-0.8.7.3-r1.ebuild
index 3fe3ff8395b2..0c2416c3451e 100644
--- a/dev-ruby/yard/yard-0.8.7.3-r1.ebuild
+++ b/dev-ruby/yard/yard-0.8.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.7.3-r1.ebuild,v 1.6 2014/07/15 05:38:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.7.3-r1.ebuild,v 1.7 2014/08/13 18:34:30 armin76 Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/bluecloth dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )
diff --git a/dev-ruby/yard/yard-0.8.7.3.ebuild b/dev-ruby/yard/yard-0.8.7.3.ebuild
index 582c01262823..9acbf706a53c 100644
--- a/dev-ruby/yard/yard-0.8.7.3.ebuild
+++ b/dev-ruby/yard/yard-0.8.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.7.3.ebuild,v 1.10 2014/07/21 14:55:07 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.7.3.ebuild,v 1.11 2014/08/13 18:34:30 armin76 Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/bluecloth dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )
diff --git a/dev-ruby/yard/yard-0.8.7.4.ebuild b/dev-ruby/yard/yard-0.8.7.4.ebuild
index 58b47f9ce27e..7ce0cc004bda 100644
--- a/dev-ruby/yard/yard-0.8.7.4.ebuild
+++ b/dev-ruby/yard/yard-0.8.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.7.4.ebuild,v 1.2 2014/06/18 09:39:07 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yard/yard-0.8.7.4.ebuild,v 1.3 2014/08/13 18:34:30 armin76 Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/bluecloth dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )
diff --git a/dev-tcltk/tkdnd/Manifest b/dev-tcltk/tkdnd/Manifest
index 2992e1ef68eb..9aff0f38f902 100644
--- a/dev-tcltk/tkdnd/Manifest
+++ b/dev-tcltk/tkdnd/Manifest
@@ -1 +1,2 @@
 DIST tkdnd2.2.tar.gz 501708 SHA256 89a55e295f8e82829558b4c4548259fbb8a1dc193280b04c2f138bf561a7370f SHA512 96f3b7209d82801b69932531b987cfe2c3367fbaaffd2198afc84bf21643437db8a9958511e31ce2c36896538ff8f8c9237950d0f82b832f7133fb1e5768fd26 WHIRLPOOL 92182d6e54bbbd87e690d77247e6402f76e7dd45eea7cfb318fd104e25d7540534681e0da0e007579af095953fa5989f4f48838f8e6e7da1619176979e97f829
+DIST tkdnd2.6-src.tar.gz 180278 SHA256 e3f499c62d1db2e9a4468791544c784eac727175e094aa06bfe7441dfb3f08e7 SHA512 2ce1be9b49c21bc67102575420311c1ec764493315791c8a76313cae6d22846b3049dd85cdc0b2f28592889432b85103b0fa207445f678dbe22f988eb1d6fc87 WHIRLPOOL b1fc76e0f5d6f91b8a048413f46d0b590ab0f106c4efcf5d26296b2c01ce1586978fda0769da25739a563bec32052030a140c7814f24414612447f3619a69a98
diff --git a/dev-tcltk/tkdnd/metadata.xml b/dev-tcltk/tkdnd/metadata.xml
index 815cc916f2b6..70ac40499556 100644
--- a/dev-tcltk/tkdnd/metadata.xml
+++ b/dev-tcltk/tkdnd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+  <herd>tcltk</herd>
 </pkgmetadata>
diff --git a/dev-tcltk/tkdnd/tkdnd-2.6.ebuild b/dev-tcltk/tkdnd/tkdnd-2.6.ebuild
new file mode 100644
index 000000000000..a06397151eac
--- /dev/null
+++ b/dev-tcltk/tkdnd/tkdnd-2.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkdnd/tkdnd-2.6.ebuild,v 1.1 2014/08/14 06:07:06 jlec Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils
+
+MY_PN="TkDND"
+
+DESCRIPTION="Extension that adds native drag & drop capabilities to the tk toolkit"
+HOMEPAGE="http://www.ellogon.org/petasis/tcltk-projects/tkdnd/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${MY_PN}%20${PV}/${P/-/}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug threads X"
+
+DEPEND="dev-lang/tk"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P/-/}
+
+RESTRICT="test"
+
+src_prepare() {
+	sed \
+		-e 's:-O2::g' \
+		-e 's:-fomit-frame-pointer::g' \
+		-e 's:-pipe::g' \
+		-i configure tclconfig/tcl.m4 || die
+}
+
+src_configure() {
+	local myeconfargs
+	use X && myeconfargs+=( --with-x )
+	use debug && myeconfargs+=( --with-symbols )
+	use threads && myeconfargs+=( --enable-threads )
+	autotools-utils_src_configure
+}
diff --git a/dev-util/automoc/automoc-0.9.88-r1.ebuild b/dev-util/automoc/automoc-0.9.88-r1.ebuild
new file mode 100644
index 000000000000..1aed110d1783
--- /dev/null
+++ b/dev-util/automoc/automoc-0.9.88-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/automoc/automoc-0.9.88-r1.ebuild,v 1.1 2014/08/13 23:12:48 johu Exp $
+
+EAPI=5
+
+MY_PN="automoc4"
+MY_P="$MY_PN-${PV}"
+inherit base cmake-utils flag-o-matic
+
+DESCRIPTION="KDE Meta Object Compiler"
+HOMEPAGE="http://www.kde.org"
+SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.88-objc++.patch" )
+
+src_prepare() {
+	base_src_prepare
+
+	if [[ ${ELIBC} = uclibc ]]; then
+		append-flags -pthread
+	fi
+}
diff --git a/dev-util/bluej/bluej-3.1.1.ebuild b/dev-util/bluej/bluej-3.1.1.ebuild
index e867d7fa68fa..e3edc87d1f03 100644
--- a/dev-util/bluej/bluej-3.1.1.ebuild
+++ b/dev-util/bluej/bluej-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bluej/bluej-3.1.1.ebuild,v 1.1 2014/03/04 02:25:43 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bluej/bluej-3.1.1.ebuild,v 1.2 2014/08/14 17:00:56 phajdan.jr Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ doc? ( http://bluej.org/download/files/${PN}-ref-manual.pdf
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND=">=virtual/jdk-1.5.0"
 DEPEND="${RDEPEND}
diff --git a/dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild b/dev-util/checkbashisms/checkbashisms-2.0.0.2-r2.ebuild
similarity index 90%
rename from dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild
rename to dev-util/checkbashisms/checkbashisms-2.0.0.2-r2.ebuild
index 94cd28f8185b..ce11b677d193 100644
--- a/dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.0.0.2-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkbashisms/checkbashisms-2.0.0.2-r1.ebuild,v 1.1 2014/08/13 04:36:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkbashisms/checkbashisms-2.0.0.2-r2.ebuild,v 1.1 2014/08/14 02:49:22 patrick Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
@@ -24,6 +24,9 @@ S=${WORKDIR}
 
 src_unpack() {
 	cp "${DISTDIR}"/${P} ${PN}
+}
+
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-export.patch #458392
 	epatch "${FILESDIR}"/${P}-kill.patch #458392
 	epatch "${FILESDIR}"/${P}-version.patch
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index ad427605b6c8..5bc91434dfc0 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -2,4 +2,5 @@ DIST cucumber-1.2.1.gem 333312 SHA256 11df76fb89c90fd37493560879dbd284665320fbfe
 DIST cucumber-1.3.10.gem 273408 SHA256 f6beb70c1652b10784938bfd6bcd69f31ce6c5a6d198ae4d046bfb1c568f07bd SHA512 59f4a03c91be56d8a525590532ae6ff2d8bc3911f9f93fd10730540aa5fb79a0164cea9569d4d120e577645daa753d1c7d2888641a5c8e35cd37895e495c0f62 WHIRLPOOL f576b5dd9b5e83afac85c69337f48f48d890f9e7b21351d6d1ffa1d62c0ba808818f26f76598a1578cbde30e53bfc345cfaff8426e6a5c6967aae542c4311008
 DIST cucumber-1.3.14.gem 276480 SHA256 5ff619d583180dbd53fbe6739607cb66bdf79c548c9de103263694d58efe196e SHA512 9f68da70e4850c1385e4a5e7c1bd86eb99a0e24081b7622c8dc5c5ed018e034d72c4fba60cc3ea8dcadd41e323aac0283a6481747a3f27f99638a155e5f602a1 WHIRLPOOL fcc103d08556568ff3a82027199241e8ace7f6b825de160babd4643c2693c49c71af5db411a52886f106ce6fbfc285bf345100523aa5690b3fad92d50256449f
 DIST cucumber-1.3.15.gem 276480 SHA256 a81a9594487cb0daf576163c9123dd922279dcec037ca5c7bf88f3a8887d8bf2 SHA512 a23e4e84d499ca0e6f26ef2d36d8fa5cb85bf699caab101c7dce61ea41a3ffdc0c84cd34a8659d6665e65f14891726d10c9e4d618a475ca8c413dd5e63bfd34a WHIRLPOOL 12e36f2d71547c64f4e5f6471814380bab5e49f01023bf23d9db4fb74740bbabb6f0c7d034e5347f6107477554c3e5e408978c428c8854e0825b9676d0b13f50
+DIST cucumber-1.3.16.gem 274432 SHA256 c218107f9601f875684baceb88da5d660f2d04c2c6c6626f5981e4019ae09285 SHA512 db2f825eec5f50fec55e683fa3c952214b16af4947487a7ef28de4c7db6449bbcfec83f5ef5b7da31e05926932583ad3c4fa6290330726135368b9bb6beb8d47 WHIRLPOOL c89b3708794c10f0c78c33f808e80ad06ebfb4ed7314ade2301cf74bfadfd6c5b593a69b02f7a9ce921fffcb9bb76c6e02a79e1a4a079e06149872fd85557d96
 DIST cucumber-1.3.2.gem 275968 SHA256 18c9d38cea1b164d57afa1346a2d7c0cc18062687ee66b28ffcf39a53f6c086e SHA512 7d6be78dfe72a7aae868ff91308a7ea8ea01fe71f53b705f2da89cb9965e676930c1826f87d62d86e1c2192fc63d966b634943b767da23d8bc6c41cac074a42b WHIRLPOOL 254445cd39f03de98601af820a68f5b16674cbe8706663ba7806048af060abf9bc6bbd735a79696df0613effbeea3b07324de60749a55a7ff9bff1b2b52b0fa4
diff --git a/dev-util/cucumber/cucumber-1.3.16.ebuild b/dev-util/cucumber/cucumber-1.3.16.ebuild
new file mode 100644
index 000000000000..a4730d84f879
--- /dev/null
+++ b/dev-util/cucumber/cucumber-1.3.16.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.3.16.ebuild,v 1.1 2014/08/14 06:01:03 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-2.13.0
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.5.2
+		>=dev-ruby/json-1.7
+		dev-ruby/bundler
+		>=dev-util/cucumber-1.3
+		dev-ruby/rubyzip:0
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2
+	>=dev-ruby/diff-lcs-1.1.3
+	>=dev-ruby/gherkin-2.12.0:0
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.1
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix too-strict nokogiri test dependency
+	sed -i -e 's/~> 1.5.2/>= 1.5.2/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/rake/ s/10.2/10.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make sure spork is run in the right interpreter
+	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+
+	# Avoid json, they most likely fail due to multi_json weirdness.
+	rm features/json_formatter.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/git ls-files/d' cucumber.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rspec spec || die "Specs failed"
+	RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
index 6c31cf1b6dea..30506b581cd4 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild,v 1.8 2014/08/13 12:38:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild,v 1.9 2014/08/14 12:39:34 jer Exp $
 
 inherit eutils toolchain-funcs versionator
 
@@ -12,7 +12,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
 LICENSE="perforce GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="!dev-util/jam
diff --git a/dev-util/global/global-6.3.ebuild b/dev-util/global/global-6.3.ebuild
index 7b23419e2103..b58b7c865d26 100644
--- a/dev-util/global/global-6.3.ebuild
+++ b/dev-util/global/global-6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-6.3.ebuild,v 1.2 2014/08/10 21:27:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-6.3.ebuild,v 1.3 2014/08/14 17:26:23 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
 IUSE="doc emacs vim"
 
 RDEPEND="sys-devel/libtool
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index a00304c4a146..9fabea7160ce 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,6 +1,4 @@
-DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4
 DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
 DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
 DIST cuda_6.0.37_linux_32.run 779831016 SHA256 54084c2c808b0a4af91b5bb9cf0757f40510d6b259cd84373e7af3c90baec172 SHA512 c2e6e16b780a87c8530853dc63e6c8e000bc122428e474fd99a33c19977082eda0ef93f86a981a36c4f884ddcc2fd0d14b2f4f886cccc7c8a3f2c9441ea3c895 WHIRLPOOL 08d0a7a0eb4f6f3c07a939d949f4fa7f8bef8969224156256430de11abf204c00a0b8d6d1a2e37d4985c4dcb1f440f83380de75386dd53bbfc2aa8392e36e840
 DIST cuda_6.0.37_linux_64.run 1032032789 SHA256 991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40 SHA512 251f87fa797eb0ba40f76d94852c3a8a401057bdc6d921dcaf294d9972755b77b7180bbbfb655aa3fa9be6ea499e558ab02fa122ad225ddb0afdbbf3622483de WHIRLPOOL 88567cf44508cad899ab5591ee22785330b570b1447725ba120c829b9982e4629288a2c6033eb02e091c98b811fe68747d0405eacb6931389eabe05905de4d71
-DIST gpucomputingsdk_4.2.9_linux.run 152436489 SHA256 b6a53afcf8f8422b5075aa37cec6730b0b9896d50867ee9105da05d62e95b8bb SHA512 1975f005ebd1520005d0a45ac680c8b49806705b8ed64738366b7166f384a304de3d655a05900b6da1088441024b149a1e963296ef78041c524ecbb1bb5e5315 WHIRLPOOL b8ce1f1f6a54b2d52f2531cfbb46f2a48e0b37f0c1dd898ff6222483afed7ac26c6bc57da31cafb0c30b3636b780ace3e3c679f25c6c4eaa26b0e39da00dcb8f
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 71cb6af96a3a..288e4957a1dd 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -7,10 +7,6 @@
     <name>Justin Lecher</name>
   </maintainer>
   <use>
-    <flag name="emulation">
-			Build binaries for device emulation mode.  These binaries
-			will not require a CUDA-capable GPU to run.
-		</flag>
     <flag name="opencl">
 			Build OpenCL binaries.
 		</flag>
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild
deleted file mode 100644
index 796654fd746d..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild
+++ /dev/null
@@ -1,70 +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/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild,v 1.12 2012/07/31 07:37:19 zerochaos Exp $
-
-inherit eutils unpacker toolchain-funcs
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/2_0/linux/sdk/NVIDIA_CUDA_SDK_${PV}_linux.run"
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug emulation"
-
-DEPEND="dev-util/nvidia-cuda-toolkit
-	>=x11-drivers/nvidia-drivers-177.73
-	media-libs/freeglut"
-
-S="${WORKDIR}"
-RESTRICT="binchecks"
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 4 ]; then
-		eerror "This package requires <=sys-devel/gcc-4.3 to build sucessfully."
-		eerror "Please use gcc-config to switch to a compatible GCC version."
-		die "<=sys-devel/gcc-4.3 required"
-	fi
-}
-
-src_unpack() {
-	unpack_makeself
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-make_cpp_fix.patch"
-	sed -i -e 's:CUDA_INSTALL_PATH ?= .*:CUDA_INSTALL_PATH ?= /opt/cuda:' sdk/common/common.mk
-}
-
-src_compile() {
-	local myopts=""
-
-	if use emulation; then
-		myopts="emu=1"
-	fi
-
-	if use debug; then
-		myopts="${myopts} dbg=1"
-	fi
-
-	cd "${S}/sdk"
-	emake cuda-install=/opt/cuda ${myopts} || die
-}
-
-src_install() {
-	cd "${S}/sdk"
-
-	for f in $(find .); do
-		local t="$(dirname ${f})"
-		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
-			continue
-		fi
-
-		if [[ -x "${f}" && ! -d "${f}" ]]; then
-			exeinto "/opt/cuda/sdk/$(dirname ${f})"
-			doexe "${f}"
-		else
-			insinto "/opt/cuda/sdk/$(dirname ${f})"
-			doins "${f}"
-		fi
-	done
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r2.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r2.ebuild
deleted file mode 100644
index 7e9676a7132e..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r2.ebuild,v 1.1 2013/01/23 09:24:30 jlec Exp $
-
-EAPI=4
-
-inherit cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/sdk/gpucomputingsdk_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	>=dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-			>=x11-drivers/nvidia-drivers-296
-			media-libs/glew
-		)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/CXX/s:g++:$(tc-getCXX):g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e 's:-Wimplicit::g' \
-		-e 's:GLEW_x86_64:GLEW:g' \
-		-i $(find sdk -type f -name "*.mk") || die
-
-	sed \
-		-e "s:/usr/local/cuda:${EPREFIX}/opt/cuda:g" \
-		-i sdk/shared/common.mk sdk/C/common/common.mk || die
-
-	find sdk/shared/inc/GL -delete || die
-	find sdk -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	cd sdk
-	use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} ${verbose}
-	use opencl && emake -C OpenCL ${verbose}
-}
-
-src_install() {
-	local i j f t crap=""
-	cd sdk
-	if use doc; then
-		ebegin "Installing docs ..."
-		for i in *; do
-			if [[ -d ${i} ]]; then
-				for j in doc releaseNotesData; do
-					docinto ${i}
-					[[ -d ${i}/${j} ]] && dodoc -r ${i}/${j}
-				done
-			fi
-		done
-		dodoc -r doc
-		dohtml {.,*}/*htm*
-		eend
-	fi
-
-	crap+=" *.txt doc */doc */Samples.htm* */releaseNotesData"
-
-	if ! use examples; then
-		crap+=" */bin */tools"
-	fi
-
-	ebegin "Cleaning before installation..."
-	find ${crap} -delete || die
-	find . \( -name Makefile -o -name "*.mk" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-	for f in $(find .); do
-		local t="$(dirname ${f})"
-		if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-			continue
-		fi
-		if [[ ! -d ${f} ]]; then
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/${t}
-				doexe ${f}
-			else
-				insinto /opt/cuda/sdk/${t}
-				doins ${f}
-			fi
-		fi
-	done
-	eend
-}
diff --git a/dev-util/rbtools/rbtools-0.6.2.ebuild b/dev-util/rbtools/rbtools-0.6.2.ebuild
index c8000c512abd..92f99b202cf9 100644
--- a/dev-util/rbtools/rbtools-0.6.2.ebuild
+++ b/dev-util/rbtools/rbtools-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.6.2.ebuild,v 1.1 2014/07/07 17:25:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rbtools/rbtools-0.6.2.ebuild,v 1.2 2014/08/14 16:46:09 phajdan.jr 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/valgrind/valgrind-3.9.0.ebuild b/dev-util/valgrind/valgrind-3.9.0.ebuild
index 8c3e29815a77..e03cc522b3e4 100644
--- a/dev-util/valgrind/valgrind-3.9.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.9.0.ebuild,v 1.2 2014/04/15 13:32:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.9.0.ebuild,v 1.3 2014/08/14 16:12:11 phajdan.jr Exp $
 
 EAPI="4"
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -11,7 +11,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="mpi"
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/watchr/watchr-0.7.ebuild b/dev-util/watchr/watchr-0.7.ebuild
index 27cac264efe9..98810c32e877 100644
--- a/dev-util/watchr/watchr-0.7.ebuild
+++ b/dev-util/watchr/watchr-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/watchr/watchr-0.7.ebuild,v 1.1 2012/01/15 18:05:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/watchr/watchr-0.7.ebuild,v 1.2 2014/08/14 13:59:15 mrueg Exp $
 
-EAPI=2
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 4ac77adfb214..529b582d28ac 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1 +1,2 @@
 DIST cvs-fast-export-1.0.tar.gz 96414 SHA256 e5eff5a153621d14e2edf1548b5c2a2de3a2c76f41c7940f9f1f8ecb4a736ae3 SHA512 150bdfa4d8f71096588d166df071e010a196695b3e4fb71c98a66689a22b2011f15e95bcb2cc4202639a9e245af5e36cf6c275f167fb0b554a64e9f84a5f9bc9 WHIRLPOOL 4b0468389ff068463efd076b7f4e4db63924b19bbbd5ba3259d0755b844ea74ac44fc87ab742ddb072644f1a9309b9d467d2fb3087eef2cfd122886954d2e18f
+DIST cvs-fast-export-1.14.tar.gz 101982 SHA256 e2a4ecc9c39bbb75301eeaf0857e11ba25a02414d680edd126eb01e1cfe697a4 SHA512 375b1288f7626cd117cdd127996463f0174250bd13c9db875d47b2b5cefa5a000cf309a714d58a922c6078f9d56a3fcb42edb6d652c1fb26965b6edc6e37e7f4 WHIRLPOOL 73260f65e5ddd1d032e09ee8862458faf77c34df980541e172cfdcef134bf707fe4891899b2bf526057ebca579423326f2befcdb6bbbcae32755b40efb3bb335
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.14.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.14.ebuild
new file mode 100644
index 000000000000..ff34bdd4ba7e
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs-fast-export/cvs-fast-export-1.14.ebuild,v 1.1 2014/08/13 19:29:59 slyfox Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+RESTRICT=test # upstream does not ship them in tarball
+
+src_prepare() {
+	tc-export CC
+	export prefix=/usr
+
+	# respect CC, CFLAGS and LDFLAGS. don't install cvssync
+	sed \
+		-e 's/cc /$(CC) $(LDFLAGS) /' \
+		-e 's/^CFLAGS += -O/#&/' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-e 's/$(INSTALL).*cvssync/#&/g' \
+		-i Makefile || die
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
index 1d5aa70c3d2b..d1ffe1c38651 100644
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-flow/git-flow-0.4.1.ebuild,v 1.1 2014/03/22 15:49:16 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-flow/git-flow-0.4.1.ebuild,v 1.2 2014/08/14 17:01:45 phajdan.jr Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ https://github.com/bobthecow/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.t
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index bda5ca4c030e..5d2349c4f5e1 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1 +1,2 @@
 DIST hub-1.12.1.tar.gz 76174 SHA256 dd763fbd94edf824f8af0e115212d0b2a6ab6565ed79b1ea742fa24d94dfad62 SHA512 067812f7406653912246eb58bee5fc0cb599d42b970915bd2ed693921437656b947f462b918112ffbcccb364401c354388437d003901ef07daf9a65b56b460ff WHIRLPOOL 958dd83fd4f9676a0cee82e02b84e7f62c757020c88c01b83669ec62365696f5171ba01eb91785e5b6036deb0e3ac0aba3bbdd59803bf4ec7ebc117f51dcf905
+DIST hub-1.12.2.tar.gz 76584 SHA256 e9c49a98a4d90202c33f57d63c6191cd28f0e1d9d7cf54d0e655d3d9d3765e84 SHA512 bbcfec1444c9bde3423a95a885840f790d2251a94d714657d4ddde10c9250b38d0797df36ad70790f2556f4900c10a23f0a496164ee79d4a4cd693b6bcefe25d WHIRLPOOL 97aaaa4914273161df41e78473e5a75c62c2815c8c75e7a27b967479f935f04c6a11735e34c73ad59b9ea870187d49fb6c6d6f06a3d49476de3c43f8032ddbda
diff --git a/dev-vcs/hub/hub-1.12.1.ebuild b/dev-vcs/hub/hub-1.12.1.ebuild
index e34beeab7373..fd19f482809b 100644
--- a/dev-vcs/hub/hub-1.12.1.ebuild
+++ b/dev-vcs/hub/hub-1.12.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-1.12.1.ebuild,v 1.1 2014/05/29 16:01:54 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-1.12.1.ebuild,v 1.2 2014/08/14 13:53:39 mrueg Exp $
 
 EAPI="5"
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 RUBY_FAKEGEM_TASK_DOC=
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-vcs/hub/hub-1.12.2.ebuild b/dev-vcs/hub/hub-1.12.2.ebuild
new file mode 100644
index 000000000000..528b730795fe
--- /dev/null
+++ b/dev-vcs/hub/hub-1.12.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-1.12.2.ebuild,v 1.2 2014/08/14 13:53:39 mrueg Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19"
+RUBY_FAKEGEM_TASK_DOC=
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit readme.gentoo ruby-fakegem
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/webmock
+		dev-util/cucumber
+		virtual/ruby-minitest
+	)"
+
+DESCRIPTION="command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+RDEPEND="dev-vcs/git"
+
+DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
+
+all_ruby_prepare() {
+	sed -i -e 's/Minitest/MiniTest/g' test/*.rb
+}
+
+src_install() {
+	ruby-ng_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index a89f6aacc7fb..851fea5e6488 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,4 +1,4 @@
-DIST subversion-1.7.14.tar.bz2 6045932 SHA256 c4ac8f37eb0ebd38901bfa6f1c7e4d7716d32d7460ee0cee520381ca2f5b120d SHA512 cc7df3a2d258cda65a3fefc1fb9bcc91f78ec817c8d32e561eae7cf59de3d1d5c843594150b63c60c724e4b3df88da319763f814f418d106461adcc78b323840 WHIRLPOOL 21d879775ed0bed15d17b83070eb26269f8d3cc0420be54e0d326b7b6f410b9fee11d2f8d2926f930c66c66a47a6396275ddf20120436b978c0a318bb963f0e0
 DIST subversion-1.7.17.tar.bz2 6008028 SHA256 2a66e4c5d2a8a919914a2e75f76467ef5457d0f96efc1e1c080fa02675867be3 SHA512 60760d9c2d01dcb664b545611e5ac5bb400154568eb811392c7903b223296d8f4e52d5154cfcb5b2e91d39de262c2ad958385190b87458f387fb38e5f3d2eaea WHIRLPOOL 20604f31589aa2fa2eff1869d7af7e80c4cf4fccd40c9d9bd1af8d1628171a381452796d38bc86ccafbf38232a6194d747b6c271f49064f2a361101edb73de00
+DIST subversion-1.7.18.tar.bz2 6096031 SHA256 f67381ce62b69bdb373e4c38ff84576677316904753536a78630603cacc5d91a SHA512 7a73b262701f7df6bc61acec4a38e8f6a04ff923a4b21669dba62d5357eb6ebce9e47d044d246ed9889eeefc6413569b5e4ee0f53cc9e78f8d24edb30e47f1a3 WHIRLPOOL b5bc15b8ae805659abbbc3f00f052f0b25f030a05a2ca5a60ee5e884b8dac6ff800a8c8d73b374c5c4f64df0fe17628a43f81e10047134a2ffef241c9a5ee90f
 DIST subversion-1.8.10.tar.bz2 6899384 SHA256 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc SHA512 a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 WHIRLPOOL bff8ce6509263a6de6a19d135c96f50f4bba24c539a3d0a7300b547c8a264ddd6d3ba38b78680a9dceb171306819ca2835f00d1cf4afa7a9001ae104567c4022
 DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf
diff --git a/dev-vcs/subversion/subversion-1.7.14.ebuild b/dev-vcs/subversion/subversion-1.7.18.ebuild
similarity index 97%
rename from dev-vcs/subversion/subversion-1.7.14.ebuild
rename to dev-vcs/subversion/subversion-1.7.18.ebuild
index d48df6b26496..ffe01b0e02fd 100644
--- a/dev-vcs/subversion/subversion-1.7.14.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.18.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.14.ebuild,v 1.12 2014/06/10 00:52:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.18.ebuild,v 1.1 2014/08/14 16:54:14 tommy Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 MY_P="${P/_/-}"
+GENTOO_DEPEND_ON_PERL="no"
 
 inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
 
@@ -17,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
index c6792bd58925..6f9d6efb9d0b 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild,v 1.2 2014/05/15 16:19:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.8.3.2.ebuild,v 1.3 2014/08/14 16:45:19 phajdan.jr Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://launchpad.net/armagetronad/${PV:0:5}/${PV}/+download/armagetrona
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="dedicated sound"
 
 RDEPEND="
diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest
index 53f40d0dd73c..458d0ab61f77 100644
--- a/games-arcade/burgerspace/Manifest
+++ b/games-arcade/burgerspace/Manifest
@@ -1,2 +1 @@
-DIST burgerspace-1.9.1.tar.gz 488051 SHA256 40a4097501e385ca14ed2314a66832716ca1f6bff022d4a579685a56d1b77c8b SHA512 6791e32ad05f592c062b81a6833ca30c64d6ba11c357aec0d39b2ad78944badfeefed4361188f6160d20737afd3422b07f977a70fa921478bd79fe5c189c4665 WHIRLPOOL eb355c63d866fca4417e5dd74b18bf35ec8b2c60bb287c60fb12c2827cc63b195b624429bdfeb581d3257294f9ac287724c06c380023c1f8239bd0b88f0ebcc8
 DIST burgerspace-1.9.2.tar.gz 505314 SHA256 34b0feccf543b11f9f9a182203d67cd453675255fed4b745e4e74c121b211bf2 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee WHIRLPOOL a164c6a8a6c7e0aaad1e427bd88103a03260fa77b4d05ee8d9af72d468f7744c7cf212f2e8431b7529c82106ce3334eaff75983e7a437fa5658f1d9d7d96010d
diff --git a/games-arcade/burgerspace/burgerspace-1.9.1.ebuild b/games-arcade/burgerspace/burgerspace-1.9.1.ebuild
deleted file mode 100644
index bfda2229bd8d..000000000000
--- a/games-arcade/burgerspace/burgerspace-1.9.1.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/games-arcade/burgerspace/burgerspace-1.9.1.ebuild,v 1.4 2012/12/06 04:21:29 phajdan.jr Exp $
-
-EAPI=2
-inherit autotools games
-
-DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/burgerspace.html"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="network"
-RESTRICT="test"  # doesn't really test anything
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am \
-		|| die "sed failed"
-	sed -i \
-		-e "/Categories/s:Application;::" \
-		-e "/Icon/s:\..*::" \
-		-e "/Terminal/s:0:false:" \
-		src/burgerspace.desktop.in \
-		|| die "sed failed"
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		$(use_with network)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install || die "emake install failed"
-	doman doc/${PN}.6
-	dodoc AUTHORS NEWS README THANKS
-	prepgamesdirs
-}
diff --git a/games-arcade/gnujump/gnujump-1.0.8.ebuild b/games-arcade/gnujump/gnujump-1.0.8.ebuild
index 73b79052343b..a675845094ff 100644
--- a/games-arcade/gnujump/gnujump-1.0.8.ebuild
+++ b/games-arcade/gnujump/gnujump-1.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnujump/gnujump-1.0.8.ebuild,v 1.1 2013/04/26 01:03:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gnujump/gnujump-1.0.8.ebuild,v 1.2 2014/08/14 04:19:15 mr_bones_ Exp $
 
-EAPI=2
-inherit eutils games
+EAPI=5
+inherit eutils flag-o-matic games
 
 DESCRIPTION="Xjump clone with added features"
 HOMEPAGE="http://gnujump.es.gnu.org"
@@ -14,15 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl
+DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
 	virtual/opengl
 	x11-libs/libX11"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	append-libs -lm
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
+	DOCS=( AUTHORS ChangeLog README )
+	default
 
 	newicon skins/xjump/hero1.0.png ${PN}.png
 	make_desktop_entry ${PN} "GNUjump"
diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
index a8828faa52ba..ed239540eec2 100644
--- a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
+++ b/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild,v 1.2 2014/05/15 16:35:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild,v 1.3 2014/08/14 16:41:38 phajdan.jr Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="qt4 +sdl"
 REQUIRED_USE="|| ( qt4 sdl )"
 
diff --git a/games-emulation/pcsxr/metadata.xml b/games-emulation/pcsxr/metadata.xml
index 8d5de1e77802..f8bb87dde512 100644
--- a/games-emulation/pcsxr/metadata.xml
+++ b/games-emulation/pcsxr/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
diff --git a/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild b/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild
new file mode 100644
index 000000000000..269a383fa5f1
--- /dev/null
+++ b/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsxr/pcsxr-1.9.94-r1.ebuild,v 1.1 2014/08/14 10:37:38 mgorny Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib versionator
+
+DESCRIPTION="PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator"
+HOMEPAGE="http://pcsxr.codeplex.com"
+# codeplex doesn't support direct downloads but GPL-2 doesn't mind me
+# mirroring it.
+SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.zip"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa cdio ffmpeg nls openal opengl oss pulseaudio +sdl"
+
+# pcsxr supports both SDL1 and SDL2 but uses the newer version installed
+# since SDL is not properly slotted in Gentoo, just fix it on SDL2
+
+RDEPEND="dev-libs/glib:2=
+	media-libs/libsdl:0=[joystick]
+	sys-libs/zlib:0=
+	x11-libs/gtk+:3=
+	x11-libs/libX11:0=
+	x11-libs/libXext:0=
+	x11-libs/libXtst:0=
+	x11-libs/libXv:0=
+	alsa? ( media-libs/alsa-lib:0= )
+	cdio? ( dev-libs/libcdio:0= )
+	ffmpeg? ( virtual/ffmpeg:0= )
+	nls? ( virtual/libintl:0= )
+	openal? ( media-libs/openal:0= )
+	opengl? ( virtual/opengl:0=
+		x11-libs/libXxf86vm:0= )
+	pulseaudio? ( media-sound/pulseaudio:0= )
+	sdl? ( media-libs/libsdl:0=[sound] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/intltool
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext:0 )
+	x86? ( dev-lang/nasm )"
+
+REQUIRED_USE="?? ( alsa openal oss pulseaudio sdl )"
+
+# it's only the .po file check that fails :)
+RESTRICT=test
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-disable-sdl2.patch
+	)
+
+	epatch "${PATCHES[@]}"
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	local sound_backend
+
+	if use alsa; then
+		sound_backend=alsa
+	elif use oss; then
+		sound_backend=oss
+	elif use pulseaudio; then
+		sound_backend=pulseaudio
+	elif use sdl; then
+		sound_backend=sdl
+	elif use openal; then
+		sound_backend=openal
+	else
+		sound_backend=null
+	fi
+
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable cdio libcdio)
+		$(use_enable opengl)
+		$(use_enable ffmpeg ccdda)
+		--enable-sound=${sound_backend}
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	dodoc doc/{keys,tweaks}.txt
+}
+
+pkg_postinst() {
+	local vr
+	for vr in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.94-r1 ${vr}; then
+			ewarn "Starting with pcsxr-1.9.94-r1, the plugin install path has changed."
+			ewarn "In order for pcsxr to find plugins, you will need to remove stale"
+			ewarn "symlinks from ~/.pcsxr/plugins. You can do this using the following"
+			ewarn "command (as your regular user):"
+			ewarn
+			ewarn " $ find ~/.pcsxr/plugins/ -type l -delete"
+		fi
+	done
+}
diff --git a/games-engines/gemrb/gemrb-0.8.1.ebuild b/games-engines/gemrb/gemrb-0.8.1.ebuild
index ef7815994df9..bf0eea309916 100644
--- a/games-engines/gemrb/gemrb-0.8.1.ebuild
+++ b/games-engines/gemrb/gemrb-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.8.1.ebuild,v 1.2 2014/07/25 16:42:08 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.8.1.ebuild,v 1.3 2014/08/14 16:54:34 phajdan.jr Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/freetype
diff --git a/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild b/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild
index acf0613e0069..3efad5ace43f 100644
--- a/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild,v 1.2 2014/05/15 16:46:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild,v 1.3 2014/08/14 16:30:09 phajdan.jr Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ unset UPDATE_I
 
 LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+curl debug dedicated openal +sdl server smp vorbis"
 RESTRICT="mirror"
 
diff --git a/games-misc/lolcat/lolcat-42.0.99-r1.ebuild b/games-misc/lolcat/lolcat-42.0.99-r1.ebuild
index 96ed32ed9c84..2fd76b3de8dc 100644
--- a/games-misc/lolcat/lolcat-42.0.99-r1.ebuild
+++ b/games-misc/lolcat/lolcat-42.0.99-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/lolcat/lolcat-42.0.99-r1.ebuild,v 1.3 2013/11/06 21:06:30 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/lolcat/lolcat-42.0.99-r1.ebuild,v 1.4 2014/08/14 13:57:55 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/games-mud/kmuddy/kmuddy-1.0.1-r2.ebuild b/games-mud/kmuddy/kmuddy-1.0.1-r2.ebuild
deleted file mode 100644
index 3db83a3321fa..000000000000
--- a/games-mud/kmuddy/kmuddy-1.0.1-r2.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/games-mud/kmuddy/kmuddy-1.0.1-r2.ebuild,v 1.5 2012/11/14 12:33:33 scarabeus Exp $
-
-EAPI=4
-
-KDE_LINGUAS="es"
-KDE_DOC_DIRS="doc/${PN}"
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION="MUD client for KDE"
-HOMEPAGE="http://www.kmuddy.com/"
-SRC_URI="http://www.kmuddy.com/releases/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-DOC=( AUTHORS README CHANGELOG Scripting-HOWTO TODO DESIGN )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-{gcc,kde}45.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-	"${FILESDIR}"/${P}-tempnam.patch
-	"${FILESDIR}"/${P}-desktopvalidation.patch
-)
-src_configure() {
-	# not in portage yet
-	local mycmakeargs=(
-		-DWITH_MXP=OFF
-	)
-	kde4-base_src_configure
-}
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index b84e9a547b1f..eb35ca9e1e22 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,4 +1 @@
-DIST tomenet-4.5.3a.tar.bz2 2691503 SHA256 932228ec512a5e96cb9a924f61dc647215094aa7b122ff46a938ae5bc7e2a5bb SHA512 5e7b0df46be2285b8f8b2418e1ae53cc433c74fef8ecd49323fe2554bc9cccc9c92bbc4c6b28f37b67e81da5ecd8e8fc9cca2c6d4e988879633cd6eff80bbdc5 WHIRLPOOL b3bd756141471502bb87a5020f5e03c6d4081d2864fda46c80c13f06fc3bec638b0a8ce3de51151de252a10d94345b89f7c62465542d5eff76404f839bb2023a
-DIST tomenet-4.5.3b.tar.bz2 2713170 SHA256 a521a70104fec13d2c2b192024e0565f2294dbb11c228b8d14763ce99a5a6f0b SHA512 a87829ea35cbda6422f81646c3f79c6f5266f031dbbd21545184f6d8b4dac4cee741be10481cdced7ba6c49606bb589d98d98d43e9c535df9eddbad81175ad50 WHIRLPOOL 0bb717b9a3d87cd90d296b14e2e639b03bf4a7e07a38f28f21b3d60143024318ade795144f708d107c45e725bd96747dd3eea44c4299dd627bdf8a1f591eb3e9
-DIST tomenet-4.5.4.tar.bz2 2740555 SHA256 3bb8955619f3da571c7982d323cae837203dfd30eb65a508f678efae2ac40f70 SHA512 05ed8738abeb597993d6f43ff73efd98bb65413ae16b66d284b478646900afd96e36cbbfc602697c7c31fa697d546f375a477c278951560c8ff75af611342a19 WHIRLPOOL 553fdde619a39d52509cfde6a309ecd650263aaa9da42266a12af51c30561ec73e9e0969e0cff93e676b34008d399be23fa9eabac7732f854b2518d8f9a36626
 DIST tomenet-4.5.5.tar.bz2 2787559 SHA256 788a3dbbcb24ad747763a1ff4e80d859d521ac29df3da1d33842e5c39ecbd197 SHA512 2908783062058dfc8c6a29e8a13c658f9222e95b01add3749cfe3cd9edc8ed3478c273bf0963668e8a5b53a6119aa2979a5eb0d50dd386c0b87436ab7be57536 WHIRLPOOL 75d731785deaf31e52986e35faeccc5b4486641b441ad37c367986a800dacd69286104dd22c8fc7ff389f8807826e6cd290b6831d27df7482c23efca1ee83881
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.3a-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.3a-makefile.patch
deleted file mode 100644
index 318fc6997b87..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.5.3a-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/makefile
-+++ src/makefile
-@@ -203,7 +203,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
- 
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -256,8 +266,9 @@
- # attempt to "guess" at many of these flags based on your system.
- #
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags`
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-+LIBS += -L/usr/pkg/lib -lncurses -lcrypt -lm ${SDL_LIBS}
- ##
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-@@ -357,9 +368,6 @@
- # Compile a client with 'test client' version/tag
- tomenet.test: CFLAGS += -DTEST_CLIENT -O0
- 
--# Normal release build
--tomenet: CFLAGS += -O2
--
- 
- # Lua
- SRCS += $(LUASRCS)
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.3b-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.3b-makefile.patch
deleted file mode 100644
index 318fc6997b87..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.5.3b-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/makefile
-+++ src/makefile
-@@ -203,7 +203,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
- 
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -256,8 +266,9 @@
- # attempt to "guess" at many of these flags based on your system.
- #
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags`
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-+LIBS += -L/usr/pkg/lib -lncurses -lcrypt -lm ${SDL_LIBS}
- ##
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-@@ -357,9 +368,6 @@
- # Compile a client with 'test client' version/tag
- tomenet.test: CFLAGS += -DTEST_CLIENT -O0
- 
--# Normal release build
--tomenet: CFLAGS += -O2
--
- 
- # Lua
- SRCS += $(LUASRCS)
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.4-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.4-makefile.patch
deleted file mode 100644
index 318fc6997b87..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.5.4-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/makefile
-+++ src/makefile
-@@ -203,7 +203,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
- 
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -256,8 +266,9 @@
- # attempt to "guess" at many of these flags based on your system.
- #
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags`
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-+LIBS += -L/usr/pkg/lib -lncurses -lcrypt -lm ${SDL_LIBS}
- ##
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
-@@ -357,9 +368,6 @@
- # Compile a client with 'test client' version/tag
- tomenet.test: CFLAGS += -DTEST_CLIENT -O0
- 
--# Normal release build
--tomenet: CFLAGS += -O2
--
- 
- # Lua
- SRCS += $(LUASRCS)
diff --git a/games-roguelike/tomenet/tomenet-4.5.3a.ebuild b/games-roguelike/tomenet/tomenet-4.5.3a.ebuild
deleted file mode 100644
index 6b8e2405092c..000000000000
--- a/games-roguelike/tomenet/tomenet-4.5.3a.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.3a.ebuild,v 1.2 2014/05/15 16:56:38 ulm Exp $
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="http://www.tomenet.net/"
-SRC_URI="http://www.tomenet.net/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-DEPEND="sys-libs/ncurses
-	!dedicated? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-RDEPEND="${DEPEND}
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
-	sed \
-		-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server || use dedicated ; then
-		sed \
-			-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if ! use dedicated ; then
-		newgamesbin ${PN} ${PN}.bin
-		dogamesbin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		newgamesbin tomenet.server tomenet.server.bin
-		dogamesbin "${T}"/${PN}.server accedit evilmeta
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  http://tomenet.net/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/tomenet/tomenet-4.5.3b.ebuild b/games-roguelike/tomenet/tomenet-4.5.3b.ebuild
deleted file mode 100644
index 9a7099c76755..000000000000
--- a/games-roguelike/tomenet/tomenet-4.5.3b.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.3b.ebuild,v 1.2 2014/05/15 16:56:38 ulm Exp $
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="http://www.tomenet.net/"
-SRC_URI="http://www.tomenet.net/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-DEPEND="sys-libs/ncurses
-	!dedicated? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-RDEPEND="${DEPEND}
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
-	sed \
-		-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server || use dedicated ; then
-		sed \
-			-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if ! use dedicated ; then
-		newgamesbin ${PN} ${PN}.bin
-		dogamesbin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		newgamesbin tomenet.server tomenet.server.bin
-		dogamesbin "${T}"/${PN}.server accedit evilmeta
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  http://tomenet.net/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/tomenet/tomenet-4.5.4.ebuild b/games-roguelike/tomenet/tomenet-4.5.4.ebuild
deleted file mode 100644
index d21400d3fb7b..000000000000
--- a/games-roguelike/tomenet/tomenet-4.5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.4.ebuild,v 1.2 2014/05/15 16:56:38 ulm Exp $
-
-EAPI=5
-inherit eutils gnome2-utils games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="http://www.tomenet.net/"
-SRC_URI="http://www.tomenet.net/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-DEPEND="sys-libs/ncurses
-	!dedicated? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-RDEPEND="${DEPEND}
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
-	sed \
-		-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server || use dedicated ; then
-		sed \
-			-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server evilmeta" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if ! use dedicated ; then
-		newgamesbin ${PN} ${PN}.bin
-		dogamesbin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		newgamesbin tomenet.server tomenet.server.bin
-		dogamesbin "${T}"/${PN}.server accedit evilmeta
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  http://tomenet.net/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
index 9ceb48cdd3a2..d5fdcb9b3de5 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.3 2014/06/09 15:40:46 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.4 2014/08/14 16:42:35 phajdan.jr Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
 
 # yes, cunit is rdep
diff --git a/games-util/vispatch/vispatch-1.4.6.ebuild b/games-util/vispatch/vispatch-1.4.6.ebuild
index 185efa9226f3..097dd7f1f0ae 100644
--- a/games-util/vispatch/vispatch-1.4.6.ebuild
+++ b/games-util/vispatch/vispatch-1.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/vispatch/vispatch-1.4.6.ebuild,v 1.1 2013/01/27 04:52:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/vispatch/vispatch-1.4.6.ebuild,v 1.2 2014/08/14 17:04:37 phajdan.jr Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vispatch/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${P}/source
diff --git a/kde-misc/kanyremote/kanyremote-6.3.2.ebuild b/kde-misc/kanyremote/kanyremote-6.3.2.ebuild
index 184f764a7a96..d1e04ee48478 100644
--- a/kde-misc/kanyremote/kanyremote-6.3.2.ebuild
+++ b/kde-misc/kanyremote/kanyremote-6.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.3.2.ebuild,v 1.1 2014/06/01 09:44:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kanyremote/kanyremote-6.3.2.ebuild,v 1.2 2014/08/14 17:08:27 phajdan.jr 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/kde-misc/networkmanagement/Manifest b/kde-misc/networkmanagement/Manifest
index 2d2b511e8665..95aee23e2eb9 100644
--- a/kde-misc/networkmanagement/Manifest
+++ b/kde-misc/networkmanagement/Manifest
@@ -1,2 +1 @@
-DIST networkmanagement-0.9.0.10.tar.xz 1184588 SHA256 dce8d080256f1c2a6b70d61cb46e623839f6c0a0f260a6901d9ad68746ce7dfc SHA512 936f155d7edb47b6d4852b2d87eb32c99a45e61b0083d74dc599e231febc233f4f3b50aa330d852b97227f0427db681290efa657818e056a659689a1dd4baccb WHIRLPOOL d39947fb97ebc07bbd1cab214d231f07ef1a2f0c4e4fbc7d719b73a6ac206cd2aa9979516adf4041678c197d3d37f01ec63b0bbb571c31401a639ae88e7d5e0e
 DIST networkmanagement-0.9.0.11.tar.xz 1194216 SHA256 51f4f4d82d2475338f90bea7177d8cec92c9635809f4d5764c815e4ca3a6d33c SHA512 d1c7c7702f25e88db4a680f7131e4981b6bc0a5d29359d6a4ccbd35f60fd2fcdae0db4c2621315056696c63bbe29bdc5ed071f17d7e94d10cd6440e0a2435e98 WHIRLPOOL 16fb27467421f7d57c2920384a47fd0e074200e2ae4bc5820911351d41ccc72f5e2f1ac04d9934db38cfef334a970fceac97caf329a8c89fbbd6931a8a9a48e9
diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.10.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.10.ebuild
deleted file mode 100644
index a7dcb7c47b55..000000000000
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.10.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/kde-misc/networkmanagement/networkmanagement-0.9.0.10.ebuild,v 1.4 2014/04/23 21:40:14 mrueg Exp $
-
-EAPI=5
-
-KDE_LINGUAS="ar bs ca cs da de el es et fa fi fr ga gl hu ia it ja kk km ko lt
-mr nb nds nl nn pl pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin
-sr@Latn sv tr uk zh_CN zh_TW"
-KDE_SCM="git"
-KDE_MINIMAL="4.11"
-inherit kde4-base
-
-DESCRIPTION="KDE frontend for NetworkManager"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/networkmanagement"
-[[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug openconnect"
-
-DEPEND="
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.9.6
-	openconnect? ( <net-misc/openconnect-5.99 )
-"
-RDEPEND="${DEPEND}
-	!kde-base/solid
-	!kde-misc/plasma-nm
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with openconnect)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.11.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.11.ebuild
index e94dd214d1b7..4c77c6c1ba63 100644
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.11.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.11.ebuild,v 1.2 2014/04/24 07:26:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.11.ebuild,v 1.4 2014/08/14 17:05:48 phajdan.jr Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://projects.kde.org/projects/extragear/base/networkmanagement"
 [[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="debug openconnect"
 
diff --git a/mail-client/geary/geary-0.6.1.ebuild b/mail-client/geary/geary-0.6.1.ebuild
index c99b469123d0..0adaed7336a2 100644
--- a/mail-client/geary/geary-0.6.1.ebuild
+++ b/mail-client/geary/geary-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.6.1.ebuild,v 1.1 2014/07/06 11:48:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.6.1.ebuild,v 1.2 2014/08/14 16:20:58 phajdan.jr Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/geary/${PV:0:3}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
index 471059908b2f..456497017c4a 100644
--- a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild,v 1.4 2014/08/08 09:40:27 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild,v 1.5 2014/08/14 16:17:22 phajdan.jr Exp $
 
 EAPI=5
 inherit autotools db-use eutils systemd user
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
diff --git a/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch b/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch
new file mode 100644
index 000000000000..615c6e5b77d1
--- /dev/null
+++ b/mail-filter/postgrey/files/postgrey-1.34-perl-5.18.patch
@@ -0,0 +1,33 @@
+From 9673b54064691a5b9c295ffea340d8a1f9ee1cb8 Mon Sep 17 00:00:00 2001
+From: Yasuhiro KIMURA <yasu@utahime.org>
+Date: Sat, 17 Aug 2013 22:05:27 +0900
+Subject: [PATCH] Make postgrey work with Perl 5.18
+
+---
+ postgrey | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/postgrey b/postgrey
+index 7cb0352..37f69bd 100755
+--- a/postgrey
++++ b/postgrey
+@@ -557,6 +557,16 @@ sub main()
+     if($opt{dbdir}) {
+         $opt{dbdir} =~ /^(.*)$/; $opt{dbdir} = $1;
+     }
++    # untaint what is given on --pidfile. It is not security sensitive since
++    # it is provided by the admin
++    if($opt{pidfile}) {
++        $opt{pidfile} =~ /^(.*)$/; $opt{pidfile} = $1;
++    }
++    # untaint what is given on --inet. It is not security sensitive since
++    # it is provided by the admin
++    if($opt{inet}) {
++        $opt{inet} =~ /^(.*)$/; $opt{inet} = $1;
++    }
+ 
+     # determine proper "logsock" for Sys::Syslog
+     my $syslog_logsock;
+-- 
+2.0.3
+
diff --git a/mail-filter/postgrey/files/postgrey-1.34-r3.rc.new b/mail-filter/postgrey/files/postgrey-1.34-r3.rc.new
new file mode 100644
index 000000000000..4a4626e6a226
--- /dev/null
+++ b/mail-filter/postgrey/files/postgrey-1.34-r3.rc.new
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey-1.34-r3.rc.new,v 1.1 2014/08/13 14:10:06 hasufell Exp $
+
+conf="/etc/conf.d/postgrey"
+
+extra_started_commands="reload"
+
+depend() {
+	need net
+	before postfix
+	provide postfix_greylist
+}
+
+conf_error() {
+	eerror "You need to setup ${conf} first"
+	return 1
+}
+
+checkconfig() {
+if [ -z "${POSTGREY_TYPE}" ]
+	then
+		einfo "You need to choose the server type you want"
+		einfo "by setting the POSTGREY_TYPE variable in ${conf}."
+	else
+	if [ "x${POSTGREY_TYPE}" = "xinet" ]
+		then
+			if [ -z "${POSTGREY_PORT}" ] || [ -z "${POSTGREY_HOST}" ]
+				then
+					einfo "The following entries are missing in ${conf}:"
+					[ -z "${POSTGREY_HOST}" ] && einfo "  - POSTGREY_HOST"
+					[ -z "${POSTGREY_PORT}" ] && einfo "  - POSTGREY_PORT"
+					conf_error
+			fi
+			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_HOST}:${POSTGREY_PORT}"
+		else
+			if [ -z "${POSTGREY_SOCKET}" ]
+			then
+				einfo "The following entries are missing in ${conf}:"
+				[ -z "${POSTGREY_SOCKET}" ] && einfo "  - POSTGREY_SOCKET"
+				conf_error
+			fi
+			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_SOCKET}"
+	fi
+fi
+
+	if [ -z "${POSTGREY_PID}" ]
+		then
+		einfo "The following entries are missing in ${conf}:"
+		[ -z "${POSTGREY_PID}" ] && einfo "  - POSTGREY_PID"
+		conf_error
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting Postgrey"
+
+	# HACK -- start a subshell and corrects perms on the socket...
+	if [ "x${POSTGREY_TYPE}" = "xunix" ]; then
+		rm -f ${POSTGREY_SOCKET}
+		( while ! test -S ${POSTGREY_SOCKET}; do sleep 1; done; chmod a+rw,a-x ${POSTGREY_SOCKET} ) &
+	fi
+
+	if [ -z ${POSTGREY_DELAY} ] ; then
+		POSTGREY_DELAY_ARG=""
+	else
+		POSTGREY_DELAY_ARG="--delay=${POSTGREY_DELAY}"
+	fi
+
+	if [ -z "${POSTGREY_TEXT}" ] ; then
+		POSTGREY_TEXT_ARG=""
+	else
+		POSTGREY_TEXT_ARG="--greylist-text=${POSTGREY_TEXT}"
+	fi
+
+	start-stop-daemon --start --quiet --background \
+		--pidfile=${POSTGREY_PID} \
+		--name postgrey \
+		--exec /usr/sbin/postgrey -- \
+		--${POSTGREY_ADDR} \
+		--daemonize \
+		--pidfile=${POSTGREY_PID} \
+		${POSTGREY_DELAY_ARG} \
+		${POSTGREY_OPTS} \
+		"${POSTGREY_TEXT_ARG}"
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping Postgrey"
+	start-stop-daemon --stop --quiet --pidfile ${POSTGREY_PID}
+	eend ${?}
+}
+
+reload() {
+	ebegin "Reloading Postgrey"
+	start-stop-daemon --stop --signal HUP --oknodo --pidfile ${POSTGREY_PID}
+	eend $?
+}
diff --git a/mail-filter/postgrey/postgrey-1.34-r3.ebuild b/mail-filter/postgrey/postgrey-1.34-r3.ebuild
new file mode 100644
index 000000000000..b140c77988f0
--- /dev/null
+++ b/mail-filter/postgrey/postgrey-1.34-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.34-r3.ebuild,v 1.1 2014/08/13 14:10:06 hasufell Exp $
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
+HOMEPAGE="http://postgrey.schweikert.ch/"
+SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
+	http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="targrey"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.6.0
+	dev-perl/net-server
+	dev-perl/IO-Multiplex
+	dev-perl/BerkeleyDB
+	dev-perl/Net-DNS
+	dev-perl/Parse-Syslog
+	dev-perl/Net-RBLClient
+	>=sys-libs/db-4.1"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	if use targrey ; then
+		epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch
+	fi
+	epatch "${FILESDIR}"/${P}-perl-5.18.patch
+	# bug 479400
+	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
+}
+
+src_install() {
+	# postgrey data/DB in /var
+	diropts -m0770 -o ${PN} -g ${PN}
+	dodir /var/spool/postfix/${PN}
+	keepdir /var/spool/postfix/${PN}
+	fowners postgrey:postgrey /var/spool/postfix/${PN}
+	fperms 0770 /var/spool/postfix/${PN}
+
+	# postgrey binary
+	dosbin ${PN}
+	dosbin contrib/postgreyreport
+
+	# policy-test script
+	dosbin policy-test
+
+	# postgrey data in /etc/postfix
+	insinto /etc/postfix
+	insopts -o root -g ${PN} -m 0640
+	doins postgrey_whitelist_clients postgrey_whitelist_recipients
+
+	# documentation
+	dodoc Changes README
+
+	# init.d + conf.d files
+	insopts -o root -g root -m 755
+	newinitd "${FILESDIR}"/${PF}.rc.new ${PN}
+	insopts -o root -g root -m 640
+	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
+}
diff --git a/mail-filter/postgrey/postgrey-1.35-r1.ebuild b/mail-filter/postgrey/postgrey-1.35-r1.ebuild
new file mode 100644
index 000000000000..ec054655e15d
--- /dev/null
+++ b/mail-filter/postgrey/postgrey-1.35-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.35-r1.ebuild,v 1.1 2014/08/13 14:10:06 hasufell Exp $
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
+HOMEPAGE="http://postgrey.schweikert.ch/"
+SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
+http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="targrey"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.6.0
+	dev-perl/net-server
+	dev-perl/IO-Multiplex
+	dev-perl/BerkeleyDB
+	dev-perl/Net-DNS
+	dev-perl/Parse-Syslog
+	dev-perl/Net-RBLClient
+	virtual/perl-Digest-SHA
+	>=sys-libs/db-4.1"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_prepare() {
+	if use targrey ; then
+		epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch
+	fi
+	# bug 479400
+	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
+}
+
+src_install() {
+	# postgrey data/DB in /var
+	diropts -m0770 -o ${PN} -g ${PN}
+	dodir /var/spool/postfix/${PN}
+	keepdir /var/spool/postfix/${PN}
+	fowners postgrey:postgrey /var/spool/postfix/${PN}
+	fperms 0770 /var/spool/postfix/${PN}
+
+	# postgrey binary
+	dosbin ${PN}
+	dosbin contrib/postgreyreport
+
+	# policy-test script
+	dosbin policy-test
+
+	# postgrey data in /etc/postfix
+	insinto /etc/postfix
+	insopts -o root -g ${PN} -m 0640
+	doins postgrey_whitelist_clients postgrey_whitelist_recipients
+
+	# documentation
+	dodoc Changes README README.exim
+
+	# init.d + conf.d files
+	insopts -o root -g root -m 755
+	newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN}
+	insopts -o root -g root -m 640
+	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
+}
diff --git a/media-gfx/argyllcms/argyllcms-1.6.3.ebuild b/media-gfx/argyllcms/argyllcms-1.6.3.ebuild
index 19105796f050..9fb7e032811a 100644
--- a/media-gfx/argyllcms/argyllcms-1.6.3.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.6.3.ebuild,v 1.2 2014/08/13 12:40:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.6.3.ebuild,v 1.3 2014/08/14 12:40:00 jer Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 hppa ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-gfx/printrun/metadata.xml b/media-gfx/printrun/metadata.xml
index 6754e96e0473..28b182afe8ca 100644
--- a/media-gfx/printrun/metadata.xml
+++ b/media-gfx/printrun/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>3dprint</herd>
 <maintainer>
 	<email>amynka@gentoo.org</email>
 </maintainer>
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 5f600ca039cb..2b7f9ab1d42c 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/svg2rlg/svg2rlg-0.3.ebuild,v 1.4 2014/08/03 18:24:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/svg2rlg/svg2rlg-0.3.ebuild,v 1.5 2014/08/13 18:36:52 blueness Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-libs/jasper/jasper-1.900.1-r6.ebuild b/media-libs/jasper/jasper-1.900.1-r6.ebuild
index cdc1b849974b..307553c04ca7 100644
--- a/media-libs/jasper/jasper-1.900.1-r6.ebuild
+++ b/media-libs/jasper/jasper-1.900.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r6.ebuild,v 1.7 2014/07/24 19:27:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r6.ebuild,v 1.8 2014/08/14 17:03:38 phajdan.jr Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="JasPer2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg opengl static-libs"
 
 RDEPEND="
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 2ce7c9031566..26dcefcceead 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,3 +1 @@
-DIST libmodplug-0.8.8.2.tar.gz 517938 SHA256 6dedf79713f7ab75258c097a8749dab9127c81692858dab5295eef504ea61705
-DIST libmodplug-0.8.8.4.tar.gz 546319 SHA256 5c5ee13dddbed144be26276e5f102da17ff5b1c992f3100389983082da2264f7 SHA512 60ef0d1cdcb7a7ba085155487026c128cb7720fcfad16decdf4513a4e4f26a33854044d7da8e25443543d547d599fd7348e72ce241bbacc7994c2560bcf750e3 WHIRLPOOL 96ca800fd14f180663ca35cc0659bf03b1dd66e5f1186d8cb94ee70b46803aa8fc66e1e5d91025707e77a34d4e8d904332fc104033222a60e5d62775a89be5d0
 DIST libmodplug-0.8.8.5.tar.gz 546751 SHA256 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad SHA512 aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332 WHIRLPOOL 00d88ffde88f9136274737bf63d6eca864935f24409f5f6cbe0679fcc962e890b9a5a68636dd20f0e44e070de71b8a804ef31cca78930d19004fd5148dfd736e
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.2.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.2.ebuild
deleted file mode 100644
index ff086265bca2..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.8.2.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/media-libs/libmodplug/libmodplug-0.8.8.2.ebuild,v 1.9 2012/05/05 08:02:32 jdhore Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Library for playing MOD-like music files"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e '/CXXFLAGS/s:-ffast-math::' \
-		configure.in || die
-
-	epatch "${FILESDIR}"/${PN}-0.8.4-timidity-patches.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.4-r1.ebuild
deleted file mode 100644
index a1014b2c8cca..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.8.4-r1.ebuild
+++ /dev/null
@@ -1,27 +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/libmodplug/libmodplug-0.8.8.4-r1.ebuild,v 1.6 2014/07/31 14:34:27 klausman Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="Library for playing MOD-like music files"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
-	"${FILESDIR}/${P}-no-fast-math.patch"
-)
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild
deleted file mode 100644
index fe3120720be4..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.4.ebuild,v 1.10 2012/05/15 13:12:50 aballier Exp $
-
-EAPI=4
-inherit autotools base
-
-DESCRIPTION="Library for playing MOD-like music files"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-PATCHES=(  "${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
-	   "${FILESDIR}/${P}-no-fast-math.patch" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
index 2e732a463a08..3c615ea6879c 100644
--- a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild,v 1.9 2014/08/10 17:27:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild,v 1.10 2014/08/13 15:20:38 maekke Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild
index 44101479c45c..bf24aa3eb61d 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild,v 1.3 2014/08/11 15:16:12 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/libmp3splt-0.9.1a.ebuild,v 1.4 2014/08/14 17:14:24 phajdan.jr Exp $
 
 EAPI=4
 inherit versionator autotools eutils multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="media-libs/libmad
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r100.ebuild b/media-libs/libsdl2/libsdl2-2.0.3-r100.ebuild
index 9ce5961ad4f0..35a376975e71 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3-r100.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3-r100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.3-r100.ebuild,v 1.1 2014/07/27 12:52:45 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl2/libsdl2-2.0.3-r100.ebuild,v 1.2 2014/08/14 16:14:13 phajdan.jr Exp $
 
 # TODO: convert FusionSound #484250
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio +sound sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/mlt/mlt-0.9.0.ebuild b/media-libs/mlt/mlt-0.9.0.ebuild
index 20fcba7ec1cd..3bc4e0172324 100644
--- a/media-libs/mlt/mlt-0.9.0.ebuild
+++ b/media-libs/mlt/mlt-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v 1.4 2014/06/22 15:46:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v 1.5 2014/08/14 17:17:13 phajdan.jr Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive libsamplerate melt
 mmx qt4 quicktime rtaudio sdl sse sse2 vorbis xine xml lua python ruby vdpau" # java perl php tcl
 IUSE="${IUSE} kernel_linux"
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index d9177464ef2e..b0f1eb1a7595 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>3dprint</herd>
 <maintainer>
 	<email>amynka@gentoo.org</email>
 </maintainer>
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index 1aa6645f8fa5..b01222d54f48 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.18 2014/07/31 08:37:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild,v 1.20 2014/08/14 15:05:22 johu Exp $
 
 EAPI=5
 
@@ -28,10 +28,11 @@ REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
 	dev-libs/glib:2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	media-plugins/gst-plugins-meta:0.10[alsa?,ogg,vorbis]
-	>=media-libs/phonon-4.7.0[qt4?,qt5?]
+	dev-libs/libxml2:2
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+	>=media-libs/phonon-4.7.80[qt4?,qt5?]
 	qt4? (
 		dev-qt/qtcore:4[glib]
 		dev-qt/qtgui:4[glib]
@@ -44,7 +45,7 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)
 	virtual/opengl
-	network? ( media-plugins/gst-plugins-soup:0.10 )
+	network? ( media-plugins/gst-plugins-soup:1.0 )
 "
 DEPEND="${RDEPEND}
 	qt4? ( >=dev-util/automoc-0.9.87 )
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index cf3d7913f456..6dbd214c5e0b 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1 +1 @@
-DIST Quarter-1.0.0.tar.gz 617534 SHA256 ed7a29856e2bdc9db20b7c4fa27c47af1bf325d62ef3700fccbc83476f41da1a
+DIST Quarter-1.0.0.tar.gz 617534 SHA256 ed7a29856e2bdc9db20b7c4fa27c47af1bf325d62ef3700fccbc83476f41da1a SHA512 ab7828889b612425c6341f69abaf6bc5c02ed5f918a5ad631ad9e0a6ecb9fd5800e08d091fd39bb05141e0db521d305471f66a3d14f149928add3f1d776e497b WHIRLPOOL cfb6f8d770449b7b00fa04c60f6607b87a4c5620a1b5363e46bdc3e62eb39ec42d6a0a7d1f793d96a7bc0d5af4db5c4c227219c4790fe6a9bd67241b8a44652c
diff --git a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
index 9c3a44c1b513..e0f422b4cd36 100644
--- a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
+++ b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch
@@ -1,6 +1,6 @@
-diff -ru ../Quarter-1.0.0/src/Quarter/Quarter.cpp ./src/Quarter/Quarter.cpp
---- ../Quarter-1.0.0/src/Quarter/Quarter.cpp	2009-01-26 22:47:07.000000000 +0100
-+++ ./src/Quarter/Quarter.cpp	2010-05-18 16:17:25.246880238 +0200
+diff -ruN Quarter-1.0.0/src/Quarter/Quarter.cpp my/src/Quarter/Quarter.cpp
+--- Quarter-1.0.0/src/Quarter/Quarter.cpp	2009-01-26 22:47:07.000000000 +0100
++++ my/src/Quarter/Quarter.cpp	2014-08-14 01:48:45.019728780 +0200
 @@ -123,6 +123,7 @@
    \subpage examiner
  */
diff --git a/media-libs/quarter/quarter-1.0.0-r1.ebuild b/media-libs/quarter/quarter-1.0.0-r1.ebuild
index d6d3ce6cf0f6..41f22741da5e 100644
--- a/media-libs/quarter/quarter-1.0.0-r1.ebuild
+++ b/media-libs/quarter/quarter-1.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0-r1.ebuild,v 1.5 2013/03/02 21:48:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0-r1.ebuild,v 1.6 2014/08/14 00:15:23 reavertm Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit base
+inherit autotools-utils
 
 MY_P="${P/q/Q}"
 
@@ -37,24 +37,13 @@ PATCHES=(
 DOCS=(AUTHORS NEWS README)
 
 src_configure() {
-	# Bug 336008
-	MAKEOPTS=-j1
-
-	econf \
-		htmldir="${ROOT}usr/share/doc/${PF}/html" \
-		--enable-pkgconfig \
-		--enable-shared \
-		--with-coin \
-		$(use_enable debug) \
-		$(use_enable debug symbols) \
-		$(use_enable doc html) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	base_src_install
-
-	# Do not install .la files
-	rm -f "${D}"/usr/lib*/qt4/plugins/designer/*.{la,a}
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
+	local myeconfargs=(
+		htmldir="${ROOT}usr/share/doc/${PF}/html"
+		--enable-pkgconfig
+		--with-coin
+		$(use_enable debug)
+		$(use_enable debug symbols)
+		$(use_enable doc html)
+	)
+	autotools-utils_src_configure
 }
diff --git a/media-radio/fldigi/fldigi-3.21.82.ebuild b/media-radio/fldigi/fldigi-3.21.82.ebuild
index 0b474918a82b..8e5a9f854080 100644
--- a/media-radio/fldigi/fldigi-3.21.82.ebuild
+++ b/media-radio/fldigi/fldigi-3.21.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.82.ebuild,v 1.1 2014/05/04 13:03:42 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.82.ebuild,v 1.2 2014/08/14 17:10:41 phajdan.jr Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="hamlib nls portaudio pulseaudio sndfile"
 
 RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-sound/kid3/kid3-3.1.ebuild b/media-sound/kid3/kid3-3.1.ebuild
index 384d9f991604..9aa27bd7eb82 100644
--- a/media-sound/kid3/kid3-3.1.ebuild
+++ b/media-sound/kid3/kid3-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-3.1.ebuild,v 1.1 2014/08/12 22:41:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-3.1.ebuild,v 1.2 2014/08/13 14:30:29 johu Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ RDEPEND="
 	mp4? ( media-libs/libmp4v2:0 )
 	phonon? ( || (
 		media-libs/phonon
-		dev-qt/qtphonon
+		dev-qt/qtphonon:4
 	) )
 	taglib? ( media-libs/taglib )
 	vorbis? (
diff --git a/media-sound/mp3splt/mp3splt-2.6.1a.ebuild b/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
index cbd5b58645ec..31fd743c9d98 100644
--- a/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.6.1a.ebuild,v 1.3 2014/08/11 15:16:46 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.6.1a.ebuild,v 1.4 2014/08/14 17:15:01 phajdan.jr Exp $
 
 EAPI=4
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="flac"
 
 RDEPEND="~media-libs/libmp3splt-0.9.1a[flac?]"
diff --git a/media-sound/rubyripper/rubyripper-0.6.2-r1.ebuild b/media-sound/rubyripper/rubyripper-0.6.2-r1.ebuild
index 6285ab2ff45c..d8bf8ea35ad9 100644
--- a/media-sound/rubyripper/rubyripper-0.6.2-r1.ebuild
+++ b/media-sound/rubyripper/rubyripper-0.6.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rubyripper/rubyripper-0.6.2-r1.ebuild,v 1.4 2013/03/04 19:16:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rubyripper/rubyripper-0.6.2-r1.ebuild,v 1.5 2014/08/14 14:00:22 mrueg Exp $
 
 EAPI=5
 
 VIRTUALX_REQUIRED=always
 VIRTUALX_COMMAND=./configure
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 inherit ruby-ng virtualx
 
diff --git a/media-sound/xwax/xwax-1.5.ebuild b/media-sound/xwax/xwax-1.5.ebuild
index 93a8b24a29a8..761a822481e1 100644
--- a/media-sound/xwax/xwax-1.5.ebuild
+++ b/media-sound/xwax/xwax-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.5.ebuild,v 1.1 2014/05/06 02:07:28 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.5.ebuild,v 1.2 2014/08/14 17:28:46 phajdan.jr Exp $
 
 EAPI=5
 inherit toolchain-funcs user
@@ -11,7 +11,7 @@ SRC_URI="http://www.xwax.co.uk/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 REQUIRED_USE="|| ( cdda mp3 fallback )
 	|| ( alsa jack oss )"
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 74ab63abb60a..9a1020621b9a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,9 +1,12 @@
 DIST ffmpeg-0.10.14.tar.bz2 5786281 SHA256 1ef77533f3803b8630403df413005c1c41b18c50b16895815182fd70d2f833bb SHA512 17dd1452fa5b9f6405b357b8cd774d03047691ff5a79feb28b6e2bc1df895d71f43f4c7b7280db99cf645dcd9a5c0751af382499afef28957533fd2c0f91e063 WHIRLPOOL bb8d0d8f55e67e6a8c58621437566a7989e729e96b34c24bc27a2324c423f53113e540d67ede2acd1f078fa31b7ad5548a699b0a7f8c6c42018ab2c3ac26d426
+DIST ffmpeg-0.10.15.tar.bz2 5785998 SHA256 8b6dbf73c192d2217e6ded8e0dd560c678f362e373d87c28ed9fc8eb52293d5d SHA512 0fb719847bfdc16d17c64b1be607427557c63cdf7a8a637231b1dbaac38bfc3dc3ff8f69d51a6c0305d05b2b186ecfcf5e6d2a5f3192f015be9751e0481e429e WHIRLPOOL 69798dcdc0a37d837840bfc2e5cb37177f8ddaf47153c25a5c24726723fa6ca7b39e0940eb2133ee4715e855d7dd08f05dd7252f94a48424909ac799d1900cdb
 DIST ffmpeg-1.0.10.tar.bz2 6443581 SHA256 1dbde434c3b5c573d3b2ffc1babe3814f781c10c4bc66193a4132a44c9715176 SHA512 0fcc0541db6cdbf044dbb000a214194b0bfc67f4ac3e5c6efb2207c84bb11f6c6c3cf245ea67e1912256d1e1a98cf336a6f548d154393c36e266d92093006ff7 WHIRLPOOL 50c75a41747394aa2629cdfc6bd631e0207194c87ecdda120032f42e0d04327443fb13ea2b00ed52212da30992b01318846da0a0a594bac7d5757bccb525f32c
 DIST ffmpeg-1.0.8.tar.bz2 6452144 SHA256 8580a317aa09fdabdcf5119c87f59fd3baa4df0f636aac4d3dfeb86c572277aa SHA512 5fc6caf20c016e9d8ff41175d3bb5bf6d4a2c25c65ea8630d45ef8d9a16ee53120d76e4bc220b4f4462618e5c731114182776d7193e9d085332cf087038f3488 WHIRLPOOL 6a6b80a5aa44ee1a1c0af61bdf95659eb319ae48b690c2c1b9dd5291ad3b6f5ab52884c835d925da88dd2467f49ec2198cb78c2ef78af4f2e372c6364c769f6e
 DIST ffmpeg-1.0.9.tar.bz2 6449857 SHA256 98b3c35bcc602ab1e236fa64da8ead3deae7a5f9c958c572b46fb299260d1034 SHA512 323764f40a03ec339e1743a57ba545c74b7a58fad7c2db29c252dd276a74e761f00649aa560415cd38e80db51d34037c66c8aaae6971f35d83f7d1943d1e7109 WHIRLPOOL e4ba2ce05f76a2414a46fbd04d50c1d1f7638b43fee718ab60d56f8ef5fbe367f33d992c3a6b3802cde9cfeb0252c4112a0f0e1c56c4fd10d76ead424f3c0ab1
 DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-1.2.7.tar.bz2 5969563 SHA256 669b59483773b5b58d63b65e12749d68428729eaa6978c5acc6c82a60a2ed28e SHA512 b23800b1f7de5ab3ee473931f4d8791e4927b8d248df66c36ade54001365438eb7424ec2ee9e018ab37b76a9551457efdec019ea8356f8e59f1055fe1096f88b WHIRLPOOL d28a3c4bd7c67847d21c71f33b7fce0760136881ca2228c18ae41d5dc6ead2a50d9cbcf3d6593a82e51e666428389fce0c546f711b13bae530c464de2ac3101d
 DIST ffmpeg-2.2.5.tar.bz2 7024774 SHA256 c8587a1ac91599dd87fcfb53de6e32b9ab81449e7f22ff55044faf7815a68633 SHA512 cf350638e0b9987988bf4feebb44072fd14df6a3c49b1de9830a9126f1bbd6d11a21e84b9ded751849400ca11348b1952cb361099fa8a5ea737468a799f40cd3 WHIRLPOOL 32d98787d6d1c4e9fdb7261931f29f11aa3647ab7e4850fa4606336bf9da43be2fe07e05f1263f0ae03b666fe1ced57f27e5b8395b738425fd7c7c8bcee35c84
+DIST ffmpeg-2.2.7.tar.bz2 7027327 SHA256 e01dc650bf85f05d8ec08021b281dc7b80f02c794edce49d2b95d9dace8ed8a7 SHA512 622b436dbd03deb68ec8f31e288605534b8288719d14e5baf5c8a59b7913d3f48580416064a64029735e000153197ac5a4dac654fdb9c404d4e13c73e44ffdf9 WHIRLPOOL 51cb74026cb13c6b947a7beb21be028ffc41c903a87ece72ce16d2ac361010cda547efbdeae5f525565a6a20ea5d7578f1689faac5e38da48fc56ec085e41be5
 DIST ffmpeg-2.3.1.tar.bz2 7446524 SHA256 ee6a2f4c11424698537615443b2f4e1ef853bffd239f93295654e2c40ad78183 SHA512 5786be8389b4532eb7ffa439426dce7312df6c9572df3574444e84036ccebc414f0473d918096ff65e5de55a551cbc6fa96970a6cc490aa08bd4c18782267559 WHIRLPOOL f9477ae894338e1f70da6c2b69b9bb0f1a836b527e7711da243eeb2a4316eb7f9f556ebed7bf419762b017daa4a25524b7bd331b2b079bcb85b878b28816e4b1
+DIST ffmpeg-2.3.2.tar.bz2 7446477 SHA256 84e135432208361db2e1206df4380b7a7c3c2a38e0df23c6fc92553aafc4ffd2 SHA512 7bda541ba02e3c4672d91640b83fcc1bd94beefb777f7bb1c25e56b2dd7b30f43bd8fdeee9f6e907aab3c4caccde8e5a6a34308abb023fc969d1beb0ccd94edb WHIRLPOOL a9e6df11a3be25c51057793621d05df7c1de6e5cbf73d0446fc39d63f56b3fb16d73389a993ca0c320ff4824137d3ec1720fe3e2a6b3beffb29ccb194742d9bd
 DIST ffmpeg-2.3.tar.bz2 7443666 SHA256 6b3dbb64e20951480bfd64bcbe305f6ee9031e5fccfd3b3e94cc5055525f809e SHA512 82bbe5109e426cbd3063f8b2edb3e2daa7f237c4fc46ca37907ab316351978b689f2e0c4d88645b2eb19582765072702f3a19a17c6b02dd11bccac3b41d27a03 WHIRLPOOL a6f16226e07f17c6fb66e58154035f0ae65d52bb113db7afb1ac234d467ce53a58a044cd262fa98a11a7e83faeadc0c16b2e9d3115f83d3e39c76f00d43db3a3
diff --git a/media-video/ffmpeg/ffmpeg-0.10.15.ebuild b/media-video/ffmpeg/ffmpeg-0.10.15.ebuild
new file mode 100644
index 000000000000..a30162ae2297
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.10.15.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v 1.1 2014/08/13 18:37:16 aballier Exp $
+
+EAPI="5"
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} multilib-minimal
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
+SLOT="0.10"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
+	dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
+	jpeg2k libass libv4l modplug mp3 +network openal openssl oss pic pulseaudio
+	rtmp schroedinger sdl speex static-libs test theora threads
+	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
+	"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+DOCS=""
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	dirac? ( >=media-video/dirac-1.0.2-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+		vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	!<media-video/ffmpeg-1.2
+	!<media-video/libav-9
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+# !media-libs/libpostproc
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( virtual/pkgconfig )
+	doc? ( app-text/texi2html )
+	gnutls? ( virtual/pkgconfig )
+	ieee1394? ( virtual/pkgconfig )
+	libv4l? ( virtual/pkgconfig )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( virtual/pkgconfig )
+	schroedinger? ( virtual/pkgconfig )
+	test? ( net-misc/wget )
+	truetype? ( virtual/pkgconfig )
+	v4l? ( sys-kernel/linux-headers )
+"
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	test? ( encode zlib )"
+
+S=${WORKDIR}/${P/_/-}
+
+pkg_setup() {
+	ewarn "This version is _terribly_ outdated with known security issues and"
+	ewarn "bugs. It is provided only for binary compatibility."
+	ewarn "Use at your own risks."
+}
+
+src_prepare() {
+	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch "${FILESDIR}/freiordl.patch"
+	epatch "${FILESDIR}/flashtest.patch"
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			configure libavdevice/libcdio.c || die
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="${EXTRA_FFMPEG_CONF}"
+	# Set to --enable-version3 if (L)GPL-3 is required
+	local version3=""
+
+	# enabled by default
+	for i in debug doc network vaapi vdpau zlib; do
+		use ${i} || myconf="${myconf} --disable-${i}"
+	done
+	use bzip2 || myconf="${myconf} --disable-bzlib"
+
+	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
+	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
+	for i in gnutls ; do
+		use $i && myconf="${myconf} --enable-$i"
+	done
+
+	# Encoders
+	if use encode
+	then
+		use mp3 && myconf="${myconf} --enable-libmp3lame"
+		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
+		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
+		for i in theora vorbis x264 xvid; do
+			use ${i} && myconf="${myconf} --enable-lib${i}"
+		done
+		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
+		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	use cdio && myconf="${myconf} --enable-libcdio"
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	use openal && myconf="${myconf} --enable-openal"
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf="${myconf} --disable-indev=v4l"
+	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	for i in alsa oss jack ; do
+		use ${i} || myconf="${myconf} --disable-indev=${i}"
+	done
+	use X && myconf="${myconf} --enable-x11grab"
+	use pulseaudio && myconf="${myconf} --enable-libpulse"
+	use libv4l && myconf="${myconf} --enable-libv4l2"
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf="${myconf} --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf="${myconf} --enable-frei0r"
+	use truetype && myconf="${myconf} --enable-libfreetype"
+	use libass && myconf="${myconf} --enable-libass"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf="${myconf} --enable-pthreads"
+
+	# Decoders
+	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
+	for i in celt gsm dirac modplug rtmp schroedinger speex vpx; do
+		use ${i} && myconf="${myconf} --enable-lib${i}"
+	done
+	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
+	done
+	if use pic ; then
+		myconf="${myconf} --enable-pic"
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86* ]] && myconf="${myconf} --disable-asm"
+	fi
+	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	# Mandatory configuration
+	myconf="
+		--enable-gpl
+		${version3}
+		--enable-avfilter
+		--disable-stripping
+		${myconf}"
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf="${myconf} --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf="${myconf} --target-os=mingw32"
+				;;
+			*linux*)
+				myconf="${myconf} --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+
+	"${S}"/configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--disable-static \
+		--disable-{ffplay,ffmpeg,ffprobe,ffserver} \
+		--disable-{swresample,postproc,swscale,avdevice} \
+		${myconf} || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install-libs
+	rm -f "${ED}"/usr/$(get_libdir)/*.so
+}
diff --git a/media-video/ffmpeg/ffmpeg-2.2.7.ebuild b/media-video/ffmpeg/ffmpeg-2.2.7.ebuild
new file mode 100644
index 000000000000..159171c3845e
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.2.7.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.7.ebuild,v 1.1 2014/08/13 18:26:10 aballier Exp $
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=52.55.55
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
+SLOT="0/${FFMPEG_SUBSLOT}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
+	ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
+	openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
+	static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
+	wavpack webp X x264 x265 xvid +zlib zvbi
+	"
+
+ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
+MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
+PPC_CPU_FEATURES="altivec"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="
+	${ARM_CPU_FEATURES}
+	${MIPS_CPU_FEATURES}
+	${PPC_CPU_FEATURES}
+	${X86_CPU_FEATURES}
+"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
+
+for i in ${FFTOOLS}; do
+	IUSE="${IUSE} +fftools_$i"
+done
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? (
+		|| (
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
+			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+		)
+	)
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-0.8:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	quvi? ( media-libs/libquvi:0.4 )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	!media-libs/libpostproc
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	mmx? ( >=dev-lang/yasm-1.2 )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( net-misc/wget )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch "${FILESDIR}/ladspadl.patch"
+	epatch_user
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	# options to use as use_enable in the foo[:bar] form.
+	# This will feed configure with $(use_enable foo bar)
+	# or $(use_enable foo foo) if no :bar is set.
+	local ffuse=(
+		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+		gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi
+		vdpau zlib
+	)
+	use openssl && myconf+=( --enable-nonfree )
+
+	# Encoders
+	if use encode
+	then
+		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
+		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
+			ffuse+=( ${i}:lib${i} )
+		done
+
+		# Licensing.
+		if use aac || use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# libavfilter options
+	ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )
+
+	# libswresample options
+	ffuse+=( libsoxr )
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	ffuse+=( threads:pthreads )
+
+	# Decoders
+	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
+	use amr && myconf+=( --enable-version3 )
+	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
+		ffuse+=( ${i}:lib${i} )
+	done
+	use fdk && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r libquvi; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# Mandatory configuration
+	myconf=(
+		--enable-gpl
+		--enable-postproc
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/ffmpeg/ffmpeg-2.3.2.ebuild b/media-video/ffmpeg/ffmpeg-2.3.2.ebuild
new file mode 100644
index 000000000000..e43d25fcad96
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.3.2.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.3.2.ebuild,v 1.1 2014/08/13 18:16:39 aballier Exp $
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=52.55.55
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )"
+SLOT="0/${FFMPEG_SUBSLOT}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	fribidi gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
+	jpeg2k ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal
+	opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger sdl
+	speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau
+	vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi
+	"
+
+ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
+MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
+PPC_CPU_FEATURES="altivec"
+X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2:sse42 xop"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="
+	${ARM_CPU_FEATURES}
+	${MIPS_CPU_FEATURES}
+	${PPC_CPU_FEATURES}
+	${X86_CPU_FEATURES}
+"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
+
+for i in ${FFTOOLS}; do
+	IUSE="${IUSE} +fftools_$i"
+done
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? (
+		|| (
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
+			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+		)
+	)
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	!media-libs/libpostproc
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	mmx? ( >=dev-lang/yasm-1.2 )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( net-misc/wget )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch_user
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	# options to use as use_enable in the foo[:bar] form.
+	# This will feed configure with $(use_enable foo bar)
+	# or $(use_enable foo foo) if no :bar is set.
+	local ffuse=(
+		bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+		gnutls hardcoded-tables iconv network openssl samba:libsmbclient
+		sdl:ffplay vaapi vdpau X:xlib zlib
+	)
+	use openssl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode
+	then
+		ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
+		for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
+			ffuse+=( ${i}:lib${i} )
+		done
+
+		# Licensing.
+		if use aac || use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# libavdevice options
+	ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# libavfilter options
+	ffuse+=( bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype )
+
+	# libswresample options
+	ffuse+=( libsoxr )
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	ffuse+=( threads:pthreads )
+
+	# Decoders
+	ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
+	use amr && myconf+=( --enable-version3 )
+	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
+		ffuse+=( ${i}:lib${i} )
+	done
+	use fdk && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# Mandatory configuration
+	myconf=(
+		--enable-gpl
+		--enable-postproc
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	if multilib_is_native_abi; then
+		for i in ${FFTOOLS} ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 77b4cb15ac26..da0aa0f17bca 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -1,3 +1,4 @@
 DIST gtest-1.7.0.zip 1164254 SHA256 247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 WHIRLPOOL 0c31a385159551859c1afe76480b3fb1b560d666db9a0afc5cbda92bcd53bf129f85a8f902c6ded0779c2b4c49aacec59ba5a4d5ce316a07bf08174f4fc64049
 DIST movit-1.1.1.tar.gz 507273 SHA256 4fd1a90608a1b06cd9faf20ec99cd4d0a5cb18a9047621babef4b2abfa5c78cc SHA512 ad51bd00ad83878eb48f0949f6e0435ef66abad9e8f571244bb90b89baf7c14eb7bba72edb42541fc2f979bff9b0f50035396679bf6ec569a9ebb6447b63dbe9 WHIRLPOOL de3c5e753dc806ed98ea96bcb97e100475555c2becda69a8db85a139bd01859156151c7c2e089329c45a540c8a99768a0e35394f3599bb576a681ecbf9d0916a
+DIST movit-1.1.2.tar.gz 858539 SHA256 417e1810d588e5b4b2e82f05c2b6a86f4d14a3d9d9f4f26f4e009fce064d6a4a SHA512 082aab059864fd4feb9a66c0e7bab64babedfbdcc442ab5b1522ab60f678039d03e9c1c88095abe0e7196367c3ec1c8a9c90134cf5f97e4af31a3f7cbe98d661 WHIRLPOOL d305bd194d38b6da263471df443ef98c6854b2637eccfc6c376d0b9556a1c5be1e56b1d38f3097a0b2b8f91451728ffa4e476b46b17e829eb534f25c7053b7d1
 DIST movit-1.1.tar.gz 507154 SHA256 41dcd3ccefbe218b7ccc47a7ac2577cf261f1ea10298f26ff16ffc353adf0f25 SHA512 ecb84f918b28b507c06cde680da5114fdf19b224a71e202d6f932de0e080e941f7977e590476eda9ffc9fc5839126b1f2d1056dd80039ced894281a51eebcf30 WHIRLPOOL c349a9f12b5966e57fa0b09811bbf3cf4a36abbb06b3df5cc3b9fa1b42efa7e902be9625b09e161d0250034aa05c3901db5ec9e24b8af554fb046ad725cda04a
diff --git a/media-video/movit/movit-1.1.2.ebuild b/media-video/movit/movit-1.1.2.ebuild
new file mode 100644
index 000000000000..db6ef2fddbfd
--- /dev/null
+++ b/media-video/movit/movit-1.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/movit/movit-1.1.2.ebuild,v 1.1 2014/08/14 05:30:39 patrick Exp $
+
+EAPI=5
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	http://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	=dev-cpp/eigen-3*
+	media-libs/libepoxy
+	sci-libs/fftw
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/qx11grab/qx11grab-0.4.10-r1.ebuild b/media-video/qx11grab/qx11grab-0.4.10-r1.ebuild
index ac62463e047f..e15c7d269bea 100644
--- a/media-video/qx11grab/qx11grab-0.4.10-r1.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.10-r1.ebuild,v 1.1 2014/08/02 22:58:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.10-r1.ebuild,v 1.2 2014/08/14 17:18:01 phajdan.jr Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kde opengl pulseaudio"
 
 RDEPEND="
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ba088507e9cd..e929713df83c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 13 Aug 2014 13:37:02 +0000
+Thu, 14 Aug 2014 17:37:05 +0000
diff --git a/metadata/glsa/glsa-201408-04.xml b/metadata/glsa/glsa-201408-04.xml
new file mode 100644
index 000000000000..b8d4729660d1
--- /dev/null
+++ b/metadata/glsa/glsa-201408-04.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201408-04">
+  <title>Catfish: Multiple Vulnerabilities </title>
+  <synopsis>Multiple vulnerabilities have been found in Catfish, allowing local
+    attackers to escalate their privileges.
+  </synopsis>
+  <product type="ebuild">catfish</product>
+  <announced>August 13, 2014</announced>
+  <revised>August 13, 2014: 1</revised>
+  <bug>502536</bug>
+  <access>local</access>
+  <affected>
+    <package name="dev-util/catfish" auto="yes" arch="*">
+      <unaffected range="ge">1.0.2</unaffected>
+      <vulnerable range="lt">1.0.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Catfish is a versatile file searching tool. </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Catfish. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker could gain escalated privileges via a specially crafted
+      shared library.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Catfish users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-util/catfish-1.0.2"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2093">CVE-2014-2093</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2094">CVE-2014-2094</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2095">CVE-2014-2095</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-2096">CVE-2014-2096</uri>
+  </references>
+  <metadata tag="requester" timestamp="Sat, 02 Aug 2014 18:47:34 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Wed, 13 Aug 2014 18:12:10 +0000">Zlogene</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201408-05.xml b/metadata/glsa/glsa-201408-05.xml
new file mode 100644
index 000000000000..3781f529563b
--- /dev/null
+++ b/metadata/glsa/glsa-201408-05.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201408-05">
+  <title>Adobe Flash Player: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Adobe Flash Player,
+    worst of which allows remote attackers to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">adobe-flash</product>
+  <announced>August 14, 2014</announced>
+  <revised>August 14, 2014: 1</revised>
+  <bug>519790</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-plugins/adobe-flash" auto="yes" arch="*">
+      <unaffected range="ge">11.2.202.400</unaffected>
+      <vulnerable range="lt">11.2.202.400</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The Adobe Flash Player is a renderer for the SWF file format, which is
+      commonly used to provide interactive websites. 
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Adobe Flash Player.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, cause a Denial of Service condition or bypass
+      security restrictions.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Adobe Flash Player users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-plugins/adobe-flash-11.2.202.400"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0538">CVE-2014-0538</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0540">CVE-2014-0540</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0541">CVE-2014-0541</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0542">CVE-2014-0542</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0543">CVE-2014-0543</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0544">CVE-2014-0544</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0545">CVE-2014-0545</uri>
+  </references>
+  <metadata tag="requester" timestamp="Wed, 13 Aug 2014 13:32:27 +0000">Zlogene</metadata>
+  <metadata tag="submitter" timestamp="Thu, 14 Aug 2014 13:09:44 +0000">Zlogene</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201408-06.xml b/metadata/glsa/glsa-201408-06.xml
new file mode 100644
index 000000000000..89631509a58b
--- /dev/null
+++ b/metadata/glsa/glsa-201408-06.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201408-06">
+  <title>libpng: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been discovered in libpng which can
+    allow a remote attacker to cause a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">libpng</product>
+  <announced>August 14, 2014</announced>
+  <revised>August 14, 2014: 2</revised>
+  <bug>503014</bug>
+  <bug>507378</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-libs/libpng" auto="yes" arch="*">
+      <unaffected range="ge">1.6.10</unaffected>
+      <unaffected range="lt">1.3</unaffected>
+      <unaffected range="rge">1.5.18</unaffected>
+      <vulnerable range="lt">1.6.10</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libpng is a standard library used to process PNG (Portable Network
+      Graphics) images. It is used by several programs, including web browsers
+      and potentially server processes.
+    </p>
+  </background>
+  <description>
+    <p>The png_push_read_chunk function in pngpread.c in the progressive
+      decoder enters an infinite loop, when it encounters a zero-length IDAT
+      chunk. In addition certain integer overflows have been detected and
+      corrected.
+    </p>
+    
+    <p>The 1.2 branch is not affected by these vulnerabilities.</p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to open a specially crafted PNG
+      file using an application linked against libpng, possibly resulting in
+      Denial of Service. 
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libpng users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-libs/libpng-1.6.10"
+    </code>
+    
+    <p>Users with current installs in the 1.5 branch should also upgrade this
+      using:</p>
+      <code>
+        # emerge --sync
+        # emerge --ask --oneshot --verbose "&gt;=media-libs/libpng-1.5.18:1.5"
+      </code>
+      
+      <p>Packages which depend on this library may need to be recompiled. Tools
+        such as revdep-rebuild may assist in identifying these packages.
+      </p>
+    </resolution>
+    <references>
+      <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-7353">
+        CVE-2013-7353
+      </uri>
+      <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-7354">
+        CVE-2013-7354
+      </uri>
+      <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-0333">
+        CVE-2014-0333
+      </uri>
+    </references>
+    <metadata tag="requester" timestamp="Thu, 15 May 2014 04:38:43 +0000">
+      BlueKnight
+    </metadata>
+    <metadata tag="submitter" timestamp="Thu, 14 Aug 2014 13:52:46 +0000">
+      pinkbyte
+    </metadata>
+  </glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 00838540051e..e929713df83c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 13 Aug 2014 13:37:03 +0000
+Thu, 14 Aug 2014 17:37:05 +0000
diff --git a/metadata/herds.xml b/metadata/herds.xml
index 4525a0c5bf24..3be777226b7a 100644
--- a/metadata/herds.xml
+++ b/metadata/herds.xml
@@ -20,7 +20,7 @@
    always a description without a lang attribute. Also there are no overlapping
    descriptions allowed (multiple description tags with the same language)
 
-   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1115 2014/08/06 17:35:41 kensington Exp $
+   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1116 2014/08/13 15:20:52 amynka Exp $
 
 -->
 <herds>
@@ -334,6 +334,16 @@
     <role>ebuild maintainer</role>
   </maintainer>
 </herd>
+<herd>
+  <name>3dprint</name>
+  <email>3dprint@gentoo.org</email>
+  <description>Packages related to 3D printers</description>
+  <maintainer>
+    <email>amynka@gentoo.org</email>
+    <name>Amy Winston</name>
+    <role>Team Lead, packages maintainer</role>
+  </maintainer>
+</herd>
 <herd>
   <name>java</name>
   <email>java@gentoo.org</email>
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.0-r3 b/metadata/md5-cache/app-accessibility/brltty-5.0-r3
index e953180ddecb..c08a116db89a 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.0-r3
+++ b/metadata/md5-cache/app-accessibility/brltty-5.0-r3
@@ -11,4 +11,4 @@ REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( ap
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/archive/brltty-5.0.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4e7417d2a401ef3de042a231718395ea
+_md5_=f5a842f7b46cb6fb53ef1c2a3e22b6fb
diff --git a/metadata/md5-cache/app-admin/denyhosts-2.6-r10 b/metadata/md5-cache/app-admin/denyhosts-2.6-r10
index f67f662d8d76..4e9a8ef82810 100644
--- a/metadata/md5-cache/app-admin/denyhosts-2.6-r10
+++ b/metadata/md5-cache/app-admin/denyhosts-2.6-r10
@@ -4,11 +4,11 @@ DESCRIPTION=DenyHosts is a utility to help sys admins thwart ssh hackers
 EAPI=5
 HOMEPAGE=http://www.denyhosts.net
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 arm hppa ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm hppa ~ppc ~sparc 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/denyhosts/DenyHosts-2.6.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=62b1a951db758c289c3ba2cb72095f66
+_md5_=102a1534487e6f108f400126923d3f04
diff --git a/metadata/md5-cache/app-admin/lib_users-0.9 b/metadata/md5-cache/app-admin/lib_users-0.9
index c3bc339582b4..3794c62e6827 100644
--- a/metadata/md5-cache/app-admin/lib_users-0.9
+++ b/metadata/md5-cache/app-admin/lib_users-0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Checks /proc for libraries being mapped but marked as deleted
 EAPI=5
 HOMEPAGE=http://schwarzvogel.de/software-misc.shtml
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 hppa ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://schwarzvogel.de/pkgs/lib_users-0.9.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=0da7181d219c16df82810f976118b728
+_md5_=a788b084353c93874488aeb766eba3f8
diff --git a/metadata/md5-cache/app-arch/lz4-0_p106-r1 b/metadata/md5-cache/app-arch/lz4-0_p106-r1
index c6fe4e15ff15..0a315b91b865 100644
--- a/metadata/md5-cache/app-arch/lz4-0_p106-r1
+++ b/metadata/md5-cache/app-arch/lz4-0_p106-r1
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/finduti
 DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=5
 HOMEPAGE=https://code.google.com/p/lz4/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ~s390 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ryao/dist/lz4-0_p106.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5df5e6f4c9260bd07649d084f4f9f120
+_md5_=6789c263fc77d5a18ae6f5a488c1d626
diff --git a/metadata/md5-cache/app-arch/lz4-0_p120 b/metadata/md5-cache/app-arch/lz4-0_p120
index 870c44065dc7..a37ed1183d94 100644
--- a/metadata/md5-cache/app-arch/lz4-0_p120
+++ b/metadata/md5-cache/app-arch/lz4-0_p120
@@ -4,9 +4,9 @@ DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=5
 HOMEPAGE=https://code.google.com/p/lz4/
 IUSE=test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~s390 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/lz4/archive/r120.tar.gz -> lz4-r120.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=e6ce3b68ca52aeb50fff1c68390d8769
+_md5_=7b2f5a957cd0ecb6205492aac767adee
diff --git a/metadata/md5-cache/app-arch/lz4-9999 b/metadata/md5-cache/app-arch/lz4-9999
index f82f9e1f714e..aa637e2333de 100644
--- a/metadata/md5-cache/app-arch/lz4-9999
+++ b/metadata/md5-cache/app-arch/lz4-9999
@@ -7,4 +7,4 @@ IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 LICENSE=BSD-2 GPL-2
 SLOT=0
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	git-r3	6ebae45064cb04482f3c702632dd9528	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=eab0ecc9a74206b0886789db606a5722
+_md5_=f40db05ad78cefc74bfd90c7bccb9e4c
diff --git a/metadata/md5-cache/app-arch/unrar-5.1.6 b/metadata/md5-cache/app-arch/unrar-5.1.6
index 83c31c3f07e4..e78f5046df2f 100644
--- a/metadata/md5-cache/app-arch/unrar-5.1.6
+++ b/metadata/md5-cache/app-arch/unrar-5.1.6
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Uncompress rar files
 EAPI=5
 HOMEPAGE=http://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=unRAR
 RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
 SLOT=0
 SRC_URI=http://www.rarlab.com/rar/unrarsrc-5.1.6.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=2e645bf049f395ba9e7ff94b6d5a8a0d
+_md5_=0e495e7ae5d4b175e55b08aa821c14de
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20131216 b/metadata/md5-cache/app-arch/zopfli-1.0.0_p20131216
deleted file mode 100644
index 04ad7d7af42c..000000000000
--- a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20131216
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Compression library programmed in C to perform very good, but slow, deflate or zlib compression
-EAPI=5
-HOMEPAGE=https://github.com/Hello71/zopfli/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-SLOT=0/1
-SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/zopfli-1.0.0_p20131216.tar.bz2
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=603c401f4be76579e9a12c57d18337b5
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20140623 b/metadata/md5-cache/app-arch/zopfli-1.0.0_p20140623
deleted file mode 100644
index 08b5b45f83ba..000000000000
--- a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20140623
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DESCRIPTION=Compression library programmed in C to perform very good, but slow, deflate or zlib compression
-EAPI=5
-HOMEPAGE=https://code.google.com/p/zopfli/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-SLOT=0/1
-SRC_URI=https://zopfli.googlecode.com/archive/b831d9813d44d85b4f1497be9cb877e4d5c4bbd7.tar.gz -> zopfli-1.0.0_p20140623.tar.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=46d5b8e9b328a3c79a6383e9a204f796
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20140705 b/metadata/md5-cache/app-arch/zopfli-1.0.0_p20140705
index 7e0a4cee0d98..44976bac34cf 100644
--- a/metadata/md5-cache/app-arch/zopfli-1.0.0_p20140705
+++ b/metadata/md5-cache/app-arch/zopfli-1.0.0_p20140705
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Compression library programmed in C to perform very good, but slow, deflate or zlib compression
 EAPI=5
 HOMEPAGE=https://github.com/Hello71/zopfli/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0/1
 SRC_URI=https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc2b59ab6cce7.tar.gz -> zopfli-1.0.0_p20140705.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=1868fc1fc70979f7fc07cdef266dddb2
+_md5_=0d3c12513c6114367c9c6ab8c06495ec
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.0.26 b/metadata/md5-cache/app-crypt/gnupg-2.0.26
new file mode 100644
index 000000000000..9a8dd96d87d5
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-2.0.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib adns? ( >=net-libs/adns-1.4 ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) || ( app-crypt/pinentry app-crypt/pinentry-qt ) static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[static-libs] >=dev-libs/libksba-1.0.7[static-libs] >=dev-libs/pth-1.3.7[static-libs] >=net-misc/curl-7.10[static-libs] sys-libs/zlib[static-libs] bzip2? ( app-arch/bzip2[static-libs] ) ) nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo )
+DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/
+IUSE=adns bzip2 doc ldap nls mta readline static selinux smartcard usb
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib adns? ( >=net-libs/adns-1.4 ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) || ( app-crypt/pinentry app-crypt/pinentry-qt ) mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+REQUIRED_USE=smartcard? ( !static )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.26.tar.bz2
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=b17678039d3e6c3dc72527110ca85f10
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.11.4 b/metadata/md5-cache/app-crypt/mit-krb5-1.11.4
deleted file mode 100644
index 08b4a71d68c0..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.11.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libverto[libev] dev-libs/libverto[libevent] dev-libs/libverto[tevent] ) keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) pkinit? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-kerberos ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl dev-util/dejagnu )
-DESCRIPTION=MIT Kerberos V
-EAPI=5
-HOMEPAGE=http://web.mit.edu/kerberos/www/
-IUSE=doc +keyutils openldap +pkinit selinux +threads test xinetd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libverto[libev] dev-libs/libverto[libevent] dev-libs/libverto[tevent] ) keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) pkinit? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-kerberos ) xinetd? ( sys-apps/xinetd )
-SLOT=0
-SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.4-signed.tar
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e70bb7d1de338fa3916c800b259fb5e8
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.12.1 b/metadata/md5-cache/app-crypt/mit-krb5-1.12.1
deleted file mode 100644
index ed81dec263d9..000000000000
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libverto[libev] dev-libs/libverto[libevent] dev-libs/libverto[tevent] ) keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) pkinit? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-kerberos ) xinetd? ( sys-apps/xinetd ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/yacc doc? ( virtual/latex-base ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/tcl dev-util/dejagnu ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=MIT Kerberos V
-EAPI=5
-HOMEPAGE=http://web.mit.edu/kerberos/www/
-IUSE=doc +keyutils openldap +pkinit selinux +threads test xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
-RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.41.0 || ( dev-libs/libverto[libev] dev-libs/libverto[libevent] dev-libs/libverto[tevent] ) keyutils? ( sys-apps/keyutils ) openldap? ( net-nds/openldap ) pkinit? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-kerberos ) xinetd? ( sys-apps/xinetd )
-SLOT=0
-SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12.1-signed.tar
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ddbd6256742f86131dcc8cd5b78c9d13
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.12.1-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.12.2
similarity index 96%
rename from metadata/md5-cache/app-crypt/mit-krb5-1.12.1-r1
rename to metadata/md5-cache/app-crypt/mit-krb5-1.12.2
index b0b580002234..4aeb3ad9bc6a 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.12.1-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.12.2
@@ -4,10 +4,10 @@ DESCRIPTION=MIT Kerberos V
 EAPI=5
 HOMEPAGE=http://web.mit.edu/kerberos/www/
 IUSE=doc +keyutils openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,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/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,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/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,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/libverto-0.2.5[tevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sec-policy/selinux-kerberos ) xinetd? ( sys-apps/xinetd ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
-SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12.1-signed.tar
+SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.12/krb5-1.12.2-signed.tar
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b7001be3f003c7071e67f11e82fc850b
+_md5_=986d165bfb41770697748af22c020b30
diff --git a/metadata/md5-cache/app-crypt/tpm-tools-1.3.8 b/metadata/md5-cache/app-crypt/tpm-tools-1.3.8
index e1703cd435cc..34de600e04dc 100644
--- a/metadata/md5-cache/app-crypt/tpm-tools-1.3.8
+++ b/metadata/md5-cache/app-crypt/tpm-tools-1.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=TrouSerS' support tools for the Trusted Platform Modules
 EAPI=4
 HOMEPAGE=http://trousers.sourceforge.net
 IUSE=nls pkcs11 debug
-KEYWORDS=amd64 ~arm arm64 ~m68k ~s390 ~sh ~x86
+KEYWORDS=amd64 ~arm arm64 ~m68k ~s390 ~sh x86
 LICENSE=CPL-1.0
 RDEPEND=>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/tpm-tools-1.3.8.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=493bb382754ae7208d4d6790cf23f3a8
+_md5_=4013cdcd789312f5de6d0ac72ca88c0d
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-cpplibs-20140508-r1 b/metadata/md5-cache/app-emulation/emul-linux-x86-cpplibs-20140508-r1
new file mode 100644
index 000000000000..f89375b5105c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-cpplibs-20140508-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=sys-apps/findutils-4.2.26
+DESCRIPTION=Provides precompiled 32bit libraries
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
+IUSE=abi_x86_32 +development
+KEYWORDS=-* ~amd64
+LICENSE=Boost-1.0 LGPL-2.1
+RDEPEND=!abi_x86_32? ( ~app-emulation/emul-linux-x86-baselibs-20140508 !>=dev-libs/boost-1.55.0-r2[abi_x86_32(-)] ) abi_x86_32? ( >=dev-libs/boost-1.55.0-r2[abi_x86_32(-)] )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-cpplibs-20140508.tar.xz
+_eclasses_=emul-linux-x86	21b03579b81acf650f0077bfd9fc2586	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=160122047f5d49256472fded20f717ad
diff --git a/metadata/md5-cache/app-emulation/free42-1.5.3a b/metadata/md5-cache/app-emulation/free42-1.5.3a
index 907a3905515f..cdd61d9f57f1 100644
--- a/metadata/md5-cache/app-emulation/free42-1.5.3a
+++ b/metadata/md5-cache/app-emulation/free42-1.5.3a
@@ -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.3a.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c2b8012ec8dd8835a29100096fd0f401
+_md5_=9f841f1d747e4d7c0eab73e63e8625bf
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.0.7 b/metadata/md5-cache/app-emulation/vagrant-1.0.7
index 6b249448d28a..fa69d9de6308 100644
--- a/metadata/md5-cache/app-emulation/vagrant-1.0.7
+++ b/metadata/md5-cache/app-emulation/vagrant-1.0.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/archive-tar-minitar-0.5.2[ruby_targets_ruby18] >=dev-ruby/childprocess-0.3.1[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] >=dev-ruby/json-1.5.1[ruby_targets_ruby18] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby18] >=dev-ruby/net-scp-1.0.4[ruby_targets_ruby18] >=dev-ruby/net-ssh-2.2.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/archive-tar-minitar-0.5.2[ruby_targets_ruby19] >=dev-ruby/childprocess-0.3.1[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] >=dev-ruby/json-1.5.1[ruby_targets_ruby19] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.4[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.2.2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-ruby/rake[ruby_targets_ruby18] test? ( dev-ruby/mocha[ruby_targets_ruby18] virtual/ruby-minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] test? ( dev-ruby/mocha[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/archive-tar-minitar-0.5.2[ruby_targets_ruby19] >=dev-ruby/childprocess-0.3.1[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] >=dev-ruby/json-1.5.1[ruby_targets_ruby19] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.4[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.2.2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] test? ( dev-ruby/mocha[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A tool for building and distributing virtual machines using VirtualBox
 EAPI=5
 HOMEPAGE=http://vagrantup.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby18? ( >=dev-ruby/archive-tar-minitar-0.5.2[ruby_targets_ruby18] >=dev-ruby/childprocess-0.3.1[ruby_targets_ruby18] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] >=dev-ruby/json-1.5.1[ruby_targets_ruby18] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby18] >=dev-ruby/net-scp-1.0.4[ruby_targets_ruby18] >=dev-ruby/net-ssh-2.2.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/archive-tar-minitar-0.5.2[ruby_targets_ruby19] >=dev-ruby/childprocess-0.3.1[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] >=dev-ruby/json-1.5.1[ruby_targets_ruby19] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.4[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.2.2[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=!x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby19? ( >=dev-ruby/archive-tar-minitar-0.5.2[ruby_targets_ruby19] >=dev-ruby/childprocess-0.3.1[ruby_targets_ruby19] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] >=dev-ruby/json-1.5.1[ruby_targets_ruby19] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby19] >=dev-ruby/net-scp-1.0.4[ruby_targets_ruby19] >=dev-ruby/net-ssh-2.2.2[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.0.7.tar.gz -> vagrant-1.0.7.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6ff888140767a68f4b9255df00a5ed3c
+_md5_=790d14bfe82c15a438822bdccbe89caa
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.14 b/metadata/md5-cache/app-emulation/virtualbox-4.3.14
index 483f763ce2ac..a7a70d5eee0f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.14
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.14
@@ -10,6 +10,6 @@ PDEPEND=additions? ( ~app-emulation/virtualbox-additions-4.3.14 ) extensions? (
 RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/openssl dev-libs/libxml2 media-libs/libpng media-libs/libvpx sys-libs/zlib >=virtual/udev-171 !headless? ( qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 opengl? ( dev-qt/qtopengl:4 ) x11-libs/libXinerama ) opengl? ( virtual/opengl media-libs/freeglut ) x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt media-libs/libsdl:0[X,video] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
 SLOT=0
-SRC_URI=http://download.virtualbox.org/virtualbox/4.3.14/VirtualBox-4.3.14.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.14-patches-02.tar.xz
+SRC_URI=http://download.virtualbox.org/virtualbox/4.3.14/VirtualBox-4.3.14.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.14-patches-03.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	51ad5130f4a69b1a118ca5296de276ae	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	qmake-utils	40136c5fe0002a0d3937e869ae4ee0e2	qt4-r2	b40473dafd07d7c5fe4aef1c1b902f39	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=01f3d7ba5fde5365da55894f703c410a
+_md5_=d58cc8f65e5953ae224135c3ea6491d9
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.60 b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.60
index d36a0f741b26..c5fed066a5e0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.60
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.60
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare pretend test
 DEPEND=~app-leechcraft/lc-core-0.6.60 >=dev-qt/qtwebkit-4.6:4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils
-DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc.
+DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc
 EAPI=4
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.60 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraf
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.60/leechcraft-0.6.60.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	leechcraft	6609acc541f2bc8ba65e461352fdf169	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=29e603b896f44356bce613bbe45023bd
+_md5_=a19044b9dc2c880f5cb726f0bd8c68a0
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.65 b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.65
index 289320506f7d..844fac0dbb1f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.65
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.65
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare pretend test
 DEPEND=~app-leechcraft/lc-core-0.6.65 >=dev-qt/qtwebkit-4.6:4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils
-DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc.
-EAPI=4
+DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc
+EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.65 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraf
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.65/leechcraft-0.6.65.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	leechcraft	6609acc541f2bc8ba65e461352fdf169	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9e70a59a2cc224208b87bab1dafb95e4
+_md5_=b3b2c08ce82ad9183cc3a093d5e8059b
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70 b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70
index f9b131b49440..b82c883f202b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-0.6.70
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare pretend test
 DEPEND=~app-leechcraft/lc-core-0.6.70 >=dev-qt/qtwebkit-4.6:4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils
-DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc.
-EAPI=4
+DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc
+EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=~app-leechcraft/lc-core-0.6.70 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraf
 SLOT=0
 SRC_URI=http://dist.leechcraft.org/LeechCraft/0.6.70/leechcraft-0.6.70.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	leechcraft	6609acc541f2bc8ba65e461352fdf169	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0935dad32d29c08d3730ea21c775848a
+_md5_=4031a0f2d562c0ce1d7c31462e348f19
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-9999 b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
index 715dbbbc89be..6d344087032c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare pretend test unpack
 DEPEND=~app-leechcraft/lc-core-9999 >=dev-qt/qtwebkit-4.6:4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git
-DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc.
-EAPI=4
+DESCRIPTION=LeechCraft Package Manager for extensions, scripts, themes etc
+EAPI=5
 HOMEPAGE=http://leechcraft.org/
 IUSE=debug
 LICENSE=Boost-1.0
 RDEPEND=~app-leechcraft/lc-core-9999 >=dev-qt/qtwebkit-4.6:4 virtual/leechcraft-downloader-http
 SLOT=0
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	leechcraft	6609acc541f2bc8ba65e461352fdf169	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6b22310ac652abdf9658bb158f90f431
+_md5_=0a937547c5de9ee82f0bedc6205eeac6
diff --git a/metadata/md5-cache/app-misc/anki-2.0.28 b/metadata/md5-cache/app-misc/anki-2.0.28
index c64d1da04f5c..8f23e0748bf8 100644
--- a/metadata/md5-cache/app-misc/anki-2.0.28
+++ b/metadata/md5-cache/app-misc/anki-2.0.28
@@ -3,10 +3,10 @@ DESCRIPTION=A spaced-repetition memory training program (flash cards)
 EAPI=5
 HOMEPAGE=http://ichi2.net/anki/
 IUSE=latex +recording +sound python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_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(+)?] dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 dev-python/send2trash recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
 SLOT=0
 SRC_URI=http://ankisrs.net/download/mirror/anki-2.0.28.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8fc2db47b4676e10de962c7a7be861da
+_md5_=ee135cb8eab31a40130a742af3464347
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.9-r1 b/metadata/md5-cache/app-misc/beanstalkd-1.9-r1
index c6e8c786cb51..484d0cf44063 100644
--- a/metadata/md5-cache/app-misc/beanstalkd-1.9-r1
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.9-r1
@@ -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.9.tar.gz -> beanstalkd-1.9.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f91e26baef79f041675689bdcff02678
+_md5_=3f60419c2ee53352c28835f7aebdc25c
diff --git a/metadata/md5-cache/app-misc/unfoo-1.0.8 b/metadata/md5-cache/app-misc/unfoo-1.0.8
index c2fc7d265374..4c6142e70548 100644
--- a/metadata/md5-cache/app-misc/unfoo-1.0.8
+++ b/metadata/md5-cache/app-misc/unfoo-1.0.8
@@ -4,9 +4,9 @@ DESCRIPTION=A simple bash driven frontend to simplify decompression of files
 EAPI=5
 HOMEPAGE=http://obsoleet.org/code/unfoo
 IUSE=+minimal test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=!minimal? ( || ( app-arch/bzip2 app-arch/lbzip2[symlink] app-arch/pbzip2[symlink] ) || ( app-arch/gzip app-arch/pigz[symlink] ) app-arch/p7zip || ( app-arch/rar app-arch/unrar-gpl app-arch/unrar ) app-arch/unace app-arch/unzip app-arch/xz-utils )
 SLOT=0
 SRC_URI=https://github.com/jlec/unfoo/archive/v1.0.8.tar.gz -> unfoo-1.0.8.tar.gz
-_md5_=5df48a7bbda44fef0831e9bf72fb7889
+_md5_=7657e51d7f99d76ef1f6a100e17f1b4d
diff --git a/metadata/md5-cache/app-office/scribus-1.4.1-r1 b/metadata/md5-cache/app-office/scribus-1.4.1-r1
deleted file mode 100644
index bd7350785103..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] dev-qt/qtcore:4 dev-qt/qtgui:4 virtual/jpeg spell? ( app-text/aspell ) pdf? ( app-text/podofo ) cairo? ( x11-libs/cairo[X,svg] ) dev-libs/boost sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) =dev-lang/python-2*
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=4
-HOMEPAGE=http://www.scribus.net/
-IUSE=cairo debug examples +minimal +pdf spell templates linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de_1901 linguas_de_CH linguas_de linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt_BR linguas_pt linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/hyphen dev-libs/libxml2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] dev-qt/qtcore:4 dev-qt/qtgui:4 virtual/jpeg spell? ( app-text/aspell ) pdf? ( app-text/podofo ) cairo? ( x11-libs/cairo[X,svg] ) app-text/ghostscript-gpl =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/scribus/1.4.1/scribus-1.4.1.tar.xz
-_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=cf2400f798858480ca96677edb7e8130
diff --git a/metadata/md5-cache/app-office/scribus-1.4.3 b/metadata/md5-cache/app-office/scribus-1.4.3
index c99b98624a81..ad36521d73ab 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.3
+++ b/metadata/md5-cache/app-office/scribus-1.4.3
@@ -11,4 +11,4 @@ REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( p
 SLOT=0
 SRC_URI=mirror://sourceforge/scribus/1.4.3/scribus-1.4.3.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c823c650a84a17420d2f4067ff122540
+_md5_=50dd2160d6dbb968e1bb5531e8f8d5a8
diff --git a/metadata/md5-cache/app-office/scribus-1.4.9999 b/metadata/md5-cache/app-office/scribus-1.4.9999
index 3b7acffa14a4..26075041f1d0 100644
--- a/metadata/md5-cache/app-office/scribus-1.4.9999
+++ b/metadata/md5-cache/app-office/scribus-1.4.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] virtual/python-imaging[tk,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) pdf? ( app-text/podofo ) hunspell? ( app-text/hunspell ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) pdf? ( app-text/podofo ) scripts? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) tk? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=5
 HOMEPAGE=http://www.scribus.net/
-IUSE=cairo debug examples hunspell +minimal +pdf templates linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt linguas_pt_BR linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_single_target_python2_7
+IUSE=cairo debug examples hunspell +minimal +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt linguas_pt_BR linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_single_target_python2_7
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] virtual/python-imaging[tk,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) pdf? ( app-text/podofo ) hunspell? ( app-text/hunspell ) app-text/ghostscript-gpl
-REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) pdf? ( app-text/podofo ) scripts? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) tk? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) app-text/ghostscript-gpl
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) tk? ( scripts )
 SLOT=0
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4152d141e7d8a592fb1fdc8342c820e6
+_md5_=c70ba5e10aaef1195e708c63a2b65fc9
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index d3b5e6a8dc20..b5cce8db8d12 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] virtual/python-imaging[tk,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) hunspell? ( app-text/hunspell ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) poppler? ( app-text/poppler ) scripts? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) tk? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=5
 HOMEPAGE=http://www.scribus.net/
-IUSE=cairo debug examples graphicsmagick hunspell +minimal osg +pdf templates linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt linguas_pt_BR linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_single_target_python2_7
+IUSE=cairo debug examples graphicsmagick hunspell +minimal osg +pdf poppler scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_cs_CZ linguas_cy linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_el linguas_en_AU linguas_en_GB linguas_en_US linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_lt_LT linguas_nb_NO linguas_nl linguas_pl_PL linguas_pt linguas_pt_BR linguas_ru linguas_sa linguas_sk_SK linguas_sl linguas_sq linguas_sr linguas_sv linguas_th_TH linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7 python_single_target_python2_7
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] virtual/python-imaging[tk,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) hunspell? ( app-text/hunspell ) app-text/ghostscript-gpl
-REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-libs/boost dev-libs/hyphen dev-libs/libxml2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg cairo? ( x11-libs/cairo[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) poppler? ( app-text/poppler ) scripts? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) tk? ( virtual/python-imaging[tk?,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) app-text/ghostscript-gpl
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) tk? ( scripts )
 SLOT=0
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f0c129e260d9b00564081541a6de298c
+_md5_=f59e44fc6da548f91e74c9ccd3e0d83f
diff --git a/metadata/md5-cache/app-portage/g-cpan-0.16.5 b/metadata/md5-cache/app-portage/g-cpan-0.16.5
index 2d977863894a..f569f1bdc4a5 100644
--- a/metadata/md5-cache/app-portage/g-cpan-0.16.5
+++ b/metadata/md5-cache/app-portage/g-cpan-0.16.5
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl >=dev-perl/yaml-0.60 dev-perl/Shell-EnvImporter dev-perl/Lo
 DESCRIPTION=g-cpan: generate and install CPAN modules using portage
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/perl/g-cpan.xml
-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=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl >=dev-perl/yaml-0.60 dev-perl/Shell-EnvImporter dev-perl/Log-Agent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/g-cpan-0.16.5.tar.gz http://dev.gentoo.org/~chainsaw/distfiles/g-cpan-0.16.5.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=45a1759ed6a4de24f7e38ede50265edf
+_md5_=1ae624e85845722d8a58e8f613987bf7
diff --git a/metadata/md5-cache/app-portage/portpeek-2.1.13 b/metadata/md5-cache/app-portage/portpeek-2.1.14
similarity index 94%
rename from metadata/md5-cache/app-portage/portpeek-2.1.13
rename to metadata/md5-cache/app-portage/portpeek-2.1.14
index d89d93380c86..b43754567908 100644
--- a/metadata/md5-cache/app-portage/portpeek-2.1.13
+++ b/metadata/md5-cache/app-portage/portpeek-2.1.14
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=app-portage/gentoolkit-0.3.0.8-r2 >=sys-apps/portage-2.2.8-r1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
-SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.13.tar.gz
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.14.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5cbf9eacba10b15661bd3e6e92881b73
+_md5_=9a00d4b3f8f8504ebb15ae0d80bc7988
diff --git a/metadata/md5-cache/app-text/dos2unix-6.0.5 b/metadata/md5-cache/app-text/dos2unix-6.0.5
index 906fd68cf4de..ef18a41072b7 100644
--- a/metadata/md5-cache/app-text/dos2unix-6.0.5
+++ b/metadata/md5-cache/app-text/dos2unix-6.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=5
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/
 IUSE=debug nls
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u !app-text/unix2dos virtual/libintl
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-6.0.5.tar.gz mirror://sourceforge/dos2unix/dos2unix-6.0.5.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5c3617165ac0210b187e1ab116ac84ef
+_md5_=140a2587527e1307d02459f59daaa7f4
diff --git a/metadata/md5-cache/app-text/jist-1.3.0 b/metadata/md5-cache/app-text/jist-1.3.0
index 86a8ee271230..70ad1630e6fb 100644
--- a/metadata/md5-cache/app-text/jist-1.3.0
+++ b/metadata/md5-cache/app-text/jist-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A ruby gem to publish a gist
 EAPI=4
 HOMEPAGE=http://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.3.0.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bf2d65113a87646126eec567c72ee442
+_md5_=6c8571074f33fe12bf20e8786da1d45b
diff --git a/metadata/md5-cache/app-text/jist-1.3.1 b/metadata/md5-cache/app-text/jist-1.3.1
index b9d407db16d7..87e6df0216fb 100644
--- a/metadata/md5-cache/app-text/jist-1.3.1
+++ b/metadata/md5-cache/app-text/jist-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A ruby gem to publish a gist
 EAPI=4
 HOMEPAGE=http://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.3.1.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5e5685731e7b8eb8d7b4414ff6a65968
+_md5_=b13b8b1bd93b9d1c6feab90c40c5a17c
diff --git a/metadata/md5-cache/app-text/jist-1.4.0 b/metadata/md5-cache/app-text/jist-1.4.0
index f5e785ddb11b..f1a2ebb26dda 100644
--- a/metadata/md5-cache/app-text/jist-1.4.0
+++ b/metadata/md5-cache/app-text/jist-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A ruby gem to publish a gist
 EAPI=5
 HOMEPAGE=http://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.4.0.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=12bf9fad00e2d06109fa4a8d035e4d53
+_md5_=5b737222b5c8414443a3cd47108344d8
diff --git a/metadata/md5-cache/app-text/jist-1.5.0 b/metadata/md5-cache/app-text/jist-1.5.0
index 343caacfdf0d..6f780e524c95 100644
--- a/metadata/md5-cache/app-text/jist-1.5.0
+++ b/metadata/md5-cache/app-text/jist-1.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A ruby gem to publish a gist
 EAPI=5
 HOMEPAGE=http://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.0.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7bd1b598abe9573543bcc01edb5ae296
+_md5_=d63b8c6a3591424ff46d33a5e404a520
diff --git a/metadata/md5-cache/app-text/jist-1.5.1 b/metadata/md5-cache/app-text/jist-1.5.1
index 041cedaaf151..b5d741b75964 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1
+++ b/metadata/md5-cache/app-text/jist-1.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ) 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] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A ruby gem to publish a gist
 EAPI=5
 HOMEPAGE=http://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/json[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.1.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=76d28392c89177f53c70f2e7d47708b0
+_md5_=f1663c9edf712434a8e1e10fa8e6e362
diff --git a/metadata/md5-cache/app-text/multitail-5.2.12 b/metadata/md5-cache/app-text/multitail-5.2.12
deleted file mode 100644
index 634114bcb0f8..000000000000
--- a/metadata/md5-cache/app-text/multitail-5.2.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=Tail with multiple windows
-EAPI=5
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug doc examples
-KEYWORDS=amd64 hppa ia64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-5.2.12.tgz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1ede2cef55ac80c553fac52e355a4deb
diff --git a/metadata/md5-cache/app-text/multitail-6.0 b/metadata/md5-cache/app-text/multitail-6.0
deleted file mode 100644
index 40ee562221f8..000000000000
--- a/metadata/md5-cache/app-text/multitail-6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses[unicode?] virtual/pkgconfig
-DESCRIPTION=Tail with multiple windows
-EAPI=5
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug examples unicode
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-6.0.tgz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1d92f88069ab023c7c24541a04256ab6
diff --git a/metadata/md5-cache/app-text/multitail-6.1 b/metadata/md5-cache/app-text/multitail-6.1
deleted file mode 100644
index f6bf567347ad..000000000000
--- a/metadata/md5-cache/app-text/multitail-6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses[unicode?] virtual/pkgconfig
-DESCRIPTION=Tail with multiple windows
-EAPI=5
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug examples unicode
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-6.1.tgz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=58e649e0bd1be01273b63744c9a0a8f9
diff --git a/metadata/md5-cache/app-text/multitail-6.2 b/metadata/md5-cache/app-text/multitail-6.2
deleted file mode 100644
index 945aea83e6a0..000000000000
--- a/metadata/md5-cache/app-text/multitail-6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses[unicode?] virtual/pkgconfig
-DESCRIPTION=Tail with multiple windows
-EAPI=5
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug examples unicode
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses[unicode?]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-6.2.tgz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4b98f2527e677683938192213017c389
diff --git a/metadata/md5-cache/app-vim/command-t-1.5.1 b/metadata/md5-cache/app-vim/command-t-1.5.1
index cf5d639c3135..9deb15de037b 100644
--- a/metadata/md5-cache/app-vim/command-t-1.5.1
+++ b/metadata/md5-cache/app-vim/command-t-1.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=vim plugin: fast file navigation for vim
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3025 https://wincent.com/products/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.5.1.tar.bz2 http://dev.gentoo.org/~radhermit/vim/command-t-1.5.1.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
-_md5_=ca2c75a5c9229ffe6b4e872750eaa602
+_md5_=8bbeb35e4b8466dfd1792f45ef7791e7
diff --git a/metadata/md5-cache/app-vim/command-t-1.6 b/metadata/md5-cache/app-vim/command-t-1.6
index 803b8eae1914..da9866b5e9e1 100644
--- a/metadata/md5-cache/app-vim/command-t-1.6
+++ b/metadata/md5-cache/app-vim/command-t-1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=vim plugin: fast file navigation for vim
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3025 https://wincent.com/products/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.6.tar.bz2 http://dev.gentoo.org/~radhermit/vim/command-t-1.6.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
-_md5_=ebb9848b2ab72ce946e221c01259328d
+_md5_=26746b85d2b7b78a25e12301d422b5a5
diff --git a/metadata/md5-cache/app-vim/command-t-1.6.1 b/metadata/md5-cache/app-vim/command-t-1.6.1
index fa1a3662464a..06f376837726 100644
--- a/metadata/md5-cache/app-vim/command-t-1.6.1
+++ b/metadata/md5-cache/app-vim/command-t-1.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=vim plugin: fast file navigation for vim
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3025 https://wincent.com/products/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.6.1.tar.bz2 http://dev.gentoo.org/~radhermit/vim/command-t-1.6.1.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
-_md5_=5bb3dd7a9dda1cd7950030428a0fb9de
+_md5_=89a00da5809254921bdc189a4b4c2ea4
diff --git a/metadata/md5-cache/app-vim/command-t-1.7 b/metadata/md5-cache/app-vim/command-t-1.7
index d468af47f256..8d755ed18651 100644
--- a/metadata/md5-cache/app-vim/command-t-1.7
+++ b/metadata/md5-cache/app-vim/command-t-1.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=vim plugin: fast file navigation for vim
 EAPI=5
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3025 https://wincent.com/products/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.7.tar.bz2 http://dev.gentoo.org/~radhermit/vim/command-t-1.7.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
-_md5_=eb942a24a5bfec28a7686ab00a4566fe
+_md5_=5cb673d9d9a85566ba03ddf947fd50d3
diff --git a/metadata/md5-cache/app-xemacs/gnus-1.91 b/metadata/md5-cache/app-xemacs/gnus-1.91
deleted file mode 100644
index 38908c187cf0..000000000000
--- a/metadata/md5-cache/app-xemacs/gnus-1.91
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=The Gnus Newsreader and Mailreader
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/dired app-xemacs/mh-e app-xemacs/sieve app-xemacs/ps-print app-xemacs/w3 app-xemacs/pgg app-xemacs/mailcrypt app-xemacs/ecrypto app-xemacs/sasl app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/gnus-1.91-pkg.tar.gz
-_eclasses_=xemacs-packages	29b865270cd0de904945912d5041f1cc
-_md5_=8c17b40ef55505ecbd4213ecadaf8f3e
diff --git a/metadata/md5-cache/app-xemacs/gnus-1.94 b/metadata/md5-cache/app-xemacs/gnus-1.94
deleted file mode 100644
index d94fdf3c8ea4..000000000000
--- a/metadata/md5-cache/app-xemacs/gnus-1.94
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=The Gnus Newsreader and Mailreader
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/dired app-xemacs/mh-e app-xemacs/sieve app-xemacs/ps-print app-xemacs/w3 app-xemacs/pgg app-xemacs/mailcrypt app-xemacs/ecrypto app-xemacs/sasl app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/gnus-1.94-pkg.tar.gz
-_eclasses_=xemacs-packages	29b865270cd0de904945912d5041f1cc
-_md5_=3b4eff33c52738f59e3bac21b6366c55
diff --git a/metadata/md5-cache/app-xemacs/mail-lib-1.79 b/metadata/md5-cache/app-xemacs/mail-lib-1.79
deleted file mode 100644
index 98d013cef1b8..000000000000
--- a/metadata/md5-cache/app-xemacs/mail-lib-1.79
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Fundamental lisp files for providing email support
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-xemacs/xemacs-eterm app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mail-lib-1.79-pkg.tar.gz
-_eclasses_=xemacs-packages	29b865270cd0de904945912d5041f1cc
-_md5_=78f7f0a9880b445195b8aaf2a9d9653e
diff --git a/metadata/md5-cache/app-xemacs/mail-lib-1.80 b/metadata/md5-cache/app-xemacs/mail-lib-1.80
deleted file mode 100644
index ef65759e2e4a..000000000000
--- a/metadata/md5-cache/app-xemacs/mail-lib-1.80
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Fundamental lisp files for providing email support
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-xemacs/xemacs-eterm app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mail-lib-1.80-pkg.tar.gz
-_eclasses_=xemacs-packages	29b865270cd0de904945912d5041f1cc
-_md5_=a1176224fbfdb4dc12982e9ea0c83717
diff --git a/metadata/md5-cache/app-xemacs/tramp-1.37 b/metadata/md5-cache/app-xemacs/tramp-1.37
deleted file mode 100644
index 3b12ac861881..000000000000
--- a/metadata/md5-cache/app-xemacs/tramp-1.37
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Remote shell-based file editing
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-xemacs/xemacs-base app-xemacs/vc app-xemacs/efs app-xemacs/dired app-xemacs/mail-lib app-xemacs/gnus app-xemacs/ediff app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/tramp-1.37-pkg.tar.gz
-_eclasses_=xemacs-packages	29b865270cd0de904945912d5041f1cc
-_md5_=4f9b670ead9f50ab1a32bdeb6905b7f6
diff --git a/metadata/md5-cache/app-xemacs/tramp-1.40 b/metadata/md5-cache/app-xemacs/tramp-1.40
deleted file mode 100644
index 9e872ed0e142..000000000000
--- a/metadata/md5-cache/app-xemacs/tramp-1.40
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Remote shell-based file editing
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-xemacs/xemacs-base app-xemacs/vc app-xemacs/efs app-xemacs/dired app-xemacs/mail-lib app-xemacs/gnus app-xemacs/ediff app-xemacs/sh-script app-xemacs/edebug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/tramp-1.40-pkg.tar.gz
-_eclasses_=xemacs-packages	29b865270cd0de904945912d5041f1cc
-_md5_=54d242e0286940dccc1b027e80b6f3a8
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.1.3 b/metadata/md5-cache/dev-cpp/eigen-3.1.3
index b20df4f0b5e0..8e2f3f5543d2 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.1.3
+++ b/metadata/md5-cache/dev-cpp/eigen-3.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=C++ template library for linear algebra: vectors, matrices, and rela
 EAPI=4
 HOMEPAGE=http://eigen.tuxfamily.org/
 IUSE=debug doc
-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
 LICENSE=LGPL-2 GPL-3
 RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=http://bitbucket.org/eigen/eigen/get/3.1.3.tar.bz2 -> eigen-3.1.3.tar.bz2
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=9e0c3b4ce6e0b81e436a8947133a37b7
+_md5_=a8611228f48e772f347773c8798db44a
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.11 b/metadata/md5-cache/dev-db/lmdb-0.9.11
index 7df5062ccf65..37fbbfdf3244 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.11
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.11
@@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=5
 HOMEPAGE=http://symas.com/mdb/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa x86
 LICENSE=OPENLDAP
 SLOT=0
 SRC_URI=https://gitorious.org/mdb/mdb/archive/aa3463ec7c5e979420b13c8f37caa377ed2c1cf1.tar.gz -> lmtp-0.9.11.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=b74954832f630a26b28db9177dd2be3c
+_md5_=ce9d2ce36bb8d31c545b72fefefda924
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.39 b/metadata/md5-cache/dev-db/mysql-5.5.39
index d19a6005cf8b..befc4d0844fa 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.39
+++ b/metadata/md5-cache/dev-db/mysql-5.5.39
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=5
 HOMEPAGE=http://www.mysql.com/
 IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
@@ -12,4 +12,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.39.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.39.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.39.tar.gz mirror://gentoo/mysql-extras-20140801-1950Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140801-1950Z.tar.bz2
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	64177afd83677e2e1de9667e120bc34c	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1d1fa32acded9f8640eb980ab41b0a4b
+_md5_=7528b20f0e41c7bb8fb83dc92911c963
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.17 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.17
index eca9d6818151..ad7c184089fa 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.17
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.1.9-r1 ) sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.1.9-r1 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=4
 HOMEPAGE=http://www.mysql.com/
@@ -11,5 +11,5 @@ RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.17.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.17.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.17.tar.gz
-_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-r3	6ebae45064cb04482f3c702632dd9528	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	64177afd83677e2e1de9667e120bc34c	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5d5df02e40b2d86fad634b3ff8e65039
+_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	64177afd83677e2e1de9667e120bc34c	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=77dfb4a69a59bfa71f750d00d77470a3
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.6 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.6
index 2799192ad60e..a6269bdbea29 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.6
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.1.9-r1 ) sys-devel/gnuconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 dev-libs/libedit !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.1.9-r1 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 dev-libs/libedit !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=4
 HOMEPAGE=http://www.mysql.com/
@@ -11,5 +11,5 @@ RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.3/mysql-cluster-gpl-7.3.6.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.3/mysql-cluster-gpl-7.3.6.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.6.tar.gz
-_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-r3	6ebae45064cb04482f3c702632dd9528	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	64177afd83677e2e1de9667e120bc34c	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9719c72ba9dfb5f6425ca3d8ae53cf33
+_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	64177afd83677e2e1de9667e120bc34c	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c2c51235286d6daf2ffd893533a1ed82
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.1.8 b/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.1
similarity index 86%
rename from metadata/md5-cache/dev-db/phpmyadmin-4.1.8
rename to metadata/md5-cache/dev-db/phpmyadmin-4.0.10.1
index cb4ded6250b0..e160a12aa8c7 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.1.8
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.1
@@ -7,7 +7,7 @@ IUSE=setup vhosts
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=4.1.8
-SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.1.8-all-languages.tar.xz
+SLOT=4.0.10.1
+SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.0.10.1-all-languages.tar.xz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0f1760274637a138b99bb649202ea402	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=ae423f7d641444e539ccb4a35356acd5
+_md5_=0c3c12d98cbc60f79dadde8fcd8add94
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.0.5 b/metadata/md5-cache/dev-db/phpmyadmin-4.0.5
deleted file mode 100644
index 12778aaac9f1..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=4
-HOMEPAGE=http://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=4.0.5
-SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.0.5-all-languages.tar.xz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0f1760274637a138b99bb649202ea402	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=bf0fa7f76c4f775ba3524813a65088fa
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.0.6 b/metadata/md5-cache/dev-db/phpmyadmin-4.0.6
deleted file mode 100644
index 5b8b9f0041d9..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=4
-HOMEPAGE=http://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=4.0.6
-SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.0.6-all-languages.tar.xz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0f1760274637a138b99bb649202ea402	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=1e2c14bf94e4a912b40027dc1174347d
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.2.2 b/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.2
similarity index 86%
rename from metadata/md5-cache/dev-db/phpmyadmin-4.2.2
rename to metadata/md5-cache/dev-db/phpmyadmin-4.1.14.2
index 3432300726b2..430288f5bc13 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.2.2
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.2
@@ -7,7 +7,7 @@ IUSE=setup vhosts
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=4.2.2
-SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.2.2-all-languages.tar.xz
+SLOT=4.1.14.2
+SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.1.14.2-all-languages.tar.xz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0f1760274637a138b99bb649202ea402	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=7b53b75e467b3694b78a474835eeb21a
+_md5_=dd027429a20e26b9a07da0cbbf87267d
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.1.4 b/metadata/md5-cache/dev-db/phpmyadmin-4.2.7
similarity index 88%
rename from metadata/md5-cache/dev-db/phpmyadmin-4.1.4
rename to metadata/md5-cache/dev-db/phpmyadmin-4.2.7
index 700978cdc996..36f6782cbaa5 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.1.4
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.2.7
@@ -7,7 +7,7 @@ IUSE=setup vhosts
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=4.1.4
-SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.1.4-all-languages.tar.xz
+SLOT=4.2.7
+SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.2.7-all-languages.tar.xz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0f1760274637a138b99bb649202ea402	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=d81b648d3c3f3839bc7e1399b24a1bd3
+_md5_=18eb92928303223079acab83be5e8693
diff --git a/metadata/md5-cache/dev-db/sqlite-3.8.5 b/metadata/md5-cache/dev-db/sqlite-3.8.5
index 1947516ffd48..2ad6b1406b83 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.8.5
+++ b/metadata/md5-cache/dev-db/sqlite-3.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r14 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2014/sqlite-doc-3080500.zip ) tcl? ( http://sqlite.org/2014/sqlite-src-3080500.zip ) !tcl? ( test? ( http://sqlite.org/2014/sqlite-src-3080500.zip ) !test? ( http://sqlite.org/2014/sqlite-autoconf-3080500.tar.gz ) )
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e70062a118c8cb806b3d2505072fc2a6
+_md5_=4f406593b2ef6d930041bb3332b062e5
diff --git a/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1 b/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1
index d7fc06a11c52..2c9625800e39 100644
--- a/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1
+++ b/metadata/md5-cache/dev-haskell/cairo-0.12.5.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Binding to the Cairo library
 EAPI=5
 HOMEPAGE=http://projects.haskell.org/gtk2hs/
 IUSE=+pdf +postscript +svg doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] >=dev-lang/ghc-6.10.4:= x11-libs/cairo[svg?]
 SLOT=0/0.12.5.0
 SRC_URI=mirror://hackage/packages/archive/cairo/0.12.5.0/cairo-0.12.5.0.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	ghc-package	9dd58db252d8252779bb74ed015196e3	haskell-cabal	b6154aeaa4dfbbc6d8a66d7f739c22d1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d5969e9e1df97fdcb02d1d8be76a387e
+_md5_=9bdf3c8c0f5b8912c8bcb238ade30090
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r5 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r5
index c8b5f5e7eb3f..52ec7acfa47b 100644
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r5
+++ b/metadata/md5-cache/dev-java/commons-jelly-1.0-r5
@@ -4,10 +4,10 @@ DESCRIPTION=A Java and XML based scripting and processing engine
 EAPI=4
 HOMEPAGE=http://commons.apache.org/jelly/
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/commons-discovery:0 dev-java/commons-jexl:1.0 dev-java/commons-lang:0 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/jakarta-jstl:0 dev-java/jaxen:1.1 dev-java/junit:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4d7a2054a34bd22a1b1f7fc48a8f39fc
+_md5_=9e593ca662321312afbb59c723432c28
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.18 b/metadata/md5-cache/dev-java/jcommon-1.0.18
index a2d66eb0ec77..1ed57174c043 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.18
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.18
@@ -4,10 +4,10 @@ DESCRIPTION=JCommon is a collection of useful classes used by JFreeChart, JFreeR
 EAPI=5
 HOMEPAGE=http://www.jfree.org/jcommon
 IUSE=debug elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.18.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d8c2794b7832673de844231c9bf18834
+_md5_=206dd2d43d50c7e934043b21844c5363
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.49 b/metadata/md5-cache/dev-java/jsch-0.1.49
index 17f6cca0cc0b..11203ecaffc6 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.49
+++ b/metadata/md5-cache/dev-java/jsch-0.1.49
@@ -4,10 +4,10 @@ DESCRIPTION=JSch is a pure Java implementation of SSH2
 EAPI=2
 HOMEPAGE=http://www.jcraft.com/jsch/
 IUSE=zlib elibc_FreeBSD doc source examples elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=virtual/jdk-1.5 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.49.zip
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=693e2c902b6f1c3e56ba1ee3172eff04
+_md5_=5b1f7e22c915cd92dc4e19919e703ec7
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18 b/metadata/md5-cache/dev-java/nekohtml-1.9.18
index 0b29c778708c..e0d7dce01bce 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18
@@ -4,10 +4,10 @@ DESCRIPTION=A simple HTML scanner and tag balancer using standard XML interfaces
 EAPI=5
 HOMEPAGE=http://nekohtml.sourceforge.net/
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=91c5d7dd204ba667a4232abf68948cbd
+_md5_=1222373b9d409c2de5a026d2bf468abe
diff --git a/metadata/md5-cache/dev-lang/go-1.3 b/metadata/md5-cache/dev-lang/go-1.3
index 9981adc52eed..32a10c75e48b 100644
--- a/metadata/md5-cache/dev-lang/go-1.3
+++ b/metadata/md5-cache/dev-lang/go-1.3
@@ -3,10 +3,10 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=5
 HOMEPAGE=http://www.golang.org
 IUSE=bash-completion emacs vim-syntax zsh-completion
-KEYWORDS=-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
+KEYWORDS=-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=bash-completion? ( app-shells/bash-completion ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh-completion )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/golang/go1.3.src.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=ea79c3b1174cb60b9c739f56f3c2f06f
+_md5_=79ce21c50c9dc5b8e2b43d65e3174770
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.75-r1 b/metadata/md5-cache/dev-lang/jimtcl-0.75-r1
new file mode 100644
index 000000000000..1831531fcad0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.75-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=doc? ( app-text/asciidoc ) app-arch/unzip
+DESCRIPTION=Small footprint implementation of Tcl programming language
+EAPI=5
+HOMEPAGE=http://jim.tcl.tk/
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86
+LICENSE=LGPL-2
+SLOT=0
+SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.75 -> jimtcl-0.75.zip
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=9b4d0fae2462722cb458054ba292726d
diff --git a/metadata/md5-cache/dev-lang/jimtcl-9999 b/metadata/md5-cache/dev-lang/jimtcl-9999
index a361c5b3743f..00baee7e0c35 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-9999
+++ b/metadata/md5-cache/dev-lang/jimtcl-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile configure install unpack
+DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=doc? ( app-text/asciidoc ) app-arch/unzip dev-vcs/git
 DESCRIPTION=Small footprint implementation of Tcl programming language
-EAPI=4
-HOMEPAGE=http://jim.tcl.tk
+EAPI=5
+HOMEPAGE=http://jim.tcl.tk/
 IUSE=doc static-libs
 LICENSE=LGPL-2
 SLOT=0
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=72f40c3f49c3e8b789f13e55b763bb52
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=6823a379f8ffb3c50c1280e7df44d4b2
diff --git a/metadata/md5-cache/dev-libs/boost-1.52.0-r7 b/metadata/md5-cache/dev-libs/boost-1.52.0-r7
index 491bb6f344a0..783bb959b37d 100644
--- a/metadata/md5-cache/dev-libs/boost-1.52.0-r7
+++ b/metadata/md5-cache/dev-libs/boost-1.52.0-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Boost Libraries for C++
 EAPI=5
 HOMEPAGE=http://www.boost.org/
 IUSE=debug doc icu +nls mpi python static-libs +threads tools python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Boost-1.0
 RDEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) app-arch/bzip2 sys-libs/zlib !app-admin/eselect-boost
 SLOT=0/1.52
 SRC_URI=mirror://sourceforge/boost/boost_1_52_0.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e74eb4f63de448a470cb95403b0521dc
+_md5_=33190372abc89b9b796ea0e20b07682b
diff --git a/metadata/md5-cache/dev-libs/boost-1.53.0-r1 b/metadata/md5-cache/dev-libs/boost-1.53.0-r1
index 2b667a2ee2f5..1e1e36a0ec7d 100644
--- a/metadata/md5-cache/dev-libs/boost-1.53.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.53.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_2 py
 SLOT=0/1.53
 SRC_URI=mirror://sourceforge/boost/boost_1_53_0.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=58881132f74170280c020fa523b655e9
+_md5_=ca6392c6e32828c838ae9468d05c7c18
diff --git a/metadata/md5-cache/dev-libs/boost-1.54.0-r1 b/metadata/md5-cache/dev-libs/boost-1.54.0-r1
index 21e92a9ec81b..014415dbb441 100644
--- a/metadata/md5-cache/dev-libs/boost-1.54.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.54.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_2 py
 SLOT=0/1.54
 SRC_URI=mirror://sourceforge/boost/boost_1_54_0.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=701a9445dda02b958cb69954a6c50cce
+_md5_=fb93c25a316ea74f4c492123537af2ce
diff --git a/metadata/md5-cache/dev-libs/boost-1.55.0-r1 b/metadata/md5-cache/dev-libs/boost-1.55.0-r1
index a2d86d6ff5f1..90660175f6cc 100644
--- a/metadata/md5-cache/dev-libs/boost-1.55.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.55.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/1.55.0
 SRC_URI=mirror://sourceforge/boost/boost_1_55_0.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ed9356021bf96efdb56a5fcabdb9f077
+_md5_=81b38a9d66615e95cadbf410228481b5
diff --git a/metadata/md5-cache/dev-libs/boost-1.55.0-r2 b/metadata/md5-cache/dev-libs/boost-1.55.0-r2
index 896c8cda62ae..fd741c0c3bdb 100644
--- a/metadata/md5-cache/dev-libs/boost-1.55.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.55.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-admin/eselect-boost =dev-util/boost-build-1.55*
+DEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-admin/eselect-boost =dev-util/boost-build-1.55*
 DESCRIPTION=Boost Libraries for C++
 EAPI=5
 HOMEPAGE=http://www.boost.org/
 IUSE=context debug doc icu +nls mpi python static-libs +threads tools python_targets_python2_7 python_targets_python3_2 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=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux
 LICENSE=Boost-1.0
-RDEPEND=icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-admin/eselect-boost
+RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-admin/eselect-boost
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) )
 RESTRICT=test
 SLOT=0/1.55.0
 SRC_URI=mirror://sourceforge/boost/boost_1_55_0.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3eb924731fa11531f404731e26f7033e
+_md5_=abbadec192e37fbbcaf25e90f4c99714
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4
index f0b9a1d9ddd8..d14196d92df7 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=static-libs
-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0/11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.4.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7068bca49b5b951e14f362b55e3562a5
+_md5_=b6b993adb639e48cdb477979ed9c8959
diff --git a/metadata/md5-cache/dev-libs/libuv-0.11.25-r1 b/metadata/md5-cache/dev-libs/libuv-0.11.25-r1
index 426ea1bc4970..65723ca95426 100644
--- a/metadata/md5-cache/dev-libs/libuv-0.11.25-r1
+++ b/metadata/md5-cache/dev-libs/libuv-0.11.25-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A new platform layer for Node
 EAPI=5
 HOMEPAGE=https://github.com/joyent/libuv
 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 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/11
 SRC_URI=https://github.com/joyent/libuv/archive/v0.11.25.tar.gz -> libuv-0.11.25.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=b6d63a393567955585de836a31431e41
+_md5_=2dccc4b632a545fbefb26d12ef9d24e4
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.15 b/metadata/md5-cache/dev-libs/newt-0.52.15
index 217adec50b37..22a7bb22549f 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.15
+++ b/metadata/md5-cache/dev-libs/newt-0.52.15
@@ -4,11 +4,11 @@ DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/newt/
 IUSE=gpm tcl nls python_targets_python2_7
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-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(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5 )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.15.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c7eac0d53f07455369fcb03c7050a654
+_md5_=b11f0ce46276204911e08878783087c5
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p2 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p2
index ee9ddb94d490..97ed5176ae43 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p2
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p2
@@ -4,10 +4,10 @@ DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
 EAPI=5
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos sse2 test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=openssl
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/openssl-0.9.8*:0
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zb.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=2614b4315b8d3fc631522f4442fa443e
+_md5_=120e37dcb105f3585db7d31f417870e5
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1i b/metadata/md5-cache/dev-libs/openssl-1.0.1i
index dd07595420dc..aba7a92a3f9d 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1i
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1i
@@ -4,11 +4,11 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=4
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-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(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1i.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=2d60ca4cdc2f63a33eb0f5ee61bff319
+_md5_=3542e0af157a681f3d5cb27ea94f2d76
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2_beta2 b/metadata/md5-cache/dev-libs/openssl-1.0.2_beta2
index 245b5d873125..9e72bf14849c 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2_beta2
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2_beta2
@@ -10,4 +10,4 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2-beta2.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=db3f241b7516cc7a7cb031e0eafee57c
+_md5_=a3f26c06750bcf4da2320e7836a3a547
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.4.0a b/metadata/md5-cache/dev-libs/protobuf-2.4.0a
index c9b6363a932f..412b70ff6d86 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.4.0a
+++ b/metadata/md5-cache/dev-libs/protobuf-2.4.0a
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structu
 EAPI=3
 HOMEPAGE=http://code.google.com/p/protobuf/
 IUSE=emacs examples java python static-libs vim-syntax elibc_FreeBSD source java
-KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
+KEYWORDS=amd64 -hppa ppc ppc64 x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.0a.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	distutils	34e0f373c466bb0e97ba194735f1acf2	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	06133990e861be0fe60c2b428fd025d9	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6d3003a2eff49ae53ac92540d9728d19
+_md5_=f0dc718dc8e02d1b3bd9d7d8d7e428e6
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.4.1 b/metadata/md5-cache/dev-libs/protobuf-2.4.1
index 0305eb5f9ae3..f182716b8c3b 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.4.1
+++ b/metadata/md5-cache/dev-libs/protobuf-2.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structu
 EAPI=3
 HOMEPAGE=http://code.google.com/p/protobuf/
 IUSE=emacs examples java python static-libs vim-syntax elibc_FreeBSD source java
-KEYWORDS=amd64 arm ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm -hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	distutils	34e0f373c466bb0e97ba194735f1acf2	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	06133990e861be0fe60c2b428fd025d9	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a1d5a6d674b03c73db54e79f47b761a8
+_md5_=6dc5a4c8cfdfbc966e313a35ed02101f
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0 b/metadata/md5-cache/dev-libs/protobuf-2.5.0
index 0d0c4f24e05d..726951dd411b 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0
@@ -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 python_targets_python2_7 elibc_FreeBSD source java
-KEYWORDS=amd64 arm ~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	ebea507d219855923e3438c953cf4ab8	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	06133990e861be0fe60c2b428fd025d9	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=44eeaee4b749ed8916a4d577fb347ca7
+_md5_=1887d177e0cf5257b75115a2696c99b7
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-0.15 b/metadata/md5-cache/dev-libs/protobuf-c-0.15
index 1653bfbcf787..af01b789acfa 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-0.15
+++ b/metadata/md5-cache/dev-libs/protobuf-c-0.15
@@ -4,10 +4,10 @@ DESCRIPTION=code generator and runtime libraries to use Protocol Buffers (protob
 EAPI=4
 HOMEPAGE=http://code.google.com/p/protobuf-c/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/protobuf
 SLOT=0
 SRC_URI=http://protobuf-c.googlecode.com/files/protobuf-c-0.15.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=244d28f7a1f655254a1ae7677e22c15f
+_md5_=0c87e1d60e57bdcd6b3d9e4e6a20260f
diff --git a/metadata/md5-cache/dev-libs/wayland-1.4.0 b/metadata/md5-cache/dev-libs/wayland-1.4.0
index ef405a759086..5eb4d2809dc2 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.4.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wayland protocol libraries
 EAPI=5
 HOMEPAGE=http://wayland.freedesktop.org/
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-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(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.4.0.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=55f6966647eba595020086f304145720
+_md5_=64c7ffa4d8adade24a8c778ca349a29e
diff --git a/metadata/md5-cache/dev-libs/wayland-1.5.0 b/metadata/md5-cache/dev-libs/wayland-1.5.0
index 787c5dec0598..96cad4640d6e 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.5.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wayland protocol libraries
 EAPI=5
 HOMEPAGE=http://wayland.freedesktop.org/
 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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-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(-)?] >=virtual/libffi-3.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.5.0.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=deec45c574dc6b47d4d6fa5a702b4cdd
+_md5_=a49323259ad0a3c8c67f23290edd9d34
diff --git a/metadata/md5-cache/dev-perl/Linux-DesktopFiles-0.80.0 b/metadata/md5-cache/dev-perl/Linux-DesktopFiles-0.80.0
index 235ce686c70b..7bcd7294c87b 100644
--- a/metadata/md5-cache/dev-perl/Linux-DesktopFiles-0.80.0
+++ b/metadata/md5-cache/dev-perl/Linux-DesktopFiles-0.80.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Module-Build dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl module to get and parse the Linux .desktop files
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Linux-DesktopFiles/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-lang/perl-5.14.0[gdbm] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-0.08.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=c8b7cab9120ed418e5cfa80fa575b761
+_md5_=94d3fb653bd1d6e7179434327cfd349e
diff --git a/metadata/md5-cache/dev-perl/Math-ModInt-0.7.0 b/metadata/md5-cache/dev-perl/Math-ModInt-0.7.0
new file mode 100644
index 000000000000..a0e577735b56
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Math-ModInt-0.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Math-BigInt-GMP dev-lang/perl dev-lang/perl:=[-build(-)]
+DESCRIPTION=modular integer arithmetic
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Math-ModInt/
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MH/MHASCH/Math-ModInt-0.007.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=10c6a5edb421f6cf7eecef644212f61d
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r3 b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
similarity index 75%
rename from metadata/md5-cache/dev-perl/PortageXS-0.02.10-r3
rename to metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
index e256fd759848..11460377ad58 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r3
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=dev-lang/perl virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog )
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=dev-lang/perl virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Portage abstraction layer for perl
+EAPI=5
 HOMEPAGE=http://download.mpsna.de/opensource/PortageXS/
 IUSE=minimal
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog )
+RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=4f0ac10027eb972712f4bf48589c75be
+_md5_=2a9e783ec5f8a6df1932d08967678fd9
diff --git a/metadata/md5-cache/dev-python/argh-0.25.0 b/metadata/md5-cache/dev-python/argh-0.25.0
index 59647800cef2..15e9518505d0 100644
--- a/metadata/md5-cache/dev-python/argh-0.25.0
+++ b/metadata/md5-cache/dev-python/argh-0.25.0
@@ -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_2 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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.25.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=060181718d272fabbc8edfa7ccb13712
+_md5_=0910ba01216b6eb16c860a597dfa7c79
diff --git a/metadata/md5-cache/dev-python/backports-1.0 b/metadata/md5-cache/dev-python/backports-1.0
index 062ed217c565..66bf0877b383 100644
--- a/metadata/md5-cache/dev-python/backports-1.0
+++ b/metadata/md5-cache/dev-python/backports-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Namespace for backported Python features
 EAPI=5
 HOMEPAGE=https://bitbucket.org/brandon/backports https://pypi.python.org/pypi/backports/
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=PYTHON
 RDEPEND=!<dev-python/backports-lzma-0.0.2-r1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/dist/backports-1.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=97deddce99a6081af87a0c6195da517a
+_md5_=026e477e1417f94d5f70fb0e0d16eb31
diff --git a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2 b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2
index 8312d6531d86..26035d7fa720 100644
--- a/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2
+++ b/metadata/md5-cache/dev-python/backports-ssl-match-hostname-3.4.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of the ssl.match_hostname function
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/backports.ssl_match_hostname/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=PYTHON
 RDEPEND=dev-python/backports[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/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=586bde697f722c665fa8ea3a319046cc
+_md5_=4aca0b774bb5ddc095111357c1d627da
diff --git a/metadata/md5-cache/dev-python/cffi-0.8.1 b/metadata/md5-cache/dev-python/cffi-0.8.1
index c5d8699e54a4..ed752b3c9c6c 100644
--- a/metadata/md5-cache/dev-python/cffi-0.8.1
+++ b/metadata/md5-cache/dev-python/cffi-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
 EAPI=5
 HOMEPAGE=http://cffi.readthedocs.org/
 IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0/0.8.1
 SRC_URI=mirror://pypi/c/cffi/cffi-0.8.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=af77e6b49f09ab3d092a2fae78e9b064
+_md5_=58203d64f53572011f8102ce1237262b
diff --git a/metadata/md5-cache/dev-python/cffi-0.8.2 b/metadata/md5-cache/dev-python/cffi-0.8.2
index aa3fcb2a52a7..03f09a6c1140 100644
--- a/metadata/md5-cache/dev-python/cffi-0.8.2
+++ b/metadata/md5-cache/dev-python/cffi-0.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
 EAPI=5
 HOMEPAGE=http://cffi.readthedocs.org/
 IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0/0.8.2
 SRC_URI=mirror://pypi/c/cffi/cffi-0.8.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=50c0b8589c60f851f2fe082a413c7d9b
+_md5_=3ffa3eb80a5d70292f831e7a1ba83690
diff --git a/metadata/md5-cache/dev-python/cffi-0.8.6 b/metadata/md5-cache/dev-python/cffi-0.8.6
index cfc126df27c2..8d06eac4f5a8 100644
--- a/metadata/md5-cache/dev-python/cffi-0.8.6
+++ b/metadata/md5-cache/dev-python/cffi-0.8.6
@@ -4,11 +4,11 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
 EAPI=5
 HOMEPAGE=http://cffi.readthedocs.org/
 IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=virtual/libffi dev-python/pycparser[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0/0.8.6
 SRC_URI=mirror://pypi/c/cffi/cffi-0.8.6.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a78f0d52c9202e02dd69db0b78287c54
+_md5_=8d7c5f4b50e46c11bf578fe17db6191f
diff --git a/metadata/md5-cache/dev-python/cryptography-0.4-r1 b/metadata/md5-cache/dev-python/cryptography-0.4-r1
index 4266863c323a..4ee1fe1ef901 100644
--- a/metadata/md5-cache/dev-python/cryptography-0.4-r1
+++ b/metadata/md5-cache/dev-python/cryptography-0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=5
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0 >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_2? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-0.4.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f6d3e360adba715eed18bd604b246f3c
+_md5_=c0304d799994f5da00a6652ef5b1b62e
diff --git a/metadata/md5-cache/dev-python/cryptography-0.4-r2 b/metadata/md5-cache/dev-python/cryptography-0.4-r2
index 2ca72a0d251c..c9250682f662 100644
--- a/metadata/md5-cache/dev-python/cryptography-0.4-r2
+++ b/metadata/md5-cache/dev-python/cryptography-0.4-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=5
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0 >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_2? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-0.4.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=b9ef2fd7d44c6f4adfe9f53fcd1d1efa
+_md5_=2877c6e0671f6b01b1891febcca2957d
diff --git a/metadata/md5-cache/dev-python/cryptography-0.5.1 b/metadata/md5-cache/dev-python/cryptography-0.5.1
index ee576567eab1..3a8a4be7a702 100644
--- a/metadata/md5-cache/dev-python/cryptography-0.5.1
+++ b/metadata/md5-cache/dev-python/cryptography-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=5
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0 >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_2? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-0.5.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=591d9a86096517035ee0ce754820cf9d
+_md5_=579e66e4491560c4b38f6819e437b1e6
diff --git a/metadata/md5-cache/dev-python/cryptography-0.5.2 b/metadata/md5-cache/dev-python/cryptography-0.5.2
index 89c8c24afe4a..b0a0df709aa9 100644
--- a/metadata/md5-cache/dev-python/cryptography-0.5.2
+++ b/metadata/md5-cache/dev-python/cryptography-0.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=5
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0 >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_2? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-0.5.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f113355058d568b9547c3d44c3c578a7
+_md5_=a68c706ed0c4848d1398bca949770fa6
diff --git a/metadata/md5-cache/dev-python/cryptography-0.5.3 b/metadata/md5-cache/dev-python/cryptography-0.5.3
index d067068367f9..3f8eb8163679 100644
--- a/metadata/md5-cache/dev-python/cryptography-0.5.3
+++ b/metadata/md5-cache/dev-python/cryptography-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=5
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/openssl:0 >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_2? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/cffi-0.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-0.5.3.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a0353e2950973b774ae60fd163c439c1
+_md5_=cf09cad6192845b05b1ac5ada85650b4
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-0.3 b/metadata/md5-cache/dev-python/cryptography-vectors-0.3
index 6de5325d3222..d816c8881f83 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-0.3
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-0.3.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=70d833b75fff6aadf97a42ad99ddafcd
+_md5_=51721d43453398b97e0a79eb21d3e168
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-0.4 b/metadata/md5-cache/dev-python/cryptography-vectors-0.4
index 93bbeea01969..d165ce916188 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-0.4
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-0.4.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f1598bf8d053ae0041fcf11969332c68
+_md5_=0408cfb4011d1f2759611d8626076884
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-0.5.1 b/metadata/md5-cache/dev-python/cryptography-vectors-0.5.1
index b724cf932990..a6e9854b16f1 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-0.5.1
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-0.5.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=805ef4ebd419d30687206d442be4b12a
+_md5_=5343886bf0a39c44759812b5f226fe7a
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-0.5.2 b/metadata/md5-cache/dev-python/cryptography-vectors-0.5.2
index a5ea24d28c71..937c7fb9ed37 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-0.5.2
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-0.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-0.5.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=6a4f5a0593eaead0d2723d6331a83c36
+_md5_=53a317de7d3690cc651acf7613c2ec61
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-0.5.3 b/metadata/md5-cache/dev-python/cryptography-vectors-0.5.3
index 2d113c878da0..e71592d19761 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-0.5.3
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Test vectors for the cryptography package
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cryptography-vectors/
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-0.5.3.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7058a908be0428fdb576aa7257e4ab5f
+_md5_=13b451c878510475e80a7e90bf50314d
diff --git a/metadata/md5-cache/dev-python/foolscap-0.6.4-r1 b/metadata/md5-cache/dev-python/foolscap-0.6.4-r1
index 60b6a9641cc7..03ce0e8945df 100644
--- a/metadata/md5-cache/dev-python/foolscap-0.6.4-r1
+++ b/metadata/md5-cache/dev-python/foolscap-0.6.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=RPC protocol for Twisted
 EAPI=5
 HOMEPAGE=http://foolscap.lothar.com/trac http://pypi.python.org/pypi/foolscap
 IUSE=doc ssl python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/twisted-core-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ssl? ( dev-python/pyopenssl[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://foolscap.lothar.com/releases/foolscap-0.6.4.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=208b8d7ffcd8d13f95fbb5f1734d289c
+_md5_=d43ea9c4b16a3d7d047fbd214d3b255f
diff --git a/metadata/md5-cache/dev-python/html5lib-0.95-r1 b/metadata/md5-cache/dev-python/html5lib-0.95-r1
index aa323521ce8e..d53fc173fcce 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.95-r1
+++ b/metadata/md5-cache/dev-python/html5lib-0.95-r1
@@ -4,11 +4,11 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=5
 HOMEPAGE=http://code.google.com/p/html5lib/ http://pypi.python.org/pypi/html5lib
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_pypy? ( virtual/pypy:0=[xml(+)] ) 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=http://html5lib.googlecode.com/files/html5lib-0.95.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7c863f7931d3a1329cdc32e2c7e744ca
+_md5_=fff5bf182ad7b3295ecf2d8689d0e5b6
diff --git a/metadata/md5-cache/dev-python/html5lib-0.999 b/metadata/md5-cache/dev-python/html5lib-0.999
index bcecf88db10e..7d86fcf986e5 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.999
+++ b/metadata/md5-cache/dev-python/html5lib-0.999
@@ -4,11 +4,11 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=5
 HOMEPAGE=https://github.com/html5lib/html5lib-python/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[xml(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_pypy? ( virtual/pypy:0=[xml(+)] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-0.999.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=82d0576bbaf63745bb6657205424a7a9
+_md5_=262ebfb4a1133d73edbb9454889dce04
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.10 b/metadata/md5-cache/dev-python/iso8601-0.1.10
index 1deac6e1ea0f..d99a9d1363bc 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.10
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Simple module to parse ISO 8601 dates
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pyiso8601/ http://pypi.python.org/pypi/iso8601
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.10.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8834483f3c9aacd9bc4e37d0e8cdc24a
+_md5_=ca15a7868c737600cc55a92f29c139e9
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.4 b/metadata/md5-cache/dev-python/iso8601-0.1.4
index adb64d3a0213..e9ce3242c343 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.4
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Simple module to parse ISO 8601 dates
 EAPI=3
 HOMEPAGE=http://code.google.com/p/pyiso8601/ http://pypi.python.org/pypi/iso8601
 IUSE=test test
-KEYWORDS=~amd64 ~ia64 ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.4.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=251ff92503d28bc1707cbd51e04e2c3e
+_md5_=e96fa58dc86d4b09e0efd48fa90f37ee
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.4-r1 b/metadata/md5-cache/dev-python/iso8601-0.1.4-r1
index bce38abf4628..3749a632b678 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple module to parse ISO 8601 dates
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pyiso8601/ http://pypi.python.org/pypi/iso8601
 IUSE=test python_targets_python2_7 python_targets_pypy
-KEYWORDS=~amd64 ~ia64 ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.4.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=b80dde143f77bfb14edeca160a33674b
+_md5_=c84f43515bdde8a48bf2013133ad2f66
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.8 b/metadata/md5-cache/dev-python/iso8601-0.1.8
index 5899ceee0d8d..c1788f52ca30 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.8
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.8
@@ -4,11 +4,11 @@ DESCRIPTION=Simple module to parse ISO 8601 dates
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pyiso8601/ http://pypi.python.org/pypi/iso8601
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ia64 ~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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.8.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=72b2757b65d13e6d0c51ef4e2b52a70a
+_md5_=ffd3becbfbc6434328b95e5d8ad91599
diff --git a/metadata/md5-cache/dev-python/nevow-0.11.1 b/metadata/md5-cache/dev-python/nevow-0.11.1
index 6e24fe3a7136..a642ae025086 100644
--- a/metadata/md5-cache/dev-python/nevow-0.11.1
+++ b/metadata/md5-cache/dev-python/nevow-0.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=A web templating framework that provides LivePage, an automatic AJAX
 EAPI=5
 HOMEPAGE=http://divmod.org/trac/wiki/DivmodNevow http://pypi.python.org/pypi/Nevow
 IUSE=doc python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-zope/zope-interface[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/N/Nevow/Nevow-0.11.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5838685bbe665c0335fb3324fbcb21a0
+_md5_=244db1a761d197f2c54400b6b491f970
diff --git a/metadata/md5-cache/dev-python/numpy-1.8.1 b/metadata/md5-cache/dev-python/numpy-1.8.1
index eb7bb867600d..617f4da0b208 100644
--- a/metadata/md5-cache/dev-python/numpy-1.8.1
+++ b/metadata/md5-cache/dev-python/numpy-1.8.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.8.1.tar.gz doc? ( http://docs.scipy.org/doc/numpy-1.8.1/numpy-html-1.8.1.zip http://docs.scipy.org/doc/numpy-1.8.1/numpy-ref-1.8.1.pdf http://docs.scipy.org/doc/numpy-1.8.1/numpy-user-1.8.1.pdf )
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d0e3d408611d6206bb44aed1f8a09470
+_md5_=3ddb1b4f8a4315ead3812117bae61191
diff --git a/metadata/md5-cache/dev-python/pandas-0.14.0 b/metadata/md5-cache/dev-python/pandas-0.14.0
index 89ebf7ef2467..abd7950491ea 100644
--- a/metadata/md5-cache/dev-python/pandas-0.14.0
+++ b/metadata/md5-cache/dev-python/pandas-0.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_timeseries[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/openpyxl-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_timeseries[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=5
 HOMEPAGE=http://pandas.sourceforge.net/
@@ -11,4 +11,4 @@ REQUIRED_USE=excel? ( !python_targets_python3_2 ) doc? ( !python_targets_python3
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-0.14.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8e4d263fadc9d4894ba4745c0d83951c
+_md5_=550bacd082bbb28c2fc73a3f456e3dcb
diff --git a/metadata/md5-cache/dev-python/pandas-0.14.1 b/metadata/md5-cache/dev-python/pandas-0.14.1
new file mode 100644
index 000000000000..17f672e33249
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-0.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/openpyxl-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_timeseries[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Powerful data structures for data analysis and statistics
+EAPI=5
+HOMEPAGE=http://pandas.sourceforge.net/
+IUSE=doc examples excel html test R python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numexpr[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] excel? ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) html? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] || ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ) R? ( dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=excel? ( !python_targets_python3_2 ) doc? ( !python_targets_python3_2 ) R? ( !python_targets_python3_2 ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pandas/pandas-0.14.1.tar.gz
+_eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=d9e1e4edecf721c2c5f1836bc19ff636
diff --git a/metadata/md5-cache/dev-python/pathlib-1.0 b/metadata/md5-cache/dev-python/pathlib-1.0
index 58c4993f458e..9b00a2bc4667 100644
--- a/metadata/md5-cache/dev-python/pathlib-1.0
+++ b/metadata/md5-cache/dev-python/pathlib-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Object-oriented filesystem paths
 EAPI=5
 HOMEPAGE=https://pathlib.readthedocs.org/
 IUSE=python_targets_python2_7 python_targets_python3_2 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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib/pathlib-1.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=73d1f352b357105bc86f2f67c0bd0f91
+_md5_=43768e9ee6963fd6f71b21ba6552e2e5
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2 b/metadata/md5-cache/dev-python/pathtools-0.1.2
index fe4975e275f8..9177848fb102 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Pattern matching and various utilities for file systems paths
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/pathtools/
 IUSE=python_targets_python2_7 python_targets_python3_2 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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=fadb3cba1ce6970243eb6412a4fa4bb8
+_md5_=fd07b88242f9b4a2a62fb68cb31f64a0
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.1 b/metadata/md5-cache/dev-python/pdfrw-0.1
index 7031c7470367..1ec6d2fb026a 100644
--- a/metadata/md5-cache/dev-python/pdfrw-0.1
+++ b/metadata/md5-cache/dev-python/pdfrw-0.1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF file reader/writer library
 EAPI=5
 HOMEPAGE=https://code.google.com/p/pdfrw/
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfrw/pdfrw-0.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f23b4bb86a46558080c6d1b0d161e141
+_md5_=7d497919944e26707fef4d66916a41a2
diff --git a/metadata/md5-cache/dev-python/pmw-1.3.3-r2 b/metadata/md5-cache/dev-python/pmw-1.3.3-r2
index 9af7bd9457f4..3a8b9dde6355 100644
--- a/metadata/md5-cache/dev-python/pmw-1.3.3-r2
+++ b/metadata/md5-cache/dev-python/pmw-1.3.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Toolkit for building high-level compound widgets in Python using the
 EAPI=5
 HOMEPAGE=http://pmw.sourceforge.net/
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=!dev-python/pmw:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) 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=py2
 SRC_URI=mirror://sourceforge/pmw/Pmw.1.3.3.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=200696b2d3e50548366d8aaf7edb773f
+_md5_=0dd182e90ff654995c6ebbc40cf3c030
diff --git a/metadata/md5-cache/dev-python/polygon-2.0.6 b/metadata/md5-cache/dev-python/polygon-2.0.6
index eaede965d0d4..841b3d018b81 100644
--- a/metadata/md5-cache/dev-python/polygon-2.0.6
+++ b/metadata/md5-cache/dev-python/polygon-2.0.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=https://www.bitbucket.org/jraedler/polygon2/downloads/Polygon2-2.0.6.zip
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=6549eee82d98b029ce5f91ed8b59e7d4
+_md5_=979e581818ee7626574d96e5b0d7bd3c
diff --git a/metadata/md5-cache/dev-python/polygon-3.0.6 b/metadata/md5-cache/dev-python/polygon-3.0.7
similarity index 91%
rename from metadata/md5-cache/dev-python/polygon-3.0.6
rename to metadata/md5-cache/dev-python/polygon-3.0.7
index 5ef362a76f36..b832f68fdb68 100644
--- a/metadata/md5-cache/dev-python/polygon-3.0.6
+++ b/metadata/md5-cache/dev-python/polygon-3.0.7
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2
 DESCRIPTION=Python package to handle polygonal shapes in 2D
 EAPI=5
 HOMEPAGE=http://www.j-raedler.de/projects/polygon
-IUSE=python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+IUSE=examples python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=3
-SRC_URI=https://www.bitbucket.org/jraedler/polygon3/downloads/Polygon3-3.0.6.zip
+SRC_URI=https://www.bitbucket.org/jraedler/polygon3/downloads/Polygon3-3.0.7.zip
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=defe7224bb32eb0370078460083ebdbe
+_md5_=f35551db94b1a013c98528a526e988e0
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.7 b/metadata/md5-cache/dev-python/pretend-1.0.7
index 1e42fabc70fc..aeff433db409 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.7
+++ b/metadata/md5-cache/dev-python/pretend-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A library for stubbing in Python
 EAPI=5
 HOMEPAGE=https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pretend/pretend-1.0.7.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=aec5430d76f6269872aac36f9c92c310
+_md5_=c48c42f0f86d2fb49f01cd785ca10e22
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.8 b/metadata/md5-cache/dev-python/pretend-1.0.8
index 66c9928607b5..6c4fa531c827 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.8
+++ b/metadata/md5-cache/dev-python/pretend-1.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=A library for stubbing in Python
 EAPI=5
 HOMEPAGE=https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pretend/pretend-1.0.8.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=9904753542bce95075ec1e3d98f4992d
+_md5_=6f11b5963d29011e3bbe2c80bdfa0860
diff --git a/metadata/md5-cache/dev-python/py-1.4.23 b/metadata/md5-cache/dev-python/py-1.4.23
new file mode 100644
index 000000000000..3e5568739441
--- /dev/null
+++ b/metadata/md5-cache/dev-python/py-1.4.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( >=dev-python/pytest-2.4.2[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilities
+EAPI=5
+HOMEPAGE=http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py
+IUSE=doc test python_targets_python2_7 python_targets_python3_2 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
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/p/py/py-1.4.23.tar.gz
+_eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=3d7523c4d26c3f24e5ec3a5545494763
diff --git a/metadata/md5-cache/dev-python/pycparser-2.10 b/metadata/md5-cache/dev-python/pycparser-2.10
index 890262c3ca89..5603eb28bdf1 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.10
+++ b/metadata/md5-cache/dev-python/pycparser-2.10
@@ -4,11 +4,11 @@ DESCRIPTION=C parser and AST generator written in Python
 EAPI=5
 HOMEPAGE=https://github.com/eliben/pycparser
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.10.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=0f28bf177914fd37afbd6b394378b6e0
+_md5_=4ec6a602a8b25e46b0e25852d5cdd326
diff --git a/metadata/md5-cache/dev-python/pycryptopp-0.6.0 b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
index 355bc487b1c0..27f9f468c9db 100644
--- a/metadata/md5-cache/dev-python/pycryptopp-0.6.0
+++ b/metadata/md5-cache/dev-python/pycryptopp-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python wrappers for a few algorithms from the Crypto++ library
 EAPI=5
 HOMEPAGE=http://tahoe-lafs.org/trac/pycryptopp http://pypi.python.org/pypi/pycryptopp
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/crypto++ 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/pycryptopp/pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=27351265213786b3b913dc2ce5bf1e98
+_md5_=e576032129c21c594fc1af5e3fd17dd0
diff --git a/metadata/md5-cache/dev-python/pyopenssl-0.14 b/metadata/md5-cache/dev-python/pyopenssl-0.14
index dd9cb1ab1725..892d9d084ddc 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-0.14
+++ b/metadata/md5-cache/dev-python/pyopenssl-0.14
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to the OpenSSL library
 EAPI=5
 HOMEPAGE=http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl http://pypi.python.org/pypi/pyOpenSSL
 IUSE=doc examples python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/cryptography-0.2.1-r2[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-0.14.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4ac7fd938239622f7bd7c463a631e115
+_md5_=73128e986a9875cc7d26b17c32d2f714
diff --git a/metadata/md5-cache/dev-python/pytest-2.6.1 b/metadata/md5-cache/dev-python/pytest-2.6.1
new file mode 100644
index 000000000000..37664362d277
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-2.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/py-1.4.22[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_2? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=py.test: simple powerful testing with Python
+EAPI=5
+HOMEPAGE=http://pytest.org/ http://pypi.python.org/pypi/pytest
+IUSE=doc test python_targets_python2_7 python_targets_python3_2 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
+LICENSE=MIT
+RDEPEND=>=dev-python/py-1.4.22[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest/pytest-2.6.1.tar.gz
+_eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=df4d9a632095515f0846345cb920534c
diff --git a/metadata/md5-cache/dev-python/rdflib-4.0.1 b/metadata/md5-cache/dev-python/rdflib-4.0.1
index 6d60e0382407..a39cb546a90c 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.0.1
+++ b/metadata/md5-cache/dev-python/rdflib-4.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=5
 HOMEPAGE=https://github.com/RDFLib/rdflib http://pypi.python.org/pypi/rdflib
 IUSE=berkdb examples mysql redland sqlite test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.0.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=61f5b7ed8a100d1e3c2f86959658f108
+_md5_=dbf89205d5b582b2db2eb6f85bb64458
diff --git a/metadata/md5-cache/dev-python/rdflib-4.1.0 b/metadata/md5-cache/dev-python/rdflib-4.1.0
index e5eb5290f4c1..55bad672d021 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.1.0
+++ b/metadata/md5-cache/dev-python/rdflib-4.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=5
 HOMEPAGE=https://github.com/RDFLib/rdflib http://pypi.python.org/pypi/rdflib
 IUSE=berkdb examples mysql redland sqlite test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.1.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5fb1c6ed0109bb7105bc92ced153ef1d
+_md5_=ff85a4d7a6fa49c8323f57ef972eb908
diff --git a/metadata/md5-cache/dev-python/rdflib-4.1.1 b/metadata/md5-cache/dev-python/rdflib-4.1.1
index 4239a793a0d3..b534e2380b0d 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.1.1
+++ b/metadata/md5-cache/dev-python/rdflib-4.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=5
 HOMEPAGE=https://github.com/RDFLib/rdflib http://pypi.python.org/pypi/rdflib
 IUSE=berkdb examples mysql redland sqlite test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.1.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=2003bf82db0b2ab73f2627fe66209a62
+_md5_=c84a27cdec9d67f1e5ae03b0d8f352c1
diff --git a/metadata/md5-cache/dev-python/rdflib-4.1.2 b/metadata/md5-cache/dev-python/rdflib-4.1.2
index 7b815ba9f2ae..d26eefacc684 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.1.2
+++ b/metadata/md5-cache/dev-python/rdflib-4.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=5
 HOMEPAGE=https://github.com/RDFLib/rdflib http://pypi.python.org/pypi/rdflib
 IUSE=berkdb examples mysql redland sqlite test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.1.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=2a2e180d38881f6bad5812bdc3cdfe1a
+_md5_=c8931283951afb0dbd10aa307df4582a
diff --git a/metadata/md5-cache/dev-python/rst2pdf-0.93-r2 b/metadata/md5-cache/dev-python/rst2pdf-0.93-r2
index 84d8797cdb6a..f77e9496e2a6 100644
--- a/metadata/md5-cache/dev-python/rst2pdf-0.93-r2
+++ b/metadata/md5-cache/dev-python/rst2pdf-0.93-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for transforming reStructuredText to PDF using ReportLab
 EAPI=5
 HOMEPAGE=http://rst2pdf.ralsina.com.ar/ http://pypi.python.org/pypi/rst2pdf
 IUSE=svg python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pdfrw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/reportlab-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] svg? ( media-gfx/svg2rlg ) 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://rst2pdf.googlecode.com/files/rst2pdf-0.93.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=879d91cfb41923fd2e3126287f9dd9ae
+_md5_=12062015179846124c16bea573cb9834
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.6.1 b/metadata/md5-cache/dev-python/sparql-wrapper-1.6.1
index 177ff3d1ab25..aff836602b0a 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.6.1
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Wrapper around a SPARQL service
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/SPARQLWrapper
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=W3C
 RDEPEND=dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.6.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1a39c89ecd79c3bba95cb128eb936d62
+_md5_=7926bbf88b86853c88fcb18365a822bb
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0
new file mode 100644
index 000000000000..3446c9eb99c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] 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(-)]
+DESCRIPTION=Extension providing a Sphinx domain for describing RESTful HTTP APIs
+EAPI=5
+HOMEPAGE=http://bitbucket.org/birkenfeld/sphinx-contrib/ http://packages.python.org/sphinxcontrib-httpdomain/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.3.0.tar.gz
+_eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=3f07ac0429d6430c767c9e094bc4156e
diff --git a/metadata/md5-cache/dev-python/watchdog-0.8.0 b/metadata/md5-cache/dev-python/watchdog-0.8.0
index e408af37de69..7439656c147f 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.0
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python API and shell utilities to monitor file system events
 EAPI=5
 HOMEPAGE=http://github.com/gorakhargosh/watchdog
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/argh[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pathtools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.0.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=cb2013fc543a1ed9cf34f9639d360a70
+_md5_=735e0360b318245ea4bd4e7ce46e0b6f
diff --git a/metadata/md5-cache/dev-python/zbase32-1.1.5 b/metadata/md5-cache/dev-python/zbase32-1.1.5
index 2f1145d0b41f..11ef046ce1bf 100644
--- a/metadata/md5-cache/dev-python/zbase32-1.1.5
+++ b/metadata/md5-cache/dev-python/zbase32-1.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=base32 encoder/decoder (not RFC 3548 compliant)
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/zbase32
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/pyutil[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/z/zbase32/zbase32-1.1.5.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=77614b992c1ca1e2bef63c134156014f
+_md5_=eef9e394c065f65bca61488a3d0364ab
diff --git a/metadata/md5-cache/dev-python/zfec-1.4.24 b/metadata/md5-cache/dev-python/zfec-1.4.24
index aea212529b93..2cb1ed044133 100644
--- a/metadata/md5-cache/dev-python/zfec-1.4.24
+++ b/metadata/md5-cache/dev-python/zfec-1.4.24
@@ -4,11 +4,11 @@ DESCRIPTION=Fast erasure codec which can be used with the command-line, C, Pytho
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/zfec
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pyutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zbase32[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/z/zfec/zfec-1.4.24.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1b2bc63aa3904583c8fecda5a2867224
+_md5_=39a4f78f1fde0df4be51e28a5ba17ad0
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2 b/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
index 4f9f50b2991e..180963eeff93 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby library that pretty prints Ruby objects in full color with prop
 EAPI=5
 HOMEPAGE=http://github.com/michaeldv/awesome_print
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/awesome_print-1.2.0.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=95cbb3ae69405d5e5f4852af0325c425
+_md5_=af7f13ea8ad71900c06baaaa14d1ec5a
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
index a397dcbe08f9..e7a95c9bfbe4 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby implementation of Markdown
 EAPI=5
 HOMEPAGE=http://www.deveiate.org/projects/BlueCloth
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=08648dcb9985095e13a34b7308d71c7f
+_md5_=345c7508830efd5b58cef2e54f4312e9
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.4.2 b/metadata/md5-cache/dev-ruby/childprocess-0.4.2
index a41ceb791a7f..00ee640768c8 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.4.2
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=A simple and reliable solution for controlling external programs run
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ffi[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.4.2.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6124aac50e6c33770fddf3d46419e39f
+_md5_=df32e25e5cf4e30f993bb5b33db8aa53
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.1 b/metadata/md5-cache/dev-ruby/childprocess-0.5.1
index 084897ee4548..f1d5a686f7da 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.1
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple and reliable solution for controlling external programs run
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ffi[ruby_targets_ruby20] ) 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=2
 SRC_URI=mirror://rubygems/childprocess-0.5.1.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eeff8dada70e80fb14a98afb12c9ca98
+_md5_=b67e69b3f59f48adcf539bb8f87f3917
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.3 b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
index ebf3f6c4986c..9e783a57b592 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=A simple and reliable solution for controlling external programs run
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ffi[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ffi[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=2
 SRC_URI=mirror://rubygems/childprocess-0.5.3.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3c0876ea5411f3706208f52bc3f5e28c
+_md5_=af5acf55dec6bb4c9a0bbe10fda496a7
diff --git a/metadata/md5-cache/dev-ruby/classifier-1.3.4 b/metadata/md5-cache/dev-ruby/classifier-1.3.4
index 457e0ab9a439..c03823e6247e 100644
--- a/metadata/md5-cache/dev-ruby/classifier-1.3.4
+++ b/metadata/md5-cache/dev-ruby/classifier-1.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/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] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19] !!dev-ruby/classifier-reborn[ruby_targets_ruby19] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby20] !!dev-ruby/classifier-reborn[ruby_targets_ruby20] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier-reborn[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/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=Module to allow Bayesian and other types of classifications
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/classifier https://github.com/cardmagic/classifier
-IUSE=gsl test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=gsl test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( gsl? ( dev-ruby/rb-gsl[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] )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19] !!dev-ruby/classifier-reborn[ruby_targets_ruby19] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby20] !!dev-ruby/classifier-reborn[ruby_targets_ruby20] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier-reborn[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[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/classifier-1.3.4.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2550278be481d8f5e754c80d45603a2f
+_md5_=664d95e05d51b47c63f6687a38a56f27
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.0 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.0
new file mode 100644
index 000000000000..9361e69448b8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19] !!dev-ruby/classifier[ruby_targets_ruby19] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby20] !!dev-ruby/classifier[ruby_targets_ruby20] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby21] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/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=Module to allow Bayesian and other types of classifications
+EAPI=5
+HOMEPAGE=https://github.com/jekyll/classifier-reborn
+IUSE=gsl test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19] !!dev-ruby/classifier[ruby_targets_ruby19] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby20] !!dev-ruby/classifier[ruby_targets_ruby20] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby21] !!dev-ruby/classifier[ruby_targets_ruby21] gsl? ( dev-ruby/rb-gsl[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/jekyll/classifier-reborn/archive/v2.0.0.tar.gz -> classifier-reborn-2.0.0.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6d70715af8f1666aeca3c4c3f386836f
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
index 929d537df033..790cca94bbd1 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for syntax highlighting
 EAPI=5
 HOMEPAGE=http://coderay.rubychan.de/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.0.tar.gz -> coderay-1.1.0.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ba5f7dc0e35e5e5cf515be96d29d58a9
+_md5_=3d6c49a4a87a25d0b17a970869a5d447
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
index b5cbc61b4990..a845445efed7 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MIT Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.5.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2ba0bc366ed2e6f98c2483776cdf220a
+_md5_=3235b1be112291057a65b2dde13b5fda
diff --git a/metadata/md5-cache/dev-ruby/facter-1.7.6 b/metadata/md5-cache/dev-ruby/facter-1.7.6
index 94ef67a1c126..15741f9ac21e 100644
--- a/metadata/md5-cache/dev-ruby/facter-1.7.6
+++ b/metadata/md5-cache/dev-ruby/facter-1.7.6
@@ -4,11 +4,11 @@ DESCRIPTION=A cross-platform Ruby library for retrieving facts from operating sy
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=+dmi +pciutils elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
-KEYWORDS=amd64 hppa ppc ppc64 ~sparc x86
+KEYWORDS=amd64 hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-1.7.6.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=aa3f0c66dfa39cae9aae99e42be388f3
+_md5_=d4be521375359f42fe3871950b7b66b6
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.5.2-r1 b/metadata/md5-cache/dev-ruby/fakefs-0.5.2-r1
index 5f3abac5f627..2bc1b1e955d3 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.5.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A fake filesystem. Use it in your tests
 EAPI=5
 HOMEPAGE=http://github.com/defunkt/fakefs
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.5.2.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c39d4e93ec65b4dbb78418a1260a1051
+_md5_=a230ec7911e214bb8d288801a85e7f49
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.3 b/metadata/md5-cache/dev-ruby/ffi-1.9.3
index a034297e423b..b555e55719e7 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.3
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.3
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=5
 HOMEPAGE=http://wiki.github.com/ffi/ffi
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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? ( virtual/ruby-threads[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-threads[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-threads[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=http://github.com/ffi/ffi/archive/1.9.3.tar.gz -> ffi-git-1.9.3.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0d96440c52e079a8a4960c85cc9184a8
+_md5_=e415276e290491a24294ff85cd4d0b4f
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4 b/metadata/md5-cache/dev-ruby/hiera-1.3.4
index c88f5744484d..7685a793cf3b 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 hppa ~ppc ~x86
+KEYWORDS=~amd64 hppa ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.3.4.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d03b7b2d27d8ac985140b9fa9a3d7ce2
+_md5_=a2488ac5d2a2dc2bf7ed52135471f762
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1 b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
index 9f5da2521940..b31d6a0be044 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/json[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/hiera-1.3.4.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1eb2573dd55a781b6e2f5c40d764253d
+_md5_=62237be0a04228e4abc07c4d0e7d0695
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1
index 7ab46ba11c2e..d0af7cdad0d9 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Levenshtein distance algorithm
 EAPI=5
 HOMEPAGE=http://github.com/mbleigh/mash
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/levenshtein-0.2.2.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f10bcc3b52035b5decf6b5cf674ad86e
+_md5_=fde1d46e09186cd7ba7bac2436659b81
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index 55e2666cabb9..106bb81dfe67 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Levenshtein distance algorithm
 EAPI=5
 HOMEPAGE=http://github.com/mbleigh/mash
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/levenshtein-0.2.2.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=37d4bac6a56abaf1abb26ff9b287d5cf
+_md5_=6452c63f4bdd989c2a7b1ccaf4bd1c22
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r1 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
index caefe50e9d98..be2302c3db4a 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~x86-macos
+KEYWORDS=alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=84d1d7cbd65f108af6861a192e6d582f
+_md5_=486e9a1ef51c9d968eec3500c5616980
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
index 909ebba26809..838fc9d0bc52 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A pure ruby library which provides basic APIs for localization
 EAPI=5
 HOMEPAGE=https://github.com/ruby-gettext/locale
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6cfcf79a8dc88209a396bcb569c25f49
+_md5_=2391f2a4b0d0268ce83a2c628caaa663
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
index e479ed27741b..212fe96de194 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=5
 HOMEPAGE=http://mocha.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1d15af2780100c8111213434f8d59c10
+_md5_=affc36a86a9def79096d85fb6b418abc
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1 b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
index 6629c6432216..5f5035e5d876 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=553613e1c3a36c3ce66e87facdf87f11
+_md5_=925a37f41644b33d455ae39d23da7a82
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10 b/metadata/md5-cache/dev-ruby/mocha-0.12.10
index f6bfdfa95d43..b15e68e7da6d 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 doc test test
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a830492c68b7aa2825094590f5c2c549
+_md5_=0b4c17bd32eedfb6ea51be89b3f4fef1
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1 b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
index 927a3271faa8..5e7e54e56488 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=23441f38c46dcb49fd7dddba8e00316b
+_md5_=c6c5c8db1c9f8428087afb27b25d8a85
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
index bded6dff9dbd..f58fa55755dc 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e0e5a1b7739675e322ea2d6203913b1f
+_md5_=69aaa2797a2a111625fbe2a36bd0b46c
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
index b48938ba1f5b..e2323404fb9b 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/metaclass[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/metaclass[ruby_targets_ruby21] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8e2ed4af111c3361dd95fcbc2273e2c8
+_md5_=ff893b355c3ff75a2c2f0e5f66b6067d
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2
index 57a72f3fd5d5..6a4314b79bbf 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A module for using Textile in Ruby
 EAPI=5
 HOMEPAGE=http://redcloth.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_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/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0750ea2f1d977d9733d9ed8f0a57141b
+_md5_=7a237a6e47538d4f38a9d77529f45ad7
diff --git a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1 b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
index 6e440522d553..2f94db966976 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A double framework that features a rich selection of double techniqu
 EAPI=5
 HOMEPAGE=http://pivotallabs.com/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://github.com/rr/rr/archive/v1.1.2.tar.gz -> rr-1.1.2.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f7549c1cd5132d39408a46c9bce1f581
+_md5_=b1d8f91d3276dfef6d467f1c1018ef24
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
index 5b01da9d3b3b..a6e874e1c7d6 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby bindings for rrdtool
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
-KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=17ec9b455ade584f46a0c791b7b31c35
+_md5_=9b092b563165ae9d16bd2c429e638f57
diff --git a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1 b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
index ee6f5db22f02..5a77596abf70 100644
--- a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<dev-ruby/rspec-rails-1.3.2 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-1.3.2.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=338749f16cc5a4e09c39945cff98751a
+_md5_=adfc60451c6a2b85f5d6277dcae79549
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
index 9686a32cb120..ee73843e78a5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby20] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby20] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-2.14*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-2.14*[ruby_targets_ruby21] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.14*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.14*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.14*[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.14.1.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f446f54306e51c01db13d75f60702338
+_md5_=8ced79a8e567fe4ecf0de32594f8e18a
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 37ab2edfb6fd..953d98f910e2 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby20] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby20] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby21] ) ruby_targets_jruby? ( =dev-ruby/rspec-core-2.99*[ruby_targets_jruby] =dev-ruby/rspec-expectations-2.99*[ruby_targets_jruby] =dev-ruby/rspec-mocks-2.99*[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.99.0.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d93b47bc5af0eb1573a65ff1f85e4155
+_md5_=c29b14cfe035827ea473385f6a4007ca
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r1 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r1
index 7844e8d16ffe..355e4bd1be64 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2802d4a549324254fe0dc6f7fd647415
+_md5_=3cb0df4ff0ddad97e809c91285577637
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.0
index 233905c8f62d..e05c31d97077 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.0.tar.gz -> rspec-core-2.99.0-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a789ec61ae9f155b8f873513545b8e1f
+_md5_=70a0a0f1e97c91ed82133c83760a0e0f
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.1 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.1
index dfa5687771d4..40bce6b012e7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.1.tar.gz -> rspec-core-2.99.1-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ee2b59b391e53c91708636cbf962d505
+_md5_=135052cfc2b545c37f1c712972f26575
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
index 2ff726f46d5e..458b53d3da56 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b1ce92a488deb29000aeea95f0412321
+_md5_=1abe58293cdb88537d79d61edf8031c2
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.0
index 4c8d2ba16ee8..64c55fa8f531 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.0.tar.gz -> rspec-expectations-2.99.0-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fa9caf37ebabc3f3cace47372a721540
+_md5_=27adb3d32bb9add746466bdf1a59ec52
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.1
index a00a74722a0a..77c3946f5a15 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.1.tar.gz -> rspec-expectations-2.99.1-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e6fc3dd7df0c4c2c78895642e0ab3c38
+_md5_=fdd87db87f067931abce4856e4b2c808
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index e2508c79f172..6f7b3ac117ec 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=173364286ea07e3cb250200ec0f30700
+_md5_=43dc84877cce5e25705d0a8c68abe38b
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
index d311cd3ca9b4..1ef2a12fe01c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f5d3d9cee79909c77546ea2abd421c44
+_md5_=81246b153f67c79dfefeff02796d4569
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.0
index 0a6af963be0d..7a21901228e8 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.0.tar.gz -> rspec-mocks-2.99.0-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2752a89e64ca98ef602de59fb69928bd
+_md5_=5ce9b5f7eee7383de7af7cffe91c94d0
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.1
index 686f7134f63f..d770aa9ee321 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.1.tar.gz -> rspec-mocks-2.99.1-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fb1f42ecc4fd1138bf99bfca8714322e
+_md5_=e23a472c4d5607ffb55c3430d80417f2
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index 717ef12b94ce..8fd83da4bb4b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0a567d1edd0579f1d559a06c543bd5bd
+_md5_=ac2af4a9a33a484e63591f5258d2ae8d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.8 b/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.8
index fcb6a34a5385..0bb7b4d40978 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.8
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby GetText Package is Native Language Support Library and Tools mo
 EAPI=5
 HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-ruby/levenshtein[ruby_targets_ruby19] ) sys-devel/gettext ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-2.3.8.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=43a00046f67f5bdfd3049e9deb5149b8
+_md5_=128dcfe8c1f4a96ce4f46ba6fa76cade
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
index e4d039c41a33..d055975c27b4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby GetText Package is Native Language Support Library and Tools mo
 EAPI=5
 HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=alpha ~amd64 arm hppa ia64
+KEYWORDS=alpha ~amd64 arm hppa ia64 ~sparc
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-ruby/text[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby20] dev-ruby/text[ruby_targets_ruby20] ) sys-devel/gettext ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.1.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=edbc403f46aa98303ec97a8f02356bd7
+_md5_=b56b0eabc64c084c8d97f242a2cf1e03
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
index f4ca2c3e5a1a..4d173aaa4f32 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby GetText Package is Native Language Support Library and Tools mo
 EAPI=5
 HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-ruby/text[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby20] dev-ruby/text[ruby_targets_ruby20] ) sys-devel/gettext ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.2.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f3d36b16852ff645d5d3a6c90ad16253
+_md5_=9b6bd53e04848c2258322c8b10eb9d83
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.3
index baef0c0f28b1..2c6fb9c8316c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby GetText Package is Native Language Support Library and Tools mo
 EAPI=5
 HOMEPAGE=http://ruby-gettext.github.io/
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86
 LICENSE=|| ( Ruby LGPL-3+ )
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-ruby/text[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby20] dev-ruby/text[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby21] dev-ruby/text[ruby_targets_ruby21] ) sys-devel/gettext 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/gettext-3.1.3.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=001bb52d08f4cbcc1ffa2e8cdbfde138
+_md5_=a9cb549e7449f853bbeef31de00a00ed
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
index 6161511062e2..33db304f4e51 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Ruby implementation of the Rc4 algorithm
 EAPI=5
 HOMEPAGE=https://github.com/caiges/Ruby-RC4
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.5.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=50032c02b43a3b31400ae579100b1bd1
+_md5_=ec16f0241ca8f73e1d87a60e3c99e50e
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
index bd12ed66f61a..180b096f4f12 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Spork is Tim Harper's implementation of test server
 EAPI=5
 HOMEPAGE=https://github.com/sporkrb/spork
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 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] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=98bf2bd8b892b0a799a003d34ee43620
+_md5_=29268107535a58d615fa6f8f8d74f892
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.9-r1 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.9-r1
index 889cfe0c459e..287bea17dd92 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.9-r1
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An extension library to access a SQLite database from Ruby
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/sqlite-ruby/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~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=BSD
 RDEPEND==dev-db/sqlite-3* 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/sqlite3-1.3.9.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eca1390e3dc551c1bbde0f59e5fb7ece
+_md5_=c5644f4900afa122f10fbd22a09ff688
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.0 b/metadata/md5-cache/dev-ruby/syntax-1.2.0
new file mode 100644
index 000000000000..74d28d7c25da
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Syntax highlighting for sourcecode and HTML
+EAPI=5
+HOMEPAGE=https://github.com/dblock/syntax
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+SLOT=0
+SRC_URI=https://github.com/dblock/syntax/archive/v1.2.0.tar.gz -> syntax-1.2.0.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=87d9540794c089fd0ee9570a02804e80
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
index 2bb5e1b6248d..43b4ddc5cab4 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=RR adapter for Test::Unit
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/test-unit/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby19] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby20] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby21] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/rr-1.1.1[ruby_targets_jruby] >=dev-ruby/test-unit-2.5.2[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.3.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3e4fde4acfad65d23df0722931081df4
+_md5_=06ac1ee6984a34e2b7dff0dbd5f04685
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r1 b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
index 1307aa3ca3d1..6a9140413127 100644
--- a/metadata/md5-cache/dev-ruby/text-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=alpha amd64 arm hppa ia64 x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.2.3.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9c1dd7869f8f1c6f5d9d304bc45f84b4
+_md5_=567b1738ae2854b1f789ead1a95b4814
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r2 b/metadata/md5-cache/dev-ruby/text-1.2.3-r2
index 70ae731217e1..3dba79be93b9 100644
--- a/metadata/md5-cache/dev-ruby/text-1.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/text-1.2.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86
 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.2.3.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=18fed41e3b25a15434a4fdf68cee446a
+_md5_=514a95a5b67f553c2e6d58ef762859d8
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.0 b/metadata/md5-cache/dev-ruby/text-1.3.0
index f85d8546a130..802ada0eab02 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.0
+++ b/metadata/md5-cache/dev-ruby/text-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~sparc ~x86
 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] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.0.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=68492ef0159cd7503a07529b4cb9ff93
+_md5_=168e449f87b406193473f1d3ba3d041e
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
index 93110500ee01..dd4334a0a5d1 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
@@ -4,11 +4,11 @@ DESCRIPTION=W3C HTML Tidy library implemented as a Ruby extension
 EAPI=5
 HOMEPAGE=http://github.com/carld/tidy
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=HTML-Tidy
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=848658aa17f9f66d2ad004ebd1745486
+_md5_=bde06b45b473a8cc35ba15e6c3d692d0
diff --git a/metadata/md5-cache/dev-ruby/tins-1.3.1 b/metadata/md5-cache/dev-ruby/tins-1.3.1
new file mode 100644
index 000000000000..be871fb2b58f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tins-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[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] ) 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=All the stuff that isn't good enough for a real library
+EAPI=5
+HOMEPAGE=http://github.com/flori/tins
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+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] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/tins-1.3.1.gem
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=831bfc49b8c40d582d74ca526f048ca4
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
new file mode 100644
index 000000000000..f723faa3debb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Simple library to generate UUIDs
+EAPI=5
+HOMEPAGE=http://uuidtools.rubyforge.org/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+KEYWORDS=~amd64 ~x86 ~x86-macos
+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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/uuidtools-2.1.5.gem
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5696035ef1e6c721b53303beea09ccc5
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.3 b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
index 23ae338aa697..2fc3174c560b 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.3
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
@@ -4,11 +4,11 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=5
 HOMEPAGE=http://yardoc.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/0.8.7.3.tar.gz -> yard-0.8.7.3-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ce4c31f467352bff7b38f9f39128c983
+_md5_=d96b07e8afeacf9398dc6a8c8ce9f75d
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.3-r1 b/metadata/md5-cache/dev-ruby/yard-0.8.7.3-r1
index bfd23e05a684..95eb176bb1af 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=5
 HOMEPAGE=http://yardoc.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/0.8.7.3.tar.gz -> yard-0.8.7.3-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cffcacaa9adbc92f581a5921e2bcd19c
+_md5_=b3c85f58ad05d933e0cb566bea922b92
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.4 b/metadata/md5-cache/dev-ruby/yard-0.8.7.4
index 6635d77bbdc2..d221cd6437f1 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.4
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=5
 HOMEPAGE=http://yardoc.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.8.7.4.tar.gz -> yard-0.8.7.4-git.tgz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dbbf363a551480e0fac66a2c4fcc6162
+_md5_=82d6f32680ebe64e7b9a388da776c3df
diff --git a/metadata/md5-cache/dev-tcltk/tkdnd-2.6 b/metadata/md5-cache/dev-tcltk/tkdnd-2.6
new file mode 100644
index 000000000000..ebc38e546682
--- /dev/null
+++ b/metadata/md5-cache/dev-tcltk/tkdnd-2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/tk
+DESCRIPTION=Extension that adds native drag & drop capabilities to the tk toolkit
+EAPI=5
+HOMEPAGE=http://www.ellogon.org/petasis/tcltk-projects/tkdnd/
+IUSE=debug threads X
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-lang/tk
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/tkdnd/TkDND/TkDND%202.6/tkdnd2.6-src.tar.gz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=c5839aeb394d6f831023da344a197073
diff --git a/metadata/md5-cache/dev-util/automoc-0.9.88-r1 b/metadata/md5-cache/dev-util/automoc-0.9.88-r1
new file mode 100644
index 000000000000..3f9f169a661c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/automoc-0.9.88-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-qt/qtcore:4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=KDE Meta Object Compiler
+EAPI=5
+HOMEPAGE=http://www.kde.org
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=dev-qt/qtcore:4
+SLOT=0
+SRC_URI=mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=89e2b694da76003cae2689cc049dd3a8
diff --git a/metadata/md5-cache/dev-util/bluej-3.1.1 b/metadata/md5-cache/dev-util/bluej-3.1.1
index f82e6d9d3f47..bb69a7460d27 100644
--- a/metadata/md5-cache/dev-util/bluej-3.1.1
+++ b/metadata/md5-cache/dev-util/bluej-3.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=An integrated Java environment for introductory teaching
 EAPI=5
 HOMEPAGE=http://bluej.org/
 IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bluej.org/download/files/source/BlueJ-source-311.zip doc? ( http://bluej.org/download/files/bluej-ref-manual.pdf http://bluej.org/tutorial/tutorial-201.pdf -> bluej-tutorial-2.0.1.pdf http://bluej.org/tutorial/testing-tutorial.pdf -> bluej-testing-tutorial.pdf )
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=15c3f44c057ac0ed899c4bc313628ba6
+_md5_=460b2cb5dda02e7a5b160f91a3b73ef7
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.0.0.2-r1 b/metadata/md5-cache/dev-util/checkbashisms-2.0.0.2-r2
similarity index 85%
rename from metadata/md5-cache/dev-util/checkbashisms-2.0.0.2-r1
rename to metadata/md5-cache/dev-util/checkbashisms-2.0.0.2-r2
index cfd73a668267..d978739062dd 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.0.0.2-r1
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.0.0.2-r2
@@ -1,6 +1,6 @@
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=install prepare unpack
 DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=4
+EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/checkbaskisms/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -8,4 +8,4 @@ RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/checkbaskisms/2.0.0.2/checkbashisms -> checkbashisms-2.0.0.2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4ec005539f0078ec661aee147e35db11
+_md5_=508ed16b086ae9eae25c457e3033c88d
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.16 b/metadata/md5-cache/dev-util/cucumber-1.3.16
new file mode 100644
index 000000000000..be62d73972e9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.13.0[ruby_targets_ruby19] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby19] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby19] >=dev-util/aruba-0.5.2[ruby_targets_ruby19] >=dev-ruby/json-1.7[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] >=dev-util/cucumber-1.3[ruby_targets_ruby19] dev-ruby/rubyzip:0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-2.13.0[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby20] >=dev-util/aruba-0.5.2[ruby_targets_ruby20] >=dev-ruby/json-1.7[ruby_targets_ruby20] dev-ruby/bundler[ruby_targets_ruby20] >=dev-util/cucumber-1.3[ruby_targets_ruby20] dev-ruby/rubyzip:0[ruby_targets_ruby20] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby19] >=dev-ruby/multi_test-0.1.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby20] >=dev-ruby/multi_test-0.1.1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=Executable feature scenarios
+EAPI=5
+HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
+IUSE=examples test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby19] >=dev-ruby/multi_test-0.1.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby20] >=dev-ruby/multi_test-0.1.1[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+SLOT=0
+SRC_URI=mirror://rubygems/cucumber-1.3.16.gem
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f586550703734d0cdb2b7bdfe0fed199
diff --git a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1 b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
index 55b2507c39ba..f707d70a76a5 100644
--- a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
+++ b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=!dev-util/jam sys-devel/bison
 DESCRIPTION=Jam is a powerful alternative to make. FTJam is a 100% compatible enhanced Jam implementation
 HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
-KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=perforce GPL-2
 RDEPEND=!dev-util/jam
 SLOT=0
 SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=811804d66a5a9d04642c0b2046d111bc
+_md5_=d1fa7c1d031deeb0960ffe11db1a03d2
diff --git a/metadata/md5-cache/dev-util/global-6.3 b/metadata/md5-cache/dev-util/global-6.3
index 9278f90970a6..d36b597508bd 100644
--- a/metadata/md5-cache/dev-util/global-6.3
+++ b/metadata/md5-cache/dev-util/global-6.3
@@ -4,10 +4,10 @@ DESCRIPTION=GNU Global is a tag system to find the locations of a specified obje
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/global/global.html
 IUSE=doc emacs vim
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=sys-devel/libtool sys-libs/ncurses emacs? ( virtual/emacs ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://gnu/global/global-6.3.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=55b9bcbdab248a415d6785e67b821d1b
+_md5_=08044a7727693ea3ab269e50b1c92d26
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.02.0807.1535 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.02.0807.1535
deleted file mode 100644
index 2a7a0dd85423..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.02.0807.1535
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=dev-util/nvidia-cuda-toolkit >=x11-drivers/nvidia-drivers-177.73 media-libs/freeglut
-DESCRIPTION=NVIDIA CUDA Software Development Kit
-HOMEPAGE=http://developer.nvidia.com/cuda
-IUSE=debug emulation
-KEYWORDS=amd64 x86
-LICENSE=CUDPP
-RDEPEND=dev-util/nvidia-cuda-toolkit >=x11-drivers/nvidia-drivers-177.73 media-libs/freeglut
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=http://developer.download.nvidia.com/compute/cuda/2_0/linux/sdk/NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=d9f865c81a22a7615064b26b6164fd15
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r2
deleted file mode 100644
index cc1da9349798..000000000000
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=>=dev-util/nvidia-cuda-toolkit-4.2.9 media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-296 media-libs/glew )
-DESCRIPTION=NVIDIA CUDA Software Development Kit
-EAPI=4
-HOMEPAGE=http://developer.nvidia.com/cuda
-IUSE=debug +doc +examples opencl +cuda
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=CUDPP
-RDEPEND=>=dev-util/nvidia-cuda-toolkit-4.2.9 media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-296 media-libs/glew )
-SLOT=0
-SRC_URI=http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_4.2.9_linux.run
-_eclasses_=cuda	9be39ddb95b9b07ec931f30628d40757	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9dd3077b975b4f9f4dad4d9f06ca21d1
diff --git a/metadata/md5-cache/dev-util/rbtools-0.6.2 b/metadata/md5-cache/dev-util/rbtools-0.6.2
index 27ef9ebcd4ff..dfffbcd9a1cb 100644
--- a/metadata/md5-cache/dev-util/rbtools-0.6.2
+++ b/metadata/md5-cache/dev-util/rbtools-0.6.2
@@ -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.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cb101fa5218d46b7a2270e562851ac54
+_md5_=326c7bb8357b1937e090d1724dd9de56
diff --git a/metadata/md5-cache/dev-util/valgrind-3.9.0 b/metadata/md5-cache/dev-util/valgrind-3.9.0
index 3f363dbbc1a4..dc912bc3631e 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.9.0
+++ b/metadata/md5-cache/dev-util/valgrind-3.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source memory debugger for GNU/Linux
 EAPI=4
 HOMEPAGE=http://www.valgrind.org
 IUSE=mpi
-KEYWORDS=-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=-* ~amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=http://www.valgrind.org/downloads/valgrind-3.9.0.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	51ad5130f4a69b1a118ca5296de276ae	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=aa56d037c21e34a0f91ffba64334e408
+_md5_=367ea410de5473413f8d552e353655e3
diff --git a/metadata/md5-cache/dev-util/watchr-0.7 b/metadata/md5-cache/dev-util/watchr-0.7
index c1813aebe2c4..e62616e9508b 100644
--- a/metadata/md5-cache/dev-util/watchr-0.7
+++ b/metadata/md5-cache/dev-util/watchr-0.7
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/rev[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rev[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/rev[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Modern continuous testing (flexible alternative to Autotest)
-EAPI=2
+EAPI=5
 HOMEPAGE=http://mynyml.com/ruby/flexible-continuous-testing
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/rev[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rev[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/rev[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/watchr-0.7.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7c0d4ec0be56fd45ac9da9cf5575b9e0
+_md5_=7c16b2a5c333a3b5d732f8252e0246f9
diff --git a/metadata/md5-cache/dev-vcs/cvs-fast-export-1.14 b/metadata/md5-cache/dev-vcs/cvs-fast-export-1.14
new file mode 100644
index 000000000000..bbe7553c8a83
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/cvs-fast-export-1.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-text/asciidoc
+DESCRIPTION=fast-export history from a CVS repository or RCS collection
+EAPI=5
+HOMEPAGE=http://www.catb.org/~esr/cvs-fast-export/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.14.tar.gz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=c0935e3cbfaddbffa1add5e71d986d7e
diff --git a/metadata/md5-cache/dev-vcs/git-flow-0.4.1 b/metadata/md5-cache/dev-vcs/git-flow-0.4.1
index a94717d5a71b..0485542fa813 100644
--- a/metadata/md5-cache/dev-vcs/git-flow-0.4.1
+++ b/metadata/md5-cache/dev-vcs/git-flow-0.4.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Git extensions to provide high-level repository operations for Vincent Driessen's branching model
 EAPI=5
 HOMEPAGE=https://github.com/nvie/gitflow
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD MIT
 RDEPEND=dev-util/shflags dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/nvie/gitflow/archive/0.4.1.tar.gz -> git-flow-0.4.1.tar.gz https://github.com/bobthecow/git-flow-completion/archive/0.4.2.2.tar.gz -> git-flow-completion-0.4.2.2.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8e95adc9777bde40d435f57aff94f46e
+_md5_=db72a377f3360caac524714a7a79e2d3
diff --git a/metadata/md5-cache/dev-vcs/hub-1.12.1 b/metadata/md5-cache/dev-vcs/hub-1.12.1
index 27ef81f0652d..34e9815ce76e 100644
--- a/metadata/md5-cache/dev-vcs/hub-1.12.1
+++ b/metadata/md5-cache/dev-vcs/hub-1.12.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/webmock[ruby_targets_ruby18] dev-util/cucumber[ruby_targets_ruby18] virtual/ruby-minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/webmock[ruby_targets_ruby19] dev-util/cucumber[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/webmock[ruby_targets_ruby19] dev-util/cucumber[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=command-line wrapper for git that makes you better at GitHub
 EAPI=5
 HOMEPAGE=https://github.com/github/hub
-IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-vcs/git ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=dev-vcs/git 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/github/hub/archive/v1.12.1.tar.gz -> hub-1.12.1.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=54336ba50e73cd34ece26a92981c00b6
+_md5_=bc681fba2afe057ad8bd5f3c55a4ec77
diff --git a/metadata/md5-cache/dev-vcs/hub-1.12.2 b/metadata/md5-cache/dev-vcs/hub-1.12.2
new file mode 100644
index 000000000000..8a841636f515
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hub-1.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/webmock[ruby_targets_ruby19] dev-util/cucumber[ruby_targets_ruby19] virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=command-line wrapper for git that makes you better at GitHub
+EAPI=5
+HOMEPAGE=https://github.com/github/hub
+IUSE=elibc_FreeBSD ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-vcs/git 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/github/hub/archive/v1.12.2.tar.gz -> hub-1.12.2.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=010132deea91bccb5a1866f67e86dc54
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.14 b/metadata/md5-cache/dev-vcs/subversion-1.7.18
similarity index 89%
rename from metadata/md5-cache/dev-vcs/subversion-1.7.14
rename to metadata/md5-cache/dev-vcs/subversion-1.7.18
index 1eb1026d24ef..32f533534b07 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.14
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.18
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-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(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) 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(-)] ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 dev-ruby/rubygems[ruby_targets_ruby18] ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) test? ( 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(-)] ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kde? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) webdav-neon? ( virtual/pkgconfig ) apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-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(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) 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(-)] ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 dev-ruby/rubygems[ruby_targets_ruby18] ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) test? ( 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(-)] ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kde? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) webdav-neon? ( virtual/pkgconfig ) apache2? ( =www-servers/apache-2* ) !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Advanced version control system
 EAPI=5
 HOMEPAGE=http://subversion.apache.org/
 IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Subversion GPL-2
-RDEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-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(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) 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(-)] ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 dev-ruby/rubygems[ruby_targets_ruby18] ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-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(-)] ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) 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(-)] ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 dev-ruby/rubygems[ruby_targets_ruby18] ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.7.14.tar.bz2
+SRC_URI=mirror://apache/subversion/subversion-1.7.18.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d717a949a5cc33a73e3aae50808ba208
+_md5_=2fa0421cae97ae59c9c530e4bc4fb0f8
diff --git a/metadata/md5-cache/games-action/armagetronad-0.2.8.3.2 b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.2
index a40999226151..e70d1779a0eb 100644
--- a/metadata/md5-cache/games-action/armagetronad-0.2.8.3.2
+++ b/metadata/md5-cache/games-action/armagetronad-0.2.8.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Fast-paced 3D lightcycle game based on Tron
 EAPI=5
 HOMEPAGE=http://armagetronad.org/
 IUSE=dedicated sound
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 !dedicated? ( media-libs/libpng:0 media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl sound? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer ) !sound? ( media-libs/libsdl[X,opengl,video] ) ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2/+download/armagetronad-0.2.8.3.2.src.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=09ef1ef3eff628fae12eb073ad442774
+_md5_=bc41b1c5d03052516e1a7dada6c56188
diff --git a/metadata/md5-cache/games-arcade/burgerspace-1.9.1 b/metadata/md5-cache/games-arcade/burgerspace-1.9.1
deleted file mode 100644
index 51dfbf9a5b98..000000000000
--- a/metadata/md5-cache/games-arcade/burgerspace-1.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Clone of the 1982 BurgerTime video game by Data East
-EAPI=2
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/burgerspace.html
-IUSE=network
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-games/flatzebra-0.1.6 games-misc/games-envd
-RESTRICT=test
-SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/burgerspace-1.9.1.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=5d47c6cc8c7767a69a17b1623dd7641e
diff --git a/metadata/md5-cache/games-arcade/gnujump-1.0.8 b/metadata/md5-cache/games-arcade/gnujump-1.0.8
index 193a08865252..f93bbd40c5f9 100644
--- a/metadata/md5-cache/games-arcade/gnujump-1.0.8
+++ b/metadata/md5-cache/games-arcade/gnujump-1.0.8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl x11-libs/libX11
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl x11-libs/libX11
 DESCRIPTION=Xjump clone with added features
-EAPI=2
+EAPI=5
 HOMEPAGE=http://gnujump.es.gnu.org
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-3
-RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl x11-libs/libX11 games-misc/games-envd
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl x11-libs/libX11 games-misc/games-envd
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/gnujump/gnujump-1.0.8.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4bda3186c47751b8c1f3c0d4444b9fe4
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	games	e221fed675714bd5545b7488aed9f822	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=9de457a4fc92af014f9b856ec9f8854c
diff --git a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102 b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102
index 2500097d7237..b2033b366383 100644
--- a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102
+++ b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102
@@ -4,11 +4,11 @@ DESCRIPTION=An accuracy-focused Gameboy / Gameboy Color emulator
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/gambatte
 IUSE=qt4 +sdl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv ) sdl? ( media-libs/libsdl[X,sound,joystick,video] ) games-misc/games-envd
 REQUIRED_USE=|| ( qt4 sdl )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/gambatte-0.5.0_p20131102.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	40136c5fe0002a0d3937e869ae4ee0e2	qt4-r2	b40473dafd07d7c5fe4aef1c1b902f39	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d08f0e953d0b05c9b4c2f2530f036f17
+_md5_=b4765f8075401d980c9fc8765fd689e6
diff --git a/metadata/md5-cache/games-emulation/pcsxr-1.9.94-r1 b/metadata/md5-cache/games-emulation/pcsxr-1.9.94-r1
new file mode 100644
index 000000000000..94a9f15dc0d4
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/pcsxr-1.9.94-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2= media-libs/libsdl:0=[joystick] sys-libs/zlib:0= x11-libs/gtk+:3= x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXtst:0= x11-libs/libXv:0= alsa? ( media-libs/alsa-lib:0= ) cdio? ( dev-libs/libcdio:0= ) ffmpeg? ( virtual/ffmpeg:0= ) nls? ( virtual/libintl:0= ) openal? ( media-libs/openal:0= ) opengl? ( virtual/opengl:0= x11-libs/libXxf86vm:0= ) pulseaudio? ( media-sound/pulseaudio:0= ) sdl? ( media-libs/libsdl:0=[sound] ) app-arch/unzip dev-util/intltool x11-proto/videoproto nls? ( sys-devel/gettext:0 ) x86? ( dev-lang/nasm ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator
+EAPI=5
+HOMEPAGE=http://pcsxr.codeplex.com
+IUSE=alsa cdio ffmpeg nls openal opengl oss pulseaudio +sdl
+KEYWORDS=~amd64
+LICENSE=GPL-2 public-domain
+RDEPEND=dev-libs/glib:2= media-libs/libsdl:0=[joystick] sys-libs/zlib:0= x11-libs/gtk+:3= x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXtst:0= x11-libs/libXv:0= alsa? ( media-libs/alsa-lib:0= ) cdio? ( dev-libs/libcdio:0= ) ffmpeg? ( virtual/ffmpeg:0= ) nls? ( virtual/libintl:0= ) openal? ( media-libs/openal:0= ) opengl? ( virtual/opengl:0= x11-libs/libXxf86vm:0= ) pulseaudio? ( media-sound/pulseaudio:0= ) sdl? ( media-libs/libsdl:0=[sound] )
+REQUIRED_USE=?? ( alsa openal oss pulseaudio sdl )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~mgorny/dist/pcsxr-1.9.94.zip
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0c8f9d7b6b7d002d808403e27d82242f
diff --git a/metadata/md5-cache/games-engines/gemrb-0.8.1 b/metadata/md5-cache/games-engines/gemrb-0.8.1
index c5749a5c78c8..634dc5472e0f 100644
--- a/metadata/md5-cache/games-engines/gemrb-0.8.1
+++ b/metadata/md5-cache/games-engines/gemrb-0.8.1
@@ -3,10 +3,10 @@ DEPEND=media-libs/freetype media-libs/libpng:0 >=media-libs/libsdl-1.2[video] me
 DESCRIPTION=Reimplementation of the Infinity engine
 EAPI=3
 HOMEPAGE=http://gemrb.sourceforge.net/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype media-libs/libpng:0 >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer sys-libs/zlib =dev-lang/python-2* games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/gemrb/gemrb-0.8.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	games	e221fed675714bd5545b7488aed9f822	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e9e62fe6cf04e6201f8189428498d43b
+_md5_=a1eb6d47e5575b4185a030f08d92550e
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.2.018-r1 b/metadata/md5-cache/games-fps/urbanterror-4.2.018-r1
index d95fa39693cf..cd96cdff2c7a 100644
--- a/metadata/md5-cache/games-fps/urbanterror-4.2.018-r1
+++ b/metadata/md5-cache/games-fps/urbanterror-4.2.018-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
 EAPI=5
 HOMEPAGE=http://www.urbanterror.info/home/
 IUSE=+curl debug dedicated openal +sdl server smp vorbis
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps
 RDEPEND=!dedicated? ( virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) sdl? ( media-libs/libsdl[X,sound,joystick,opengl,video] ) !sdl? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm ) vorbis? ( media-libs/libogg media-libs/libvorbis ) ) games-misc/games-envd
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://cdn.urbanterror.info/urt/42/zips/UrbanTerror42_full017.zip https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.018.tar.gz -> urbanterror-4.2.018.tar.gz http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> urbanterror.svg http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-4.2.017-to-4.2.018.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=3cc012196b730d5713a1bb4ab6ccb398
+_md5_=809117d41a17a9da67fe7cbdd851fcd7
diff --git a/metadata/md5-cache/games-misc/lolcat-42.0.99-r1 b/metadata/md5-cache/games-misc/lolcat-42.0.99-r1
index b93686faf323..b396ce9f4a83 100644
--- a/metadata/md5-cache/games-misc/lolcat-42.0.99-r1
+++ b/metadata/md5-cache/games-misc/lolcat-42.0.99-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby18] dev-ruby/paint[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ) 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] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Rainbows and unicorns!
 EAPI=5
 HOMEPAGE=https://github.com/busyloop/lolcat
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=~amd64 ~x86
 LICENSE=WTFPL-2
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby18] dev-ruby/paint[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby19] dev-ruby/paint[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby20] dev-ruby/paint[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/lolcat-42.0.99.gem
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b16d81d4e5b9df0406e429f8a08569e0
+_md5_=14d1344eeb54cd2a5bf5cae7cfa07349
diff --git a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r2 b/metadata/md5-cache/games-mud/kmuddy-1.0.1-r2
deleted file mode 100644
index c5255a3d104b..000000000000
--- a/metadata/md5-cache/games-mud/kmuddy-1.0.1-r2
+++ /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=MUD client for KDE
-EAPI=4
-HOMEPAGE=http://www.kmuddy.com/
-IUSE=debug linguas_es +handbook aqua
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) 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=http://www.kmuddy.com/releases/stable/kmuddy-1.0.1.tar.gz
-_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7eac4d5a5879a12644a7a55073f28a27
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.5.3a b/metadata/md5-cache/games-roguelike/tomenet-4.5.3a
deleted file mode 100644
index 0c25c9108259..000000000000
--- a/metadata/md5-cache/games-roguelike/tomenet-4.5.3a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) >=sys-apps/sed-4
-DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
-EAPI=5
-HOMEPAGE=http://www.tomenet.net/
-IUSE=dedicated server +sound X
-KEYWORDS=~amd64 ~x86
-LICENSE=Moria
-RDEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.tomenet.net/downloads/tomenet-4.5.3a.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=bb1962c7b3a8722e323a3641bf13974c
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.5.3b b/metadata/md5-cache/games-roguelike/tomenet-4.5.3b
deleted file mode 100644
index b2ee1677e1bf..000000000000
--- a/metadata/md5-cache/games-roguelike/tomenet-4.5.3b
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) >=sys-apps/sed-4
-DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
-EAPI=5
-HOMEPAGE=http://www.tomenet.net/
-IUSE=dedicated server +sound X
-KEYWORDS=~amd64 ~x86
-LICENSE=Moria
-RDEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.tomenet.net/downloads/tomenet-4.5.3b.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ba1a16cc35955580af7d7b2f996d943a
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.5.4 b/metadata/md5-cache/games-roguelike/tomenet-4.5.4
deleted file mode 100644
index cc5797884a89..000000000000
--- a/metadata/md5-cache/games-roguelike/tomenet-4.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) >=sys-apps/sed-4
-DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
-EAPI=5
-HOMEPAGE=http://www.tomenet.net/
-IUSE=dedicated server +sound X
-KEYWORDS=~amd64 ~x86
-LICENSE=Moria
-RDEPEND=sys-libs/ncurses !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.tomenet.net/downloads/tomenet-4.5.4.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a638b4fdf79a15c9b59aafd0715098b2
diff --git a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681 b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681
index f617655c5e76..f7fb79088c0e 100644
--- a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681
+++ b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681
@@ -4,10 +4,10 @@ DESCRIPTION=Unique multiplayer wargame between liquids
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/liquidwar6/
 IUSE=doc gles2 gtk libcaca +maps nls +ogg openmp readline test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl sys-devel/libtool:2 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-0.4.3681.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-extra-maps-0.4.3681.tar.gz )
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a0d7bc4eba6ca29fcb2a68d74eeab232
+_md5_=d0f470b6720a51c6e3af7bf8b801e5cf
diff --git a/metadata/md5-cache/games-util/vispatch-1.4.6 b/metadata/md5-cache/games-util/vispatch-1.4.6
index 8d02c2fbfc83..998fac66b798 100644
--- a/metadata/md5-cache/games-util/vispatch-1.4.6
+++ b/metadata/md5-cache/games-util/vispatch-1.4.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=WaterVIS utility for glquake
 EAPI=5
 HOMEPAGE=http://vispatch.sourceforge.net/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/vispatch/vispatch-1.4.6.tgz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=d7d16279df189f79e7160cff4990b9a9
+_md5_=bdbeae3975c7782698d381d77067155d
diff --git a/metadata/md5-cache/kde-misc/kanyremote-6.3.2 b/metadata/md5-cache/kde-misc/kanyremote-6.3.2
index cb8998e44651..f3e92f0d07ca 100644
--- a/metadata/md5-cache/kde-misc/kanyremote-6.3.2
+++ b/metadata/md5-cache/kde-misc/kanyremote-6.3.2
@@ -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.2.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4194c3850d0bb0c3ec6807dc5a7ffbb3
+_md5_=a02b51e7b63800b57954c47331b6f564
diff --git a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.10 b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.10
deleted file mode 100644
index 638521e055dd..000000000000
--- a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.6 openconnect? ( <net-misc/openconnect-5.99 ) >=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.11:4[aqua=]
-DESCRIPTION=KDE frontend for NetworkManager
-EAPI=5
-HOMEPAGE=https://projects.kde.org/projects/extragear/base/networkmanagement
-IUSE=debug openconnect linguas_ar linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_mr linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.6 openconnect? ( <net-misc/openconnect-5.99 ) !kde-base/solid !kde-misc/plasma-nm >=kde-base/oxygen-icons-4.11:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ar(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_lt(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr@Latn(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_zh_TW(+)] ) 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.11:4[aqua=]
-SLOT=4
-SRC_URI=mirror://kde/unstable/networkmanagement/0.9.0.10/src/networkmanagement-0.9.0.10.tar.xz
-_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a4b9ace3b8a1de79f5e52fab359b3223
diff --git a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.11 b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.11
index dc1343aff623..62d88a8361fb 100644
--- a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.11
+++ b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.11
@@ -4,10 +4,10 @@ DESCRIPTION=KDE frontend for NetworkManager
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/networkmanagement
 IUSE=debug openconnect linguas_ar linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ia linguas_it linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_mr linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.6 openconnect? ( net-misc/networkmanager-openconnect net-misc/openconnect ) !kde-base/solid !kde-misc/plasma-nm >=kde-base/oxygen-icons-4.11:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ar(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_lt(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_ru(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sr@Latn(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.11:4[aqua=,linguas_zh_TW(+)] ) 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.11:4[aqua=]
 SLOT=4
 SRC_URI=mirror://kde/unstable/networkmanagement/0.9.0.11/src/networkmanagement-0.9.0.11.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7b9bedbdb50678feab6855388dbf1b8f
+_md5_=f9886adc50301ce4822abe30c64a436a
diff --git a/metadata/md5-cache/mail-client/geary-0.6.1 b/metadata/md5-cache/mail-client/geary-0.6.1
index 7a510fca81c6..7bdccdcb8b0a 100644
--- a/metadata/md5-cache/mail-client/geary-0.6.1
+++ b/metadata/md5-cache/mail-client/geary-0.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
 EAPI=5
 HOMEPAGE=http://www.yorba.org/projects/geary/
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libgee-0.8.5:0.8 dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-1.10.0:3[introspection] >=x11-libs/gtk+-3.6.0:3[introspection] x11-libs/libnotify gnome-base/gsettings-desktop-schemas nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.gnome.org/pub/GNOME/sources/geary/0.6/geary-0.6.1.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	vala	d8f392783fdc2395fc64af046f2ca961
-_md5_=77b20c34ad47f2fa8c3012602c2f7a98
+_md5_=f636fe7e67a22a53118fee6341f4a5b5
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1 b/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
index 240a455c2040..980bb8c87497 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
+++ b/metadata/md5-cache/mail-filter/opendkim-2.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=5
 HOMEPAGE=http://opendkim.org
 IUSE=+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=Sendmail-Open-Source BSD
 RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-dkim ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) sys-process/psmisc
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.9.2.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ee9612e73652f23d66a6fc90ae02756c
+_md5_=0e3e1f33cc76b63637c6260436a32261
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.34-r3 b/metadata/md5-cache/mail-filter/postgrey-1.34-r3
new file mode 100644
index 000000000000..8d5e5ab6e0d7
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/postgrey-1.34-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Postgrey is a Postfix policy server implementing greylisting
+EAPI=5
+HOMEPAGE=http://postgrey.schweikert.ch/
+IUSE=targrey
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/net-server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/Parse-Syslog dev-perl/Net-RBLClient >=sys-libs/db-4.1
+SLOT=0
+SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.34.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.34.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=cee60cb19d7df80e7574daf3e0c9e634
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.35-r1 b/metadata/md5-cache/mail-filter/postgrey-1.35-r1
new file mode 100644
index 000000000000..9415b9870a95
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/postgrey-1.35-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Postgrey is a Postfix policy server implementing greylisting
+EAPI=5
+HOMEPAGE=http://postgrey.schweikert.ch/
+IUSE=targrey
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/net-server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/Parse-Syslog dev-perl/Net-RBLClient virtual/perl-Digest-SHA >=sys-libs/db-4.1
+SLOT=0
+SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.35.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.35.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=ef6564232de9e86627ce0588e5f2c289
diff --git a/metadata/md5-cache/media-gfx/argyllcms-1.6.3 b/metadata/md5-cache/media-gfx/argyllcms-1.6.3
index 6cd53ab9eef8..0953bf13356e 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-1.6.3
+++ b/metadata/md5-cache/media-gfx/argyllcms-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Open source, ICC compatible color management system
 EAPI=5
 HOMEPAGE=http://www.argyllcms.com/
 IUSE=doc
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~amd64 hppa ~x86
 LICENSE=AGPL-3
 RDEPEND=media-libs/tiff sys-libs/zlib virtual/jpeg x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.argyllcms.com/Argyll_V1.6.3_src.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=6b954259415810ccee66b68ee2069a94
+_md5_=d8473b0f7f4f71a48cceac252f1da22f
diff --git a/metadata/md5-cache/media-gfx/svg2rlg-0.3 b/metadata/md5-cache/media-gfx/svg2rlg-0.3
index 5779763718f0..917b30e28cf2 100644
--- a/metadata/md5-cache/media-gfx/svg2rlg-0.3
+++ b/metadata/md5-cache/media-gfx/svg2rlg-0.3
@@ -4,11 +4,11 @@ DESCRIPTION=svg2rlg is a python tool to convert SVG files to reportlab graphics
 EAPI=5
 HOMEPAGE=http://code.google.com/p/svg2rlg/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svg2rlg/svg2rlg-0.3.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1c8f0667adce4cedcb4d5bfbe4aaf07b
+_md5_=df6b48f82c0129c05882c48841d64d6d
diff --git a/metadata/md5-cache/media-libs/jasper-1.900.1-r6 b/metadata/md5-cache/media-libs/jasper-1.900.1-r6
index 2e765d84d496..3faaa7cdf6f8 100644
--- a/metadata/md5-cache/media-libs/jasper-1.900.1-r6
+++ b/metadata/md5-cache/media-libs/jasper-1.900.1-r6
@@ -4,10 +4,10 @@ DESCRIPTION=software-based implementation of the codec specified in the JPEG-200
 EAPI=5
 HOMEPAGE=http://www.ece.uvic.ca/~mdadams/jasper/
 IUSE=jpeg opengl 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=JasPer2.0
 RDEPEND=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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.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(-)?] )
 SLOT=0
 SRC_URI=http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip mirror://gentoo/jasper-1.900.1-fixes-20120611.patch.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=f3d0650ece40b059f39d627614b47b52
+_md5_=95fe4495a7335c42108b4de710230dab
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.2 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.2
deleted file mode 100644
index 9a4c0a635b3d..000000000000
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Library for playing MOD-like music files
-EAPI=2
-HOMEPAGE=http://modplug-xmms.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 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/modplug-xmms/libmodplug-0.8.8.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4cf02d3f6d5e62184f39a5c588c5bf95
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
deleted file mode 100644
index 8d4c1ec8fb64..000000000000
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Library for playing MOD-like music files
-EAPI=4
-HOMEPAGE=http://modplug-xmms.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-SLOT=0
-SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.4.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a2e52e8f155aecb75a376a176affc7df
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4-r1 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.4-r1
deleted file mode 100644
index 9b4f51c38146..000000000000
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=Library for playing MOD-like music files
-EAPI=5
-HOMEPAGE=http://modplug-xmms.sourceforge.net/
-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 ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.4.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=154a6e7b0c119b5f24b77b319069e6d8
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.5 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
index a29665486203..933b7587f318 100644
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
@@ -4,10 +4,10 @@ DESCRIPTION=Library for playing MOD-like music files
 EAPI=5
 HOMEPAGE=http://modplug-xmms.sourceforge.net/
 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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.5.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=412766114668b07a122df4193265caff
+_md5_=ae3ae415584280c9b38948290d1efcc0
diff --git a/metadata/md5-cache/media-libs/libmp3splt-0.9.1a b/metadata/md5-cache/media-libs/libmp3splt-0.9.1a
index b25a51b4e3f4..57637c59fae0 100644
--- a/metadata/md5-cache/media-libs/libmp3splt-0.9.1a
+++ b/metadata/md5-cache/media-libs/libmp3splt-0.9.1a
@@ -4,10 +4,10 @@ DESCRIPTION=a library for mp3splt to split mp3 and ogg files without decoding
 EAPI=4
 HOMEPAGE=http://mp3splt.sourceforge.net
 IUSE=doc flac pcre
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag flac? ( >=media-libs/flac-1.2.1 ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/libmp3splt-0.9.1a.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bda24d909daa9f3574883a1b2806a130
+_md5_=be5a7c0b29eb1d0ce5eeb4af43769161
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r100 b/metadata/md5-cache/media-libs/libsdl2-2.0.3-r100
index c1bde4631b3c..c017d6bbd0dc 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r100
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.3-r100
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=5
 HOMEPAGE=http://www.libsdl.org
 IUSE=3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick mmx nas opengl oss pulseaudio +sound sse sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2 ) dbus? ( >=sys-apps/dbus-1.6.18-r1 ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[gles2] ) nas? ( >=media-libs/nas-1.9.4 ) opengl? ( >=virtual/opengl-7.0-r1 >=virtual/glu-9.0-r1 ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1 ) tslib? ( >=x11-libs/tslib-1.0-r2 ) udev? ( >=virtual/libudev-208:= ) wayland? ( >=dev-libs/wayland-1.0.6 >=media-libs/mesa-9.1.6[wayland] >=x11-libs/libxkbcommon-0.2.0 ) X? ( >=x11-libs/libX11-1.6.2 >=x11-libs/libXcursor-1.1.14 >=x11-libs/libXext-1.3.2 >=x11-libs/libXi-1.7.2 >=x11-libs/libXrandr-1.4.2 >=x11-libs/libXt-1.1.4 >=x11-libs/libXxf86vm-1.1.3 xinerama? ( >=x11-libs/libXinerama-1.1.3 ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1 ) )
 REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.3.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=57e091c72315a5dda7c25b755df26346
+_md5_=1301cc559bd3b7bb2086396ac4cfbc5f
diff --git a/metadata/md5-cache/media-libs/mlt-0.9.0 b/metadata/md5-cache/media-libs/mlt-0.9.0
index e013287ffa6f..07ed23b1f9b2 100644
--- a/metadata/md5-cache/media-libs/mlt-0.9.0
+++ b/metadata/md5-cache/media-libs/mlt-0.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open source multimedia framework, designed and developed for tele
 EAPI=4
 HOMEPAGE=http://www.mltframework.org/
 IUSE=compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive libsamplerate melt mmx qt4 quicktime rtaudio sdl sse sse2 vorbis xine xml lua python ruby vdpau kernel_linux
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=ffmpeg? ( virtual/ffmpeg[vdpau?] ) dv? ( >=media-libs/libdv-0.104 ) xml? ( >=dev-libs/libxml2-2.5 ) vorbis? ( >=media-libs/libvorbis-1.1.2 ) sdl? ( >=media-libs/libsdl-1.2.10[X,opengl] >=media-libs/sdl-image-1.2.4 ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3 media-libs/ladspa-sdk >=dev-libs/libxml2-2.5 ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( x11-libs/gtk+:2 media-libs/libexif x11-libs/pango ) quicktime? ( media-libs/libquicktime ) rtaudio? ( kernel_linux? ( media-libs/alsa-lib ) ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) qt4? ( dev-qt/qtgui:4 dev-qt/qtsvg:4 media-libs/libexif ) kde? ( kde-base/kdelibs:4 media-libs/libexif ) !media-libs/mlt++ lua? ( >=dev-lang/lua-5.1.4-r4 ) ruby? ( dev-lang/ruby ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlt/mlt-0.9.0.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=cde0b8cce08ea0e8d8109da0562ebc83
+_md5_=33b551555abb454d0c8cd50e52fe2179
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-9999 b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
index 83ee2d9b611e..1dc16ba6c37c 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-9999
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-meta:0.10[alsa?,ogg,vorbis] >=media-libs/phonon-4.7.0[qt4?,qt5?] qt4? ( dev-qt/qtcore:4[glib] dev-qt/qtgui:4[glib] dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) virtual/opengl network? ( media-plugins/gst-plugins-soup:0.10 ) qt4? ( >=dev-util/automoc-0.9.87 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] >=media-libs/phonon-4.7.80[qt4?,qt5?] qt4? ( dev-qt/qtcore:4[glib] dev-qt/qtgui:4[glib] dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 ) qt4? ( >=dev-util/automoc-0.9.87 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Phonon GStreamer backend
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer
 IUSE=alsa debug +network +qt4 qt5
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-plugins/gst-plugins-meta:0.10[alsa?,ogg,vorbis] >=media-libs/phonon-4.7.0[qt4?,qt5?] qt4? ( dev-qt/qtcore:4[glib] dev-qt/qtgui:4[glib] dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) virtual/opengl network? ( media-plugins/gst-plugins-soup:0.10 )
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] >=media-libs/phonon-4.7.80[qt4?,qt5?] qt4? ( dev-qt/qtcore:4[glib] dev-qt/qtgui:4[glib] dev-qt/qtopengl:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-r3	6ebae45064cb04482f3c702632dd9528	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=97b1f15ae8b2ddb5a25cc5c19feda873
+_md5_=ee134e377ac7854b2f557da995159cd7
diff --git a/metadata/md5-cache/media-libs/quarter-1.0.0-r1 b/metadata/md5-cache/media-libs/quarter-1.0.0-r1
index fcf63ac4080b..dc54a104dceb 100644
--- a/metadata/md5-cache/media-libs/quarter-1.0.0-r1
+++ b/metadata/md5-cache/media-libs/quarter-1.0.0-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=media-libs/coin-3.0.0[javascript] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=A glue between Nokia Qt4 and Coin3D
-EAPI=2
+EAPI=5
 HOMEPAGE=http://www.coin3d.org/lib/quarter
 IUSE=debug doc static-libs
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/coin-3.0.0[javascript] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4
 SLOT=0
 SRC_URI=ftp://ftp.coin3d.org/pub/coin/src/all/Quarter-1.0.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=554ffce5d0eb56fd95edec531c907922
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=0b9c4e587d73a1bc73bf73bc7a8cef0e
diff --git a/metadata/md5-cache/media-radio/fldigi-3.21.82 b/metadata/md5-cache/media-radio/fldigi-3.21.82
index 29da8452b8e1..1ba555d2d276 100644
--- a/metadata/md5-cache/media-radio/fldigi-3.21.82
+++ b/metadata/md5-cache/media-radio/fldigi-3.21.82
@@ -4,9 +4,9 @@ DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
 EAPI=4
 HOMEPAGE=http://www.w1hkj.com/Fldigi.html
 IUSE=hamlib nls portaudio pulseaudio sndfile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 )
 SLOT=0
 SRC_URI=http://www.w1hkj.com/downloads/fldigi/fldigi-3.21.82.tar.gz
-_md5_=9d469779a83110267463a0cd28b0a20e
+_md5_=7670edc21663fb400436c16535d0257b
diff --git a/metadata/md5-cache/media-sound/kid3-3.1 b/metadata/md5-cache/media-sound/kid3-3.1
index 1793dd36d3ea..edb45bd82b39 100644
--- a/metadata/md5-cache/media-sound/kid3-3.1
+++ b/metadata/md5-cache/media-sound/kid3-3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-libs/readline:0 acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon ) ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( 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 ) ) kde? ( 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=] )
+DEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-libs/readline:0 acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) kde? ( 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 ) ) kde? ( 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 simple tag editor for KDE
 EAPI=5
 HOMEPAGE=http://kid3.sourceforge.net/
 IUSE=acoustid flac kde mp3 mp4 +phonon +taglib vorbis linguas_cs linguas_de linguas_es linguas_et linguas_fi linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@Latn linguas_tr linguas_zh_TW +handbook aqua kde
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-libs/readline:0 acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon ) ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libogg media-libs/libvorbis ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) ) kde? ( 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=] )
+RDEPEND=dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 sys-libs/readline:0 acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) phonon? ( || ( media-libs/phonon dev-qt/qtphonon:4 ) ) taglib? ( media-libs/taglib ) vorbis? ( media-libs/libogg media-libs/libvorbis ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) ) kde? ( 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=] )
 REQUIRED_USE=flac? ( vorbis )
 SLOT=4
 SRC_URI=mirror://sourceforge/kid3/kid3-3.1.tar.gz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=fe99ee693578b80f55e60bf23cdcf3ca
+_md5_=fdb1c1bcb9e579139b4c52ba22e54c10
diff --git a/metadata/md5-cache/media-sound/mp3splt-2.6.1a b/metadata/md5-cache/media-sound/mp3splt-2.6.1a
index 23f6a8273756..39dac1e5f8d0 100644
--- a/metadata/md5-cache/media-sound/mp3splt-2.6.1a
+++ b/metadata/md5-cache/media-sound/mp3splt-2.6.1a
@@ -4,10 +4,10 @@ DESCRIPTION=a command line utility to split mp3 and ogg files without decoding
 EAPI=4
 HOMEPAGE=http://mp3splt.sourceforge.net
 IUSE=flac
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=~media-libs/libmp3splt-0.9.1a[flac?]
 SLOT=0
 SRC_URI=mirror://sourceforge/mp3splt/mp3splt-2.6.1a.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=756e98e94e722b41be1bfaafb8e2b065
+_md5_=225601fca09552862fd3e967f764bf5e
diff --git a/metadata/md5-cache/media-sound/rubyripper-0.6.2-r1 b/metadata/md5-cache/media-sound/rubyripper-0.6.2-r1
index 72fb535644c7..92f9a6f6aeca 100644
--- a/metadata/md5-cache/media-sound/rubyripper-0.6.2-r1
+++ b/metadata/md5-cache/media-sound/rubyripper-0.6.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=media-sound/cdparanoia media-sound/cd-discid virtual/eject cdrdao? ( app-cdr/cdrdao ) flac? ( media-libs/flac ) vorbis? ( media-sound/vorbis-tools ) mp3? ( media-sound/lame ) wav? ( media-sound/wavpack ) normalize? ( media-sound/normalize ) wav? ( media-sound/wavegain ) vorbis? ( media-sound/vorbisgain ) mp3? ( media-sound/mp3gain ) test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-gettext-2.1.0-r1[ruby_targets_ruby18] gtk? ( >=dev-ruby/ruby-gtk2-0.19.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( >=dev-ruby/ruby-gettext-2.1.0-r1[ruby_targets_ruby19] gtk? ( >=dev-ruby/ruby-gtk2-0.19.3[ruby_targets_ruby19] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost
+DEPEND=media-sound/cdparanoia media-sound/cd-discid virtual/eject cdrdao? ( app-cdr/cdrdao ) flac? ( media-libs/flac ) vorbis? ( media-sound/vorbis-tools ) mp3? ( media-sound/lame ) wav? ( media-sound/wavpack ) normalize? ( media-sound/normalize ) wav? ( media-sound/wavegain ) vorbis? ( media-sound/vorbisgain ) mp3? ( media-sound/mp3gain ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gettext-2.1.0-r1[ruby_targets_ruby19] gtk? ( >=dev-ruby/ruby-gtk2-0.19.3[ruby_targets_ruby19] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost
 DESCRIPTION=A secure audio ripper for Linux
 EAPI=5
 HOMEPAGE=http://code.google.com/p/rubyripper
-IUSE=cli cdrdao flac +gtk +mp3 normalize +vorbis wav linguas_bg linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nl linguas_ru linguas_se test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+IUSE=cli cdrdao flac +gtk +mp3 normalize +vorbis wav linguas_bg linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_nl linguas_ru linguas_se test elibc_FreeBSD ruby_targets_ruby19
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=media-sound/cdparanoia media-sound/cd-discid virtual/eject cdrdao? ( app-cdr/cdrdao ) flac? ( media-libs/flac ) vorbis? ( media-sound/vorbis-tools ) mp3? ( media-sound/lame ) wav? ( media-sound/wavpack ) normalize? ( media-sound/normalize ) wav? ( media-sound/wavegain ) vorbis? ( media-sound/vorbisgain ) mp3? ( media-sound/mp3gain ) ruby_targets_ruby18? ( >=dev-ruby/ruby-gettext-2.1.0-r1[ruby_targets_ruby18] gtk? ( >=dev-ruby/ruby-gtk2-0.19.3[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( >=dev-ruby/ruby-gettext-2.1.0-r1[ruby_targets_ruby19] gtk? ( >=dev-ruby/ruby-gtk2-0.19.3[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+RDEPEND=media-sound/cdparanoia media-sound/cd-discid virtual/eject cdrdao? ( app-cdr/cdrdao ) flac? ( media-libs/flac ) vorbis? ( media-sound/vorbis-tools ) mp3? ( media-sound/lame ) wav? ( media-sound/wavpack ) normalize? ( media-sound/normalize ) wav? ( media-sound/wavegain ) vorbis? ( media-sound/vorbisgain ) mp3? ( media-sound/mp3gain ) ruby_targets_ruby19? ( >=dev-ruby/ruby-gettext-2.1.0-r1[ruby_targets_ruby19] gtk? ( >=dev-ruby/ruby-gtk2-0.19.3[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://rubyripper.googlecode.com/files/rubyripper-0.6.2.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6732f19888512ba80b4f2cf9e9de1522
+_md5_=f8c2d3dbaefda79b77968436885ecbd1
diff --git a/metadata/md5-cache/media-sound/xwax-1.5 b/metadata/md5-cache/media-sound/xwax-1.5
index 287e5fc12fd3..ffb53d9cdc15 100644
--- a/metadata/md5-cache/media-sound/xwax-1.5
+++ b/metadata/md5-cache/media-sound/xwax-1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Digital vinyl emulation software
 EAPI=5
 HOMEPAGE=http://www.xwax.co.uk/
 IUSE=alsa jack oss cdda mp3 +fallback
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/glibc sys-libs/pam media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) cdda? ( media-sound/cdparanoia ) mp3? ( media-sound/mpg123 ) fallback? ( virtual/ffmpeg )
 REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
 SLOT=0
 SRC_URI=http://www.xwax.co.uk/releases/xwax-1.5.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=d9e027ba4d2b7a4167870b6c1612e7c1
+_md5_=97a25f6bdfe611a0200eb7216bd6e546
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.15 b/metadata/md5-cache/media-video/ffmpeg-0.10.15
new file mode 100644
index 000000000000..d84deae45637
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-0.10.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dirac? ( >=media-video/dirac-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-video/ffmpeg-1.2 !<media-video/libav-9 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) >=sys-devel/make-3.81 dirac? ( virtual/pkgconfig ) doc? ( app-text/texi2html ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
+EAPI=5
+HOMEPAGE=http://ffmpeg.org/
+IUSE=aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack jpeg2k libass libv4l modplug mp3 +network openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon abi_x86_32 abi_x86_64 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 ~arm-linux ~x86-linux
+LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dirac? ( >=media-video/dirac-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-video/ffmpeg-1.2 !<media-video/libav-9 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r11 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) test? ( encode zlib )
+SLOT=0.10
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.15.tar.bz2
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=39160002ec1fd35d97062c51c8a758b9
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.2.7 b/metadata/md5-cache/media-video/ffmpeg-2.2.7
new file mode 100644
index 000000000000..28adb3f384f8
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-2.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( || ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/libcdio-0.90[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-0.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4 ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmx? ( >=dev-lang/yasm-1.2 ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( net-misc/wget ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
+EAPI=5
+HOMEPAGE=http://ffmpeg.org/
+IUSE=aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi armv5te armv6 armv6t2 neon armvfp mips32r2 mipsdspr1 mipsdspr2 mipsfpu altivec 3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2 +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( || ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/libcdio-0.90[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-0.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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4 ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart !media-libs/libpostproc abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
+SLOT=0/52.55.55
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.2.7.tar.bz2
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=5340f2779bb454f1c6c7434befa91649
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.3.2 b/metadata/md5-cache/media-video/ffmpeg-2.3.2
new file mode 100644
index 000000000000..04641fb63836
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-2.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( || ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/libcdio-0.90[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmx? ( >=dev-lang/yasm-1.2 ) rtmp? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( net-misc/wget ) truetype? ( >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( sys-kernel/linux-headers )
+DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
+EAPI=5
+HOMEPAGE=http://ffmpeg.org/
+IUSE=aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r fribidi gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx wavpack webp X x264 x265 xvid +zlib zvbi armv5te armv6 armv6t2 neon armvfp mips32r2 mipsdspr1 mipsdspr2 mipsfpu altivec 3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 sse4 sse4_2 xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( || ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/libcdio-0.90[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faac? ( >=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quvi? ( media-libs/libquvi:0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart !media-libs/libpostproc abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
+SLOT=0/52.55.55
+SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.3.2.tar.bz2
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=d3a241b4f4885b271cd54abec9aba497
diff --git a/metadata/md5-cache/media-video/movit-1.1.2 b/metadata/md5-cache/media-video/movit-1.1.2
new file mode 100644
index 000000000000..cdf8df8c7e9b
--- /dev/null
+++ b/metadata/md5-cache/media-video/movit-1.1.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile test
+DEPEND=media-libs/mesa =dev-cpp/eigen-3* media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
+DESCRIPTION=Modern Video Toolkit
+EAPI=5
+HOMEPAGE=http://movit.sesse.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/mesa =dev-cpp/eigen-3* media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://movit.sesse.net/movit-1.1.2.tar.gz http://googletest.googlecode.com/files/gtest-1.7.0.zip
+_md5_=13fdc57a984b0194a1b53935db608839
diff --git a/metadata/md5-cache/media-video/qx11grab-0.4.10-r1 b/metadata/md5-cache/media-video/qx11grab-0.4.10-r1
index 3cb229d520a3..7fbed80377b1 100644
--- a/metadata/md5-cache/media-video/qx11grab-0.4.10-r1
+++ b/metadata/md5-cache/media-video/qx11grab-0.4.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=X11 desktop video grabber tray
 EAPI=5
 HOMEPAGE=http://qx11grab.hjcms.de/
 IUSE=kde opengl pulseaudio
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 PDEPEND=virtual/freedesktop-icon-theme
 RDEPEND=>=dev-qt/qtcore-4.7.4:4 >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility] >=media-libs/alsa-lib-1.0.26 >=media-libs/fontconfig-2.4 >=media-libs/freetype-2.4:2 >=sys-apps/dbus-1.6.4 >=x11-libs/libX11-1.3.4 >=x11-libs/libXrandr-1.3 >=virtual/ffmpeg-9[X,encode,truetype] kde? ( kde-base/kdelibs:4 ) opengl? ( >=dev-qt/qtopengl-4.7.4:4 ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=http://qx11grab.hjcms.de/downloads/0.4.10/qx11grab-0.4.10.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=fca85033cf8497526b1b1bfe3be20d33
+_md5_=da979e4344f78cccedaa17f763ba2972
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
index a59756bc71d8..4e85d7177d47 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-l
 DESCRIPTION=A system to store and display time-series data
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc +graph lua perl python rrdcgi static-libs tcl tcpd python_targets_python2_7
-KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
+IUSE=dbi doc +graph lua perl python rrdcgi ruby static-libs tcl tcpd python_targets_python2_7
+KEYWORDS=alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) 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(-)] ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers )
+RDEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) 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(-)] ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) ruby? ( dev-ruby/rrdtool-bindings )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2597e719a8b1bc84a4d41ddd358d7e19
+_md5_=8366a59ec0a52d6f1de0035d6e87ed7f
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r3 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r3
index 67ea4c34457f..84389da29630 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r3
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r3
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-l
 DESCRIPTION=A system to store and display time-series data
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc graph lua perl python rrdcgi static-libs tcl tcpd python_targets_python2_7
+IUSE=dbi doc graph lua perl python rrdcgi ruby static-libs tcl tcpd python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) 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(-)] ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers )
+RDEPEND=>=dev-libs/glib-2.28.7[static-libs(+)?] >=dev-libs/libxml2-2.7.8[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua[deprecated] ) perl? ( dev-lang/perl ) 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(-)] ) tcl? ( dev-lang/tcl ) tcpd? ( sys-apps/tcp-wrappers ) ruby? ( dev-ruby/rrdtool-bindings )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=5e92db49b37574549ebbaf1545e26806
+_md5_=d02b325b66da0d8919bfa3294b2974bc
diff --git a/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3-r1 b/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3-r1
index 558eaeb968c3..5e589548cadf 100644
--- a/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3-r1
+++ b/metadata/md5-cache/net-analyzer/tcpslice-1.2a_p3-r1
@@ -3,10 +3,10 @@ DEPEND=net-libs/libpcap !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automak
 DESCRIPTION=Extract and concatenate portions of pcap files
 EAPI=5
 HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://debian/pool/main/t/tcpslice/tcpslice_1.2a3.orig.tar.gz mirror://debian/pool/main/t/tcpslice/tcpslice_1.2a3-4.debian.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=79ac85d2dc37b04384da3a0916a25288
+_md5_=c26a36e02b416833dccb7258437c3944
diff --git a/metadata/md5-cache/net-analyzer/tleds-1.05_beta11-r2 b/metadata/md5-cache/net-analyzer/tleds-1.05_beta11-r2
index ed9a9a082564..9f87edafb441 100644
--- a/metadata/md5-cache/net-analyzer/tleds-1.05_beta11-r2
+++ b/metadata/md5-cache/net-analyzer/tleds-1.05_beta11-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Blinks keyboard LEDs indicating outgoing and incoming network packet
 EAPI=5
 HOMEPAGE=http://www.hut.fi/~jlohikos/tleds_orig.html
 IUSE=X
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://www.hut.fi/~jlohikos/tleds/public/tleds-1.05beta10.tgz http://www.hut.fi/~jlohikos/tleds/public/tleds-1.05beta11.patch.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=1d2bdde56c24a1f8bb700d6b6cd99106
+_md5_=84889cbb423fd769a59c22ed9c63b379
diff --git a/metadata/md5-cache/net-fs/tahoe-lafs-1.10.0-r2 b/metadata/md5-cache/net-fs/tahoe-lafs-1.10.0-r2
index 35ce52e1ec6e..3c2a8871ac9b 100644
--- a/metadata/md5-cache/net-fs/tahoe-lafs-1.10.0-r2
+++ b/metadata/md5-cache/net-fs/tahoe-lafs-1.10.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Secure, decentralized, data store
 EAPI=5
 HOMEPAGE=http://tahoe-lafs.org/trac/tahoe-lafs
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/foolscap-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nevow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptopp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-9.0.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zbase32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zfec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-zope/zope-interface[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=http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.0.tar.bz2
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=929e2cc357e3cf88d669ee013ba283a8
+_md5_=1d8a868c1e6cb43b689bfe8e1104e135
diff --git a/metadata/md5-cache/net-ftp/lftp-4.5.3 b/metadata/md5-cache/net-ftp/lftp-4.5.3
index a59b55dc02bf..fe72e21bdeee 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.5.3
+++ b/metadata/md5-cache/net-ftp/lftp-4.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
 EAPI=5
 HOMEPAGE=http://lftp.yar.ru/
 IUSE=convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN linguas_zh_HK linguas_zh_TW
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.1 >=sys-libs/readline-5.1 dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) verify-file? ( dev-perl/string-crc32 virtual/perl-Digest-MD5 )
 REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
 SLOT=0
 SRC_URI=http://lftp.yar.ru/ftp/lftp-4.5.3.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=91a6b9c32a079b039f2e275dacf5cfaf
+_md5_=e841f36667ed6ffaf324908d0f6d0462
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020
index 46a8b9001730..7fbff56b2a40 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby18] dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby19] dev-ruby/rake[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( dev-ruby/tokyocabinet[ruby_targets_ruby18] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby18] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby18] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby18] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby18] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby18] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/tokyocabinet[ruby_targets_ruby19] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby19] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby19] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby19] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby19] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby19] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby19] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DEPEND=ruby_targets_ruby19? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby19] dev-ruby/rake[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby19? ( dev-ruby/tokyocabinet[ruby_targets_ruby19] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby19] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby19] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby19] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby19] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby19] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby19] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=rbot is a ruby IRC bot
 EAPI=2
 HOMEPAGE=http://ruby-rbot.org/
-IUSE=spell aspell timezone translator shorturl nls dict figlet fortune cal host toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+IUSE=spell aspell timezone translator shorturl nls dict figlet fortune cal host toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby19
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( feh GPL-2 )
-RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby18? ( dev-ruby/tokyocabinet[ruby_targets_ruby18] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby18] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby18] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby18] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby18] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby18] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( dev-ruby/tokyocabinet[ruby_targets_ruby19] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby19] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby19] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby19] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby19] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby19] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby19? ( dev-ruby/tokyocabinet[ruby_targets_ruby19] timezone? ( dev-ruby/tzinfo[ruby_targets_ruby19] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby19] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby19] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby19] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby19] ) dict? ( >=dev-ruby/ruby-dict-0.9.4-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=0
 SRC_URI=http://dev.a3li.li/gentoo/distfiles/rbot-0.9.15_p20131020.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a6c9c02fecc6fda4e40dcae58efaf45f
+_md5_=6d7c2f79c6a0bb47af5ee581af85070d
diff --git a/metadata/md5-cache/net-libs/libgadu-1.12.0 b/metadata/md5-cache/net-libs/libgadu-1.12.0
index c5cbc7bcb1a2..07154147bb12 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.12.0
+++ b/metadata/md5-cache/net-libs/libgadu-1.12.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib gg11? ( >=dev-libs/protobuf-c-0.15 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) doc? ( app-doc/doxygen ) test? ( dev-libs/expat dev-libs/libxml2:2 net-misc/curl )
+DEPEND=>=dev-libs/protobuf-c-0.15 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) doc? ( app-doc/doxygen ) test? ( dev-libs/expat dev-libs/libxml2:2 net-misc/curl )
 DESCRIPTION=This library implements the client side of the Gadu-Gadu protocol
 EAPI=5
 HOMEPAGE=http://toxygen.net/libgadu/
-IUSE=doc +gg11 gnutls ssl static-libs test threads
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+IUSE=doc gnutls ssl static-libs test threads
+KEYWORDS=~amd64 ~arm -hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib gg11? ( >=dev-libs/protobuf-c-0.15 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
+RDEPEND=>=dev-libs/protobuf-c-0.15 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libgadu/archive/1.12.0.tar.gz -> libgadu-1.12.0.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=52cb383d91ac9244d73b2216e7d42990
+_md5_=0d6b9857ce17cacca0d7cd1539e42ca5
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1 b/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
index 895886c9b88a..de453f0089d0 100644
--- a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
+++ b/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Minimalistic netlink library
 EAPI=4
 HOMEPAGE=http://netfilter.org/projects/libmnl
 IUSE=examples static-libs
-KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libmnl/files/libmnl-1.0.3.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=08d9a469f7f169481d6d16955ea13bfa
+_md5_=a761a29f02a6ec5c80e96fb5e72a77af
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
index 777514f202c8..855ae260d5a6 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Userspace library providing interface to extended accounting infrast
 EAPI=5
 HOMEPAGE=http://netfilter.org/projects/libnetfilter_acct
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~ia64 ppc x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux
 LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.2.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8cc76667058f092bf3e9b9bfd1711a03
+_md5_=f698f4763800e5fc33db8d297771212e
diff --git a/metadata/md5-cache/net-libs/libnids-1.24-r5 b/metadata/md5-cache/net-libs/libnids-1.24-r5
index 857ed733d631..552efb277124 100644
--- a/metadata/md5-cache/net-libs/libnids-1.24-r5
+++ b/metadata/md5-cache/net-libs/libnids-1.24-r5
@@ -4,10 +4,10 @@ DESCRIPTION=an implementation of an E-component of Network Intrusion Detection S
 EAPI=5
 HOMEPAGE=http://libnids.sourceforge.net/
 IUSE=+glib +libnet static-libs
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap glib? ( dev-libs/glib ) libnet? ( >=net-libs/libnet-1.1.0-r3 ) !net-libs/libnids:1.1
 SLOT=1.2
 SRC_URI=mirror://sourceforge/libnids/libnids-1.24.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=5655b5ebc4938bf3c55b224899ff1151
+_md5_=b7e55c82879b4dcb52195cf8fbc7f0fa
diff --git a/metadata/md5-cache/net-libs/libpcapnav-0.8 b/metadata/md5-cache/net-libs/libpcapnav-0.8
index ffa0634a9a4b..726041358cef 100644
--- a/metadata/md5-cache/net-libs/libpcapnav-0.8
+++ b/metadata/md5-cache/net-libs/libpcapnav-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Libpcap wrapper library to navigate to arbitrary packets in a tcpdum
 EAPI=5
 HOMEPAGE=http://netdude.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netdude/libpcapnav-0.8.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=36ae0c5a332f9df768c50ddc14cf497e
+_md5_=5c5b8639289ebe79d8cb05ea6bfdc77e
diff --git a/metadata/md5-cache/net-libs/serf-1.3.6 b/metadata/md5-cache/net-libs/serf-1.3.6
index cbdfd0fe3f15..d42453a34a93 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.6
+++ b/metadata/md5-cache/net-libs/serf-1.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP client library
 EAPI=5
 HOMEPAGE=http://code.google.com/p/serf/
 IUSE=kerberos
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 SLOT=1
 SRC_URI=http://serf.googlecode.com/svn/src_releases/serf-1.3.6.tar.bz2
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=567895aab255f90cf4f58de0fc42076d
+_md5_=ae8d752ddcf119d49c0103e9e260f7d2
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.10 b/metadata/md5-cache/net-mail/dovecot-2.2.10
deleted file mode 100644
index e713a2ef163a..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=5
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd zlib ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv net-mail/mailbase
-SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.10.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz )
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=509f90770736d1c52c70833c711a4159
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.12 b/metadata/md5-cache/net-mail/dovecot-2.2.12
deleted file mode 100644
index dfcad7f13b4b..000000000000
--- a/metadata/md5-cache/net-mail/dovecot-2.2.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=5
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
-SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.12.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz )
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c6fa27c1ef7dde6e9c7839eff0abb8c0
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.13 b/metadata/md5-cache/net-mail/dovecot-2.2.13
index ef2a29e8eed8..da74dcda16d5 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.13
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.13
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=amd64 ~arm ~hppa ia64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.13.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz )
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f35bfac5bda2e6584cb5d757164058e6
+_md5_=4cfb125576fec63dd5a8fe309bc54ce7
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.13-r1 b/metadata/md5-cache/net-mail/dovecot-2.2.13-r1
index 3fce7e26270e..11db1389ba7e 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.13-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.13.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.3.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.3.tar.gz )
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=92b2558eeaa18d720b41590a84e087b1
+_md5_=b90990e3f5854e6a8a61532a18d9f217
diff --git a/metadata/md5-cache/net-misc/badvpn-1.999.129 b/metadata/md5-cache/net-misc/badvpn-1.999.129
index ac14400cb572..b405a4c2aa2d 100644
--- a/metadata/md5-cache/net-misc/badvpn-1.999.129
+++ b/metadata/md5-cache/net-misc/badvpn-1.999.129
@@ -4,7 +4,7 @@ DESCRIPTION=Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
 EAPI=5
 HOMEPAGE=https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/
 IUSE=+client +ncd +server +tun2socks +udpgw debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=BSD
 RDEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) ncd? ( dev-libs/openssl ) ncd? ( sys-apps/iproute2 >=virtual/udev-171 )
 REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
@@ -12,4 +12,4 @@ RESTRICT=!ncd? ( test )
 SLOT=0
 SRC_URI=https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz -> badvpn-1.999.129.tar.gz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c51c9ab081ba730df6e72279caccb86f
+_md5_=b1cb9ef3ad60a4ce37c29124ceb986e4
diff --git a/metadata/md5-cache/net-misc/mediatomb-0.12.1-r8 b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r8
index 3fa3c21a0c2e..9df310ba0721 100644
--- a/metadata/md5-cache/net-misc/mediatomb-0.12.1-r8
+++ b/metadata/md5-cache/net-misc/mediatomb-0.12.1-r8
@@ -4,11 +4,11 @@ DESCRIPTION=MediaTomb is an open source UPnP MediaServer
 EAPI=5
 HOMEPAGE=http://www.mediatomb.cc/
 IUSE=curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=mysql? ( virtual/mysql ) dev-libs/expat id3tag? ( media-libs/id3lib ) javascript? ( >=dev-lang/spidermonkey-1.8.5:0 ) taglib? ( media-libs/taglib ) sqlite? ( >=dev-db/sqlite-3 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux zlib? ( sys-libs/zlib ) virtual/libiconv
 REQUIRED_USE=|| ( mysql sqlite ) taglib? ( !id3tag ) id3tag? ( !taglib ) thumbnail? ( ffmpeg !libextractor ) ffmpeg? ( !libextractor ) libextractor? ( !ffmpeg !thumbnail )
 SLOT=0
 SRC_URI=mirror://sourceforge/mediatomb/mediatomb-0.12.1.tar.gz mirror://debian/pool/main/m/mediatomb/mediatomb_0.12.1-5.debian.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9fa61e89ae321a6e1c4b0b9dec2a3116
+_md5_=9cc64f02c2266c227c5208c2bc5666dd
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.2 b/metadata/md5-cache/net-misc/rdesktop-1.8.2
index cdbdb32ab0a1..e82a37ce789e 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.2
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.2
@@ -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.2.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a33847a0be354567bd5b7f4410b4fb9c
+_md5_=34cc43b236fb0ecbb12eebcf3393adb5
diff --git a/metadata/md5-cache/net-misc/wol-0.7.1-r1 b/metadata/md5-cache/net-misc/wol-0.7.1-r1
index c673372bf962..ac7357d757ae 100644
--- a/metadata/md5-cache/net-misc/wol-0.7.1-r1
+++ b/metadata/md5-cache/net-misc/wol-0.7.1-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Wake up hardware that is Magic Packet compliant
 EAPI=5
 HOMEPAGE=http://ahh.sourceforge.net/wol/
 IUSE=nls
-KEYWORDS=~amd64 arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ahh/wol-0.7.1.tar.gz
-_md5_=d6383ac89619c0cf800091fe1afd33e8
+_md5_=9b51e2cd5d620a781ac73fec77985adb
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.2.0 b/metadata/md5-cache/sci-calculators/keurocalc-1.2.0
deleted file mode 100644
index c7e8467250cf..000000000000
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.2.0
+++ /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=A universal currency converter and calculator
-EAPI=4
-HOMEPAGE=http://opensource.bureau-cornavin.com/keurocalc/index.html
-IUSE=debug linguas_ar 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_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ka linguas_ko linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sr linguas_sr@Latn linguas_sv linguas_ta linguas_tr linguas_uk linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ka? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ka(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_ta? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ta(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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=http://opensource.bureau-cornavin.com/keurocalc/sources/keurocalc-1.2.0.tgz
-_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0fe7034f9b2f95b318dfe16443251844
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.2.1 b/metadata/md5-cache/sci-calculators/keurocalc-1.2.1
deleted file mode 100644
index 96ef85ff7cc1..000000000000
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.2.1
+++ /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=A universal currency converter and calculator
-EAPI=5
-HOMEPAGE=http://opensource.bureau-cornavin.com/keurocalc/index.html
-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_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@Latn linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_TW +handbook aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ FDL-1.2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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=http://opensource.bureau-cornavin.com/keurocalc/sources/keurocalc-1.2.1.tgz
-_eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=be036845e20b043511164bb1ce7aa098
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.2.2 b/metadata/md5-cache/sci-calculators/keurocalc-1.2.2
index 30a476f205eb..a3aba40c20f8 100644
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.2.2
+++ b/metadata/md5-cache/sci-calculators/keurocalc-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=A universal currency converter and calculator
 EAPI=5
 HOMEPAGE=http://opensource.bureau-cornavin.com/keurocalc/index.html
 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_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@Latn linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_TW +handbook aqua
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_ko? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@Latn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@Latn(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) 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=http://opensource.bureau-cornavin.com/keurocalc/sources/keurocalc-1.2.2.tgz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b89eca7fc9e64eb8e971b802d46e1e96
+_md5_=f1c229882d351a4057a2d41150baf243
diff --git a/metadata/md5-cache/sci-chemistry/pymol-1.7.0.1 b/metadata/md5-cache/sci-chemistry/pymol-1.7.0.1
index 4876df913a97..0404f8401561 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-1.7.0.1
+++ b/metadata/md5-cache/sci-chemistry/pymol-1.7.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python-extensible molecular graphics system
 EAPI=5
 HOMEPAGE=http://www.pymol.org/
 IUSE=apbs web python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=PSF-2.2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pmw[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 media-libs/glew media-libs/libpng media-video/mpeg-tools sys-libs/zlib media-libs/freeglut apbs? ( sci-chemistry/apbs sci-chemistry/pdb2pqr sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/pymol-1.7.0.0.png.xz http://dev.gentoo.org/~jlec/distfiles/pymol-1.7.0.1.tar.xz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3b4428652a75316e0f4962be7d75055c
+_md5_=71b54a4bb2417e10375acc55937831a0
diff --git a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26-r1 b/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26-r1
index 2dd3fcd9adf6..42b8ea95224d 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26-r1
+++ b/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26-r1
@@ -4,11 +4,11 @@ DESCRIPTION=APBS plugin for pymol
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/pymolapbsplugin/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=pymol
 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(-)] sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://sourceforge.net/p/pymolapbsplugin/code/26/tree/trunk/src/apbsplugin.py?format=raw -> pymol-apbs-plugin-2.1_p26.py
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a1d064721229fdfa404ef5dfd0681c1a
+_md5_=0584c71d417c998dfd0db40e0d2062b7
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-2.8 b/metadata/md5-cache/sci-electronics/xnec2c-2.8
index 85ee5cf72cbd..5ce63820a42d 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-2.8
+++ b/metadata/md5-cache/sci-electronics/xnec2c-2.8
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ graphical interactive version of nec2c
 EAPI=4
 HOMEPAGE=http://www.qsl.net/5b4az/pages/nec2.html
 IUSE=doc examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-2.8.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4d391ea210fa3d350bb4f4445ffd36f1
+_md5_=19ff56c41e25ad225ce266286ae5938c
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.3 b/metadata/md5-cache/sci-libs/libcerf-1.3
index 4aa55933de6b..47571c3b9cca 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.3
+++ b/metadata/md5-cache/sci-libs/libcerf-1.3
@@ -3,9 +3,9 @@ DESCRIPTION=library that provides an efficient and accurate implementation of co
 EAPI=5
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.3.tgz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=b039b293365147910a8457c059c117b8
+_md5_=b98b3263a20b72706376c2ce0376a54a
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.4.4-r1 b/metadata/md5-cache/sci-mathematics/flint-2.4.4-r1
index 33ee362f0752..0192dab4a569 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.4.4-r1
+++ b/metadata/md5-cache/sci-mathematics/flint-2.4.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Fast Library for Number Theory
 EAPI=5
 HOMEPAGE=http://www.flintlib.org/
 IUSE=doc gc ntl static-libs test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp dev-libs/mpfr gc? ( dev-libs/boehm-gc ) ntl? ( dev-libs/ntl )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.flintlib.org/flint-2.4.4.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=14ddc84c7be72b037f58835fd81b135f
+_md5_=38dd0a20d2643a5ba8b5caf3f9661711
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-2.10.1 b/metadata/md5-cache/sci-mathematics/normaliz-2.10.1
index 1439d68f95ba..c6eecfe727fb 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-2.10.1
+++ b/metadata/md5-cache/sci-mathematics/normaliz-2.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for computations in affine monoids and more
 EAPI=5
 HOMEPAGE=http://www.mathematik.uni-osnabrueck.de/normaliz/
 IUSE=extras openmp
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gmp[cxx]
 SLOT=0
 SRC_URI=http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.10/Normaliz2.10.zip
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3f80e14ac364e42af1e246b244e9b5af
+_md5_=9e7cfb41049b6804cdfca41a98e2b687
diff --git a/metadata/md5-cache/sys-apps/gsmartcontrol-0.8.7 b/metadata/md5-cache/sys-apps/gsmartcontrol-0.8.7
index 76871f1ae109..5ebbdf025f8d 100644
--- a/metadata/md5-cache/sys-apps/gsmartcontrol-0.8.7
+++ b/metadata/md5-cache/sys-apps/gsmartcontrol-0.8.7
@@ -4,10 +4,10 @@ DESCRIPTION=Hard disk drive health inspection tool
 EAPI=4
 HOMEPAGE=http://gsmartcontrol.sourceforge.net/home/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB
 RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/libpcre sys-apps/smartmontools x11-apps/xmessage
 SLOT=0
 SRC_URI=mirror://berlios/gsmartcontrol/gsmartcontrol-0.8.7.tar.bz2 http://artificialtime.com/gsmartcontrol/gsmartcontrol-0.8.7.tar.bz2
 _eclasses_=gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=9170443cacde303dc9ae313e903fca73
+_md5_=fe8a63502c30ecdeeaed650b20c08c21
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.43 b/metadata/md5-cache/sys-apps/hdparm-9.43
index 7d8beb2b8f6b..5bec58233d4c 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.43
+++ b/metadata/md5-cache/sys-apps/hdparm-9.43
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Utility to change hard drive performance parameters
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/hdparm/
+IUSE=static
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hdparm/hdparm-9.43.tar.gz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a67243e3370f7fbaba79734ebdae3cc9
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=c78998c18278f1b666953e11fe58776c
diff --git a/metadata/md5-cache/sys-apps/input-utils-1.1 b/metadata/md5-cache/sys-apps/input-utils-1.1
new file mode 100644
index 000000000000..05d9194c80f1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/input-utils-1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Small collection of linux input layer utils
+EAPI=4
+HOMEPAGE=https://www.kraxel.org/blog/linux/input/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.kraxel.org/releases/input/input-1.1.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=ca1260dfb2d2b878335b0063b2ae768e
diff --git a/metadata/md5-cache/sys-apps/microcode-data-20140430 b/metadata/md5-cache/sys-apps/microcode-data-20140430
index 01d19d2f2dfd..6b312c7b71a7 100644
--- a/metadata/md5-cache/sys-apps/microcode-data-20140430
+++ b/metadata/md5-cache/sys-apps/microcode-data-20140430
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Intel IA32 microcode update data
 EAPI=4
 HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=23829
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=intel-ucode
 RDEPEND=!<sys-apps/microcode-ctl-1.17-r2
 SLOT=0
 SRC_URI=http://downloadmirror.intel.com/23829/eng/microcode-20140430.tgz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=d65b59e0079b69364573b25e9e5f44f5
+_md5_=9d3f9e3a2463cdde783ce7f7389d5613
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.23 b/metadata/md5-cache/sys-apps/razercfg-0.23
index 46df355c735d..8cadd0d88eb0 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.23
+++ b/metadata/md5-cache/sys-apps/razercfg-0.23
@@ -4,10 +4,10 @@ DESCRIPTION=Utility for advanced configuration of Razer mice (DeathAdder, Krait,
 EAPI=5
 HOMEPAGE=http://bues.ch/cms/hacking/razercfg.html
 IUSE=+pm-utils qt4 python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=pm-utils? ( sys-power/pm-utils ) qt4? ( dev-python/PyQt4 )
 SLOT=0
 SRC_URI=http://bues.ch/razercfg/razercfg-0.23.tar.bz2
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=4de291f1f73c421a2ddde2d591356abc
+_md5_=5c7cc4aaa0aa145b63ba395941d4c5a6
diff --git a/metadata/md5-cache/sys-auth/consolekit-0.4.6 b/metadata/md5-cache/sys-auth/consolekit-0.4.6
index 94affd0a1a36..bdde5b62e232 100644
--- a/metadata/md5-cache/sys-auth/consolekit-0.4.6
+++ b/metadata/md5-cache/sys-auth/consolekit-0.4.6
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for defining and tracking users, login sessions and seats
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl debug doc kernel_linux pam policykit selinux systemd-units test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100:= || ( >=dev-libs/glib-2.38.2-r1:2 <dev-libs/glib-2.38:2 ) >=dev-libs/glib-2.22:2= sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.6.tar.xz mirror://debian/pool/main/c/consolekit/consolekit_0.4.6-4.debian.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=628e594c276614ee0f3722f0fe7cefc5
+_md5_=babbba868a3d9f3002143291a54580ad
diff --git a/metadata/md5-cache/sys-auth/polkit-0.112-r1 b/metadata/md5-cache/sys-auth/polkit-0.112-r1
index 7b89ccff2627..705c0c891c37 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.112-r1
+++ b/metadata/md5-cache/sys-auth/polkit-0.112-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) ) >=dev-libs/glib-2.32 >=dev-libs/expat-2:= introspection? ( >=dev-libs/gobject-introspection-1 ) pam? ( sys-auth/pambase virtual/pam ) selinux? ( sec-policy/selinux-policykit ) systemd? ( sys-apps/systemd ) app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/intltool virtual/pkgconfig virtual/pkgconfig
+DEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) !hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) ) ) >=dev-libs/glib-2.32 >=dev-libs/expat-2:= introspection? ( >=dev-libs/gobject-introspection-1 ) pam? ( sys-auth/pambase virtual/pam ) selinux? ( sec-policy/selinux-policykit ) systemd? ( sys-apps/systemd ) app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/intltool virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/polkit
 IUSE=examples gtk +introspection kde nls pam selinux systemd
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 lxde-base/lxpolkit ) ) kde? ( sys-auth/polkit-kde-agent ) !systemd? ( sys-auth/consolekit[policykit] )
-RDEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) ) >=dev-libs/glib-2.32 >=dev-libs/expat-2:= introspection? ( >=dev-libs/gobject-introspection-1 ) pam? ( sys-auth/pambase virtual/pam ) selinux? ( sec-policy/selinux-policykit ) systemd? ( sys-apps/systemd )
+RDEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) !hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) ) ) >=dev-libs/glib-2.32 >=dev-libs/expat-2:= introspection? ( >=dev-libs/gobject-introspection-1 ) pam? ( sys-auth/pambase virtual/pam ) selinux? ( sec-policy/selinux-policykit ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.112.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	51ad5130f4a69b1a118ca5296de276ae	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9dbfb25ff15a4590c37622a5aa832a11
+_md5_=20b6236b75b12e6ee3fefa70cc237298
diff --git a/metadata/md5-cache/sys-auth/polkit-0.112-r2 b/metadata/md5-cache/sys-auth/polkit-0.112-r2
index fb44b2cb2cb6..7e55f7df8655 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.112-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.112-r2
@@ -11,4 +11,4 @@ RDEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) hppa? ( =dev-lang/spider
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.112.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	51ad5130f4a69b1a118ca5296de276ae	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=57d20ca5b5c33bd2e94ef4bce9e40342
+_md5_=d1879b0c8670408c5c756724ea80e437
diff --git a/metadata/md5-cache/sys-boot/unetbootin-608 b/metadata/md5-cache/sys-boot/unetbootin-608
index cb70f97f0846..0a96173df1ac 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-608
+++ b/metadata/md5-cache/sys-boot/unetbootin-608
@@ -4,10 +4,10 @@ DESCRIPTION=Universal Netboot Installer creates Live USB systems for various OS
 EAPI=5
 HOMEPAGE=http://unetbootin.sourceforge.net/
 IUSE=linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 sys-fs/mtools <sys-boot/syslinux-5 app-arch/p7zip
 SLOT=0
 SRC_URI=mirror://sourceforge/unetbootin/unetbootin-source-608.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	40136c5fe0002a0d3937e869ae4ee0e2	qt4-r2	b40473dafd07d7c5fe4aef1c1b902f39	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c838b99697093737983310ab967a5825
+_md5_=1b8eaa8b07bec20bc12754b610f2f572
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.7.2 b/metadata/md5-cache/sys-cluster/vzctl-4.7.2
index d2d508d5c2a6..a0467c6469ce 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.7.2
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.7.2
@@ -4,10 +4,10 @@ DESCRIPTION=OpenVZ ConTainers control utility
 EAPI=5
 HOMEPAGE=http://openvz.org/
 IUSE=+ploop +vz-kernel +vzmigrate
-KEYWORDS=~amd64 ~x86 ~ppc64 -amd64-fbsd -x86-fbsd -sparc-fbsd
+KEYWORDS=~amd64 ~ppc64 x86 -amd64-fbsd -sparc-fbsd -x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 vz-kernel? ( >=sys-fs/vzquota-3.1 ) ploop? ( >=sys-cluster/ploop-1.9 sys-block/parted sys-fs/quota ) >=dev-libs/libcgroup-0.38 vzmigrate? ( net-misc/openssh net-misc/rsync[xattr,acl] app-arch/tar[xattr,acl] )
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzctl/4.7.2/src/vzctl-4.7.2.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=00a4258e6eb8fab2784aed5b857f2737
+_md5_=e31401a6d8e410f02b04ebad7058128e
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.51.1-r1 b/metadata/md5-cache/sys-kernel/genkernel-3.4.51.1-r1
new file mode 100644
index 000000000000..dbec360eaf75
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.51.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=5
+HOMEPAGE=http://www.gentoo.org
+IUSE=crypt cryptsetup ibm selinux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-0.2.1 !<sys-apps/openrc-0.9.9
+SLOT=0
+SRC_URI=mirror://gentoo/genkernel-3.4.51.1.tar.bz2 http://packages.gentooexperimental.org/genkernel/config.amd64 http://packages.gentooexperimental.org/genkernel/config.x86 http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz http://www.busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
+_md5_=1ae2645e8633f88377751b5cd602d744
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.53 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.53
new file mode 100644
index 000000000000..f24be807ce7e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.53
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.10.53
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-61.base.tar.xz mirror://gentoo/genpatches-3.10-61.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-61.experimental.tar.xz )
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=430f21358cd8302c1a818616f5fbcdf9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.17
new file mode 100644
index 000000000000..b9778e14a2e9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.17
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.14 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.17
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-21.base.tar.xz mirror://gentoo/genpatches-3.14-21.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-21.experimental.tar.xz )
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cbeb90b4ea6d136dad90d60e1343b5b5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.15.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.15.10
new file mode 100644
index 000000000000..579f56cc6414
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.15.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.15 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.15.10
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-3.15 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-check -> deblob-check-3.15 ) mirror://gentoo/genpatches-3.15-12.base.tar.xz mirror://gentoo/genpatches-3.15-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.15-12.experimental.tar.xz )
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e57224fa54530952c20c61c04f76ef6d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.16.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.16.1
new file mode 100644
index 000000000000..bcf472aa5315
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.16.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.16 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.16.1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.16.N/deblob-3.16 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.16.N/deblob-check -> deblob-check-3.16 ) mirror://gentoo/genpatches-3.16-2.base.tar.xz mirror://gentoo/genpatches-3.16-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.16-2.experimental.tar.xz )
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0f3de56a85d3b79ef1e4d987b3ffc05e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.103 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.103
new file mode 100644
index 000000000000..7ce37b7edfd5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.103
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.4 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.4.103
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-3.4 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.4.N/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-86.base.tar.xz mirror://gentoo/genpatches-3.4-86.extras.tar.xz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e67f7a0ab19ba8e7f277abb9da95fd8c
diff --git a/metadata/md5-cache/virtual/mysql-5.5 b/metadata/md5-cache/virtual/mysql-5.5
index b28fec8281d9..cb7e85679fa3 100644
--- a/metadata/md5-cache/virtual/mysql-5.5
+++ b/metadata/md5-cache/virtual/mysql-5.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL client or database
 EAPI=4
 IUSE=embedded minimal static static-libs
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-db/mariadb-5.5*[embedded=,minimal=,static=,static-libs=] =dev-db/mysql-5.5*[embedded=,minimal=,static=,static-libs=] =dev-db/percona-server-5.5*[embedded=,minimal=,static=,static-libs=] =dev-db/mariadb-galera-5.5*[embedded=,minimal=,static=,static-libs=] )
 SLOT=0
-_md5_=24613dd7c94ec5994fb49e0825a66118
+_md5_=b5110c45e6a3ad3d29e362d9ccc78ff2
diff --git a/metadata/md5-cache/virtual/mysql-5.6 b/metadata/md5-cache/virtual/mysql-5.6
deleted file mode 100644
index cd53791ba621..000000000000
--- a/metadata/md5-cache/virtual/mysql-5.6
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for MySQL client or database
-EAPI=5
-IUSE=embedded minimal static static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=] =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=] =dev-db/mysql-5.6*[embedded=,minimal=,static=,static-libs=] =dev-db/percona-server-5.6*[embedded=,minimal=,static=,static-libs=] =dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=] =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=] )
-SLOT=0
-_md5_=43982c618150632fc53b1f167d7694d0
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r1 b/metadata/md5-cache/virtual/mysql-5.6-r1
new file mode 100644
index 000000000000..e922b0d60f8d
--- /dev/null
+++ b/metadata/md5-cache/virtual/mysql-5.6-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for MySQL client or database
+EAPI=5
+IUSE=embedded minimal static static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+RDEPEND=|| ( =dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=] =dev-db/mysql-5.6*[embedded=,minimal=,static=,static-libs=] =dev-db/percona-server-5.6*[embedded=,minimal=,static=,static-libs=] =dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=] =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=] )
+SLOT=0/18
+_md5_=9e465c905af193a5ab55c2edd4701937
diff --git a/metadata/md5-cache/virtual/python-pathlib-1.0 b/metadata/md5-cache/virtual/python-pathlib-1.0
index 012880b82db2..94e5ab0e20a1 100644
--- a/metadata/md5-cache/virtual/python-pathlib-1.0
+++ b/metadata/md5-cache/virtual/python-pathlib-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python pathlib module
 EAPI=5
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_2? ( dev-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=793721fc5cd49b16fbd6f04e8c79eded
+_md5_=dd16b4b69ef09fe6c0c7ebec113a5e9c
diff --git a/metadata/md5-cache/virtual/ruby-ffi-2 b/metadata/md5-cache/virtual/ruby-ffi-2
index b17340e42cb7..00a1c9e30220 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-2
+++ b/metadata/md5-cache/virtual/ruby-ffi-2
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby ffi library
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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=ruby_targets_ruby19? ( dev-ruby/ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/ffi[ruby_targets_ruby20] ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby )
 SLOT=0
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b93d7e2fd0e7a09f91cad8bc92a134cc
+_md5_=816c958bdda1a3943800b65525c0e2a9
diff --git a/metadata/md5-cache/virtual/ruby-ffi-3 b/metadata/md5-cache/virtual/ruby-ffi-3
index f72da930f8a1..7dac537284c8 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-3
+++ b/metadata/md5-cache/virtual/ruby-ffi-3
@@ -3,9 +3,9 @@ DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby ffi library
 EAPI=5
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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=ruby_targets_ruby19? ( dev-ruby/ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/ffi[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/ffi[ruby_targets_ruby21] ) ruby_targets_jruby? ( dev-java/jruby ) 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_jruby? ( dev-java/jruby )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=754889f5df318bad23c0bb56f7c40de7
+_md5_=bd9787561a62c783a21e78dc470c690b
diff --git a/metadata/md5-cache/www-apps/drupal-6.32 b/metadata/md5-cache/www-apps/drupal-6.33
similarity index 83%
rename from metadata/md5-cache/www-apps/drupal-6.32
rename to metadata/md5-cache/www-apps/drupal-6.33
index 120b4a6eb5c7..fbdfa6fc5dba 100644
--- a/metadata/md5-cache/www-apps/drupal-6.32
+++ b/metadata/md5-cache/www-apps/drupal-6.33
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/httpd-php dev-lang/php[gd,pdo,postgres?,xml] mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres )
-SLOT=6.32
-SRC_URI=http://drupal.org/files/projects/drupal-6.32.tar.gz
+SLOT=6.33
+SRC_URI=http://drupal.org/files/projects/drupal-6.33.tar.gz
 _eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=a4e1ec18f9029a1ca89c20f3b0a2dae0
+_md5_=344607a01fd6a0806a115bdc1b3ebff0
diff --git a/metadata/md5-cache/www-apps/drupal-7.29 b/metadata/md5-cache/www-apps/drupal-7.31
similarity index 88%
rename from metadata/md5-cache/www-apps/drupal-7.29
rename to metadata/md5-cache/www-apps/drupal-7.31
index f3209049b6b7..43d24bdf4cee 100644
--- a/metadata/md5-cache/www-apps/drupal-7.29
+++ b/metadata/md5-cache/www-apps/drupal-7.31
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( ( <dev-lang/php-5.5 dev-php/pecl-apc ) dev-php/xcache dev-php/eaccelerator ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( || ( dev-lang/php[sqlite] dev-lang/php[sqlite3] ) ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.29
-SRC_URI=http://drupal.org/files/projects/drupal-7.29.tar.gz
+SLOT=7.31
+SRC_URI=http://drupal.org/files/projects/drupal-7.31.tar.gz
 _eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=21cc78d449be5f93a8922f50cfaed06c
+_md5_=c5204d627bc4366608cea5b84dfe604a
diff --git a/metadata/md5-cache/www-client/chromium-36.0.1985.143 b/metadata/md5-cache/www-client/chromium-36.0.1985.143
index ac6a3e0316dd..72971bac9daa 100644
--- a/metadata/md5-cache/www-client/chromium-36.0.1985.143
+++ b/metadata/md5-cache/www-client/chromium-36.0.1985.143
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=5
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring kerberos neon 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
+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/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:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= 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/libdrm x11-libs/gtk+:2= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-36.0.1985.143.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-36.0.1985.143-testdata.tar.xz )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	51ad5130f4a69b1a118ca5296de276ae	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=749f742761cfe064bcebfcbcfbb67544
+_md5_=508426c4c216442d7727a71d4d516098
diff --git a/metadata/md5-cache/www-client/chromium-38.0.2107.2 b/metadata/md5-cache/www-client/chromium-38.0.2121.3
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-38.0.2107.2
rename to metadata/md5-cache/www-client/chromium-38.0.2121.3
index e6c874de648f..53e5b7d81e2d 100644
--- a/metadata/md5-cache/www-client/chromium-38.0.2107.2
+++ b/metadata/md5-cache/www-client/chromium-38.0.2121.3
@@ -8,6 +8,6 @@ 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:= ) >=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 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-38.0.2107.2-lite.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-38.0.2121.3-lite.tar.xz
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	51ad5130f4a69b1a118ca5296de276ae	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2dc18c1e4a85065ba3ac5d975becd90d
+_md5_=1b081ae30e9f3ac3023ae4eb0a9a1d13
diff --git a/metadata/md5-cache/www-client/pybugz-0.10.1-r2 b/metadata/md5-cache/www-client/pybugz-0.10.1-r2
index 62f1409b67c6..078a41e5b417 100644
--- a/metadata/md5-cache/www-client/pybugz-0.10.1-r2
+++ b/metadata/md5-cache/www-client/pybugz-0.10.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Command line interface to (Gentoo) Bugzilla
 EAPI=5
 HOMEPAGE=http://www.github.com/williamh/pybugz
 IUSE=zsh-completion python_targets_python2_7 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=zsh-completion? ( app-shells/zsh ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline(+)] ) python_targets_pypy? ( virtual/pypy:0=[readline(+)] ) 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=https://github.com/williamh/pybugz/archive/0.10.1.tar.gz -> pybugz-0.10.1.tar.gz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=8108494228b9c9ef65be51c19d66f643
+_md5_=9a3c8f31a23dc5c2f2676490c9f638a2
diff --git a/metadata/md5-cache/www-client/rekonq-2.4.2-r1 b/metadata/md5-cache/www-client/rekonq-2.4.2-r1
index 32ed34f51d11..bcc440a37c30 100644
--- a/metadata/md5-cache/www-client/rekonq-2.4.2-r1
+++ b/metadata/md5-cache/www-client/rekonq-2.4.2-r1
@@ -6,8 +6,8 @@ HOMEPAGE=http://rekonq.kde.org/
 IUSE=debug kde nepomuk opera linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_ia linguas_it linguas_km linguas_lt linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_sk linguas_sl linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW +handbook aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-base/kdelibs-4.13.1:4[aqua=,nepomuk?] kde? ( >=kde-base/kactivities-4.13.1:4[aqua=] ) nepomuk? ( >=kde-base/nepomuk-core-4.13.1:4[aqua=] dev-libs/soprano ) opera? ( app-crypt/qca:2 dev-libs/qoauth ) >=kde-base/keditbookmarks-4.13.1:4[aqua=] >=kde-base/oxygen-icons-4.13.1:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_lt(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.13.1: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.13.1:4[aqua=]
+RDEPEND=>=kde-base/kdelibs-4.13.1:4[aqua=,nepomuk?] kde? ( >=kde-base/kactivities-4.13.1:4[aqua=] ) nepomuk? ( >=kde-base/nepomuk-core-4.13.1:4[aqua=] dev-libs/soprano ) opera? ( app-crypt/qca:2 dev-libs/qoauth ) >=kde-base/kdebase-kioslaves-4.13.1:4[aqua=] >=kde-base/keditbookmarks-4.13.1:4[aqua=] >=kde-base/oxygen-icons-4.13.1:4[aqua=] linguas_cs? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_et(+)] ) linguas_eu? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_eu(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_fr(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_hu(+)] ) linguas_ia? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_ia(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_it(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_lt(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_pt_BR(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sl(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.13.1:4[aqua=,linguas_zh_TW(+)] ) handbook? ( >=kde-base/kdelibs-4.13.1: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.13.1:4[aqua=]
 SLOT=4
 SRC_URI=mirror://sourceforge/rekonq/rekonq-2.4.2.tar.xz
 _eclasses_=cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	kde4-base	ac5a39cce917ff325551988db062a3d0	kde4-functions	492237eb2823bdc02bc769530501f0ea	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7b8cc63c9edc8ed0e0bb6c7cd26d9deb
+_md5_=2b4236fd4703be50c6b1124f452b5819
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.394 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.394
deleted file mode 100644
index 76808eb962ac..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.394
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test unpack
-DEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) selinux? ( sec-policy/selinux-flash ) app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=5
-HOMEPAGE=http://www.adobe.com/products/flashplayer.html http://get.adobe.com/flashplayer/
-IUSE=debug kde selinux sse2 abi_x86_32 abi_x86_64 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
-LICENSE=AdobeFlash-11.x
-RDEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) selinux? ( sec-policy/selinux-flash ) abi_x86_64? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) abi_x86_32? ( amd64? ( || ( ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) app-emulation/emul-linux-x86-gtklibs ) || ( ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/nspr-4.10.4[abi_x86_32(-)] >=dev-libs/nss-3.15.4[abi_x86_32(-)] ) app-emulation/emul-linux-x86-baselibs ) || ( ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] ) app-emulation/emul-linux-x86-xlibs ) ) x86? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts )
-REQUIRED_USE=sse2 debug? ( abi_x86_32 ) || ( abi_x86_64 abi_x86_32 )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=abi_x86_32? ( !debug? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.394/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.394.i386.tar.gz ) debug? ( http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz -> adobe-flash-11.2.202.394-debug.i386.tar.gz ) ) abi_x86_64? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.394/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.394.x86_64.tar.gz )
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	mozextension	ba6829881080a663d68531424a3dfbc6	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	fbb9baa0b4039304643e36e9820fdecf	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	0f1760274637a138b99bb649202ea402	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7537ae30e677b0cad154f00aeb486322
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.5.2 b/metadata/md5-cache/www-servers/monkeyd-1.5.2
index 1df3cc4c4cde..1755089957e9 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.5.2
+++ b/metadata/md5-cache/www-servers/monkeyd-1.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=A small, fast, and scalable web server
 EAPI=5
 HOMEPAGE=http://www.monkey-project.com/
 IUSE=-debug jemalloc php minimal musl uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=php? ( dev-lang/php )
 REQUIRED_USE=uclibc? ( !debug )
 SLOT=0
 SRC_URI=http://monkey-project.com/releases/1.5/monkey-1.5.2.tar.gz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=98441b94feb3da42ef0ca99bd2697fd5
+_md5_=4f92787b8c1fa251a70e76b57de2eb63
diff --git a/metadata/md5-cache/www-servers/tornado-2.2.1 b/metadata/md5-cache/www-servers/tornado-2.2.1
index d4554c950652..ca14cf215507 100644
--- a/metadata/md5-cache/www-servers/tornado-2.2.1
+++ b/metadata/md5-cache/www-servers/tornado-2.2.1
@@ -9,4 +9,4 @@ RDEPEND=dev-python/pycurl || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-pytho
 SLOT=0
 SRC_URI=http://github.com/downloads/facebook/tornado/tornado-2.2.1.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=d3661e52c45f613b7b760f30ec97ffe5
+_md5_=6927a3cec1564b81e6d87b94f4a3658a
diff --git a/metadata/md5-cache/www-servers/tornado-2.4 b/metadata/md5-cache/www-servers/tornado-2.4
index c1186d0767a0..29474ffbfc56 100644
--- a/metadata/md5-cache/www-servers/tornado-2.4
+++ b/metadata/md5-cache/www-servers/tornado-2.4
@@ -4,10 +4,10 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=3
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl ) || ( dev-lang/python:3.2 dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://github.com/downloads/facebook/tornado/tornado-2.4.tar.gz
 _eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=54ccc2bbd575e7a73ae588444cd0c16a
+_md5_=4b1539e7c754d7283e2b3944fc391295
diff --git a/metadata/md5-cache/www-servers/tornado-2.4-r1 b/metadata/md5-cache/www-servers/tornado-2.4-r1
index 0779fd5927a1..aa89b668ba27 100644
--- a/metadata/md5-cache/www-servers/tornado-2.4-r1
+++ b/metadata/md5-cache/www-servers/tornado-2.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl python_targets_python2_7 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_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=curl? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://github.com/downloads/facebook/tornado/tornado-2.4.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4bd2349c9dc30e7a81f759136d8afc20
+_md5_=d1cecc1643e1d000ff9f911e54880dbb
diff --git a/metadata/md5-cache/www-servers/tornado-2.4.1 b/metadata/md5-cache/www-servers/tornado-2.4.1
index feefaf5a4332..86045da7d8a4 100644
--- a/metadata/md5-cache/www-servers/tornado-2.4.1
+++ b/metadata/md5-cache/www-servers/tornado-2.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl python_targets_python2_7 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_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=curl? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://github.com/downloads/facebook/tornado/tornado-2.4.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8c4b3d37bcb4feefb6f52b37d55ef966
+_md5_=50e5477742249ce258f0c469541e25a3
diff --git a/metadata/md5-cache/www-servers/tornado-3.1.1 b/metadata/md5-cache/www-servers/tornado-3.1.1
index 1d0cd0e82d51..cb93a6ca9eaf 100644
--- a/metadata/md5-cache/www-servers/tornado-3.1.1
+++ b/metadata/md5-cache/www-servers/tornado-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=curl? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-3.1.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=4344754fa671a7a2eba6a49ad5cfd8a2
+_md5_=e2b8fe5ffc5f0e03e3ee8a645f04b897
diff --git a/metadata/md5-cache/www-servers/tornado-3.1.1-r1 b/metadata/md5-cache/www-servers/tornado-3.1.1-r1
index 0408f472f84d..1bac954e1f09 100644
--- a/metadata/md5-cache/www-servers/tornado-3.1.1-r1
+++ b/metadata/md5-cache/www-servers/tornado-3.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=curl? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-3.1.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=fe38d10b148646f1244c728f4214080a
+_md5_=2f0aeaf1936753f0c5d62310b70b9b9a
diff --git a/metadata/md5-cache/www-servers/tornado-3.2 b/metadata/md5-cache/www-servers/tornado-3.2
index a4e3da16ca97..895dbd381cfc 100644
--- a/metadata/md5-cache/www-servers/tornado-3.2
+++ b/metadata/md5-cache/www-servers/tornado-3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
 REQUIRED_USE=curl? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-3.2.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=b56af6e200a617ee1594fba36dbf7a8c
+_md5_=d1e57715f20d4610152a805ba3f742d7
diff --git a/metadata/md5-cache/www-servers/tornado-3.2.1 b/metadata/md5-cache/www-servers/tornado-3.2.1
index 6bad7abddf0b..185e1d7e1d5f 100644
--- a/metadata/md5-cache/www-servers/tornado-3.2.1
+++ b/metadata/md5-cache/www-servers/tornado-3.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable, non-blocking web server and tools
 EAPI=5
 HOMEPAGE=http://www.tornadoweb.org/ http://pypi.python.org/pypi/tornado
 IUSE=curl test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=curl? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=curl? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-3.2.1.tar.gz
 _eclasses_=distutils-r1	d48d51c220f1678179fc4ab13b534ec1	eutils	06133990e861be0fe60c2b428fd025d9	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	c820706d8b22c1d0fe215a9d4a47671d	python-utils-r1	8c66c6dabd0295878b68b40dbd0b087b	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=7184444c61a332e7f016b40889101da5
+_md5_=fa00ff684de4b9be750b4e1db63f1963
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.32 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.32
new file mode 100644
index 000000000000..5eb7ca363442
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.32
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=5
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm kernel_linux
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.4:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( <x11-base/xorg-server-1.16.99 >=x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.32/NVIDIA-FreeBSD-x86_64-340.32.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/340.32/NVIDIA-Linux-x86_64-340.32.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/340.32/NVIDIA-FreeBSD-x86-340.32.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/340.32/NVIDIA-Linux-x86-340.32.run )
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nvidia-driver	800f567ff607d5d5171a8149456e294e	portability	a45c088f246ef5091e029f6285d7ce42	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=eca1789836e5c01f6de719d501be27f4
diff --git a/metadata/md5-cache/x11-misc/colord-1.2.1-r1 b/metadata/md5-cache/x11-misc/colord-1.2.1-r1
index 86c9b05f3304..0a64eb8a44b8 100644
--- a/metadata/md5-cache/x11-misc/colord-1.2.1-r1
+++ b/metadata/md5-cache/x11-misc/colord-1.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
 IUSE=examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.5:2= gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev virtual/libgudev:= virtual/libudev:= ) !media-gfx/shared-color-profiles
 REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-1.2.1.tar.xz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	06133990e861be0fe60c2b428fd025d9	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	d8f392783fdc2395fc64af046f2ca961	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6a89834102056b89a2f4d6068e626336
+_md5_=7752feb35c9ac73fb9a4a20ddb1fbfd4
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.13-r1 b/metadata/md5-cache/x11-misc/x11vnc-0.9.13-r1
index 648817d90364..ae4adbea04b4 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.13-r1
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A VNC server for real X displays
 EAPI=5
 HOMEPAGE=http://www.karlrunge.com/x11vnc/
 IUSE=avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 >=x11-libs/libXtst-1.1.0 x11-libs/libXdamage x11-libs/libXext avahi? ( >=net-dns/avahi-0.6.4 ) ssl? ( dev-libs/openssl ) system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] ) !system-libvncserver? ( zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) ) tk? ( dev-lang/tk ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/libvncserver/x11vnc-0.9.13.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=625af3e6605aa8b3be27dcab0354a282
+_md5_=5a1571269e2e577e4609aae7d46c41c3
diff --git a/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0 b/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0
index af2c99bf82ad..818ddbfb872b 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-latex-1.5.0
@@ -3,10 +3,10 @@ DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=Pidgin plugin that renders latex formulae
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/pidgin-latex/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/latex-base app-text/dvipng
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin-latex/pidgin-latex_1.5.0.tar.bz2
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=57df5f7522c87edd873f45f319db836b
+_md5_=9c8c1ca68242656d750988d8f6c35b71
diff --git a/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.4 b/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.4
index 25669c7411fa..7b5c9f0ee6cf 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.4
+++ b/metadata/md5-cache/x11-plugins/pidgin-opensteamworks-1.4
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/nss gnome-base/libgnome-keyri
 DESCRIPTION=Steam protocol plugin for pidgin
 EAPI=5
 HOMEPAGE=http://code.google.com/p/pidgin-opensteamworks/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/nss gnome-base/libgnome-keyring net-im/pidgin
 SLOT=0
 SRC_URI=http://pidgin-opensteamworks.googlecode.com/files/steam-mobile-1.4.tar.bz2 http://pidgin-opensteamworks.googlecode.com/files/icons.zip -> pidgin-opensteamworks-icons.zip
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=0f400927b2448d191cc3e8882afaec39
+_md5_=7afb6ceab54b028462b4e271b38b864b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 95664ec18182..7632fe052c4c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 13 Aug 2014 13:37:05 +0000
+Thu, 14 Aug 2014 17:37:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5e1cdada767f..61be7005b99c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 13 13:37:02 UTC 2014
+Thu Aug 14 17:37:05 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4ff78f7f58ec..fa6c2e62c929 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 13 Aug 2014 14:00:01 +0000
+Thu, 14 Aug 2014 18:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 27ff494689f9..bf2cbffc8cf5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1407936901 Wed 13 Aug 2014 01:35:01 PM UTC UTC
+1408037701 Thu 14 Aug 2014 05:35:01 PM UTC UTC
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
index 2f7809407ed0..15f77649318d 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild,v 1.5 2014/07/27 19:09:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild,v 1.7 2014/08/14 16:43:47 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -15,10 +15,10 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="dbi doc +graph lua perl python rrdcgi static-libs tcl tcpd"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="dbi doc +graph lua perl python rrdcgi ruby static-libs tcl tcpd"
 
-RDEPEND="
+CDEPEND="
 	>=dev-libs/glib-2.28.7[static-libs(+)?]
 	>=dev-libs/libxml2-2.7.8[static-libs(+)?]
 	dbi? ( dev-db/libdbi[static-libs(+)?] )
@@ -35,11 +35,15 @@ RDEPEND="
 "
 
 DEPEND="
-	${RDEPEND}
+	${CDEPEND}
 	sys-apps/groff
 	virtual/pkgconfig
 	virtual/awk
 "
+RDEPEND="
+	${CDEPEND}
+	ruby? ( dev-ruby/rrdtool-bindings )
+"
 
 python_compile() {
 	cd bindings/python || die 'can not enter to python bindings directory'
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
index e5f007eac5ba..5b8fb3f30142 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild,v 1.1 2014/07/16 13:05:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild,v 1.2 2014/08/14 08:21:30 jer Exp $
 
 EAPI="5"
 
@@ -16,9 +16,9 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="dbi doc graph lua perl python rrdcgi static-libs tcl tcpd"
+IUSE="dbi doc graph lua perl python rrdcgi ruby static-libs tcl tcpd"
 
-RDEPEND="
+CDEPEND="
 	>=dev-libs/glib-2.28.7[static-libs(+)?]
 	>=dev-libs/libxml2-2.7.8[static-libs(+)?]
 	dbi? ( dev-db/libdbi[static-libs(+)?] )
@@ -35,11 +35,15 @@ RDEPEND="
 "
 
 DEPEND="
-	${RDEPEND}
+	${CDEPEND}
 	sys-apps/groff
 	virtual/pkgconfig
 	virtual/awk
 "
+RDEPEND="
+	${CDEPEND}
+	ruby? ( dev-ruby/rrdtool-bindings )
+"
 
 python_compile() {
 	cd bindings/python || die 'can not enter to python bindings directory'
diff --git a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
index d18f12f7b821..427474adf3c1 100644
--- a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
+++ b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch
@@ -17,30 +17,30 @@
 -				gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
 -					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
  				;;
  
  			OpenBSD*)
 -				#gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
 -				gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
 -					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
-+				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a ${LDFLAGS} -o ${SNORTSAM}
++				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
  				;;
  
  			*BSD*)
 -				gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
 -					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
  				;;
  
  			SunOS*)
 -				gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
 -					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
-+					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
  				;;
  		esac
  
@@ -51,30 +51,30 @@
 -				gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
 -					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM}
  				;;
  
  			OpenBSD*)
 -				#gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
 -				gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
 -					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
-+				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a ${LDFLAGS} -o ${SNORTSAM}
++				#${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM}
  				;;
  
  			*BSD*)
 -				gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
 -					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \
-+					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM}
  				;;
  
  			SunOS*)
 -				gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
 -					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
 +				${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \
-+					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM}
++					${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM}
  				;;
  		esac
  		cd ..
@@ -86,10 +86,10 @@
 -			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
 -			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
 -			SunOS)    gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
-+			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS}  ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} $${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
  		esac
  
  		echo "-------------------------------------------------------------------------------"
@@ -101,10 +101,10 @@
 -			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
 -			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
 -			SunOS)    gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;;
-+			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
-+			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${OBSD_LDFLAGS}  ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS}   ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
++			SunOS)    echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;;
  		esac
  		cd ..
  	;;
@@ -116,10 +116,10 @@
 -			OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  -o ${SNORTSAM} ;;
 -			*BSD*)    gcc ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC}   -o ${SNORTSAM} ;;
 -			SunOS*)   gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;;
-+			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
-+			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS}  ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
-+			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC}   ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${BSD_CFLAGS}   ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC}   ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
-+			SunOS*)   echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} ${LDFLAGS} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
++			Linux*)   echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
++			OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS}  ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC}  ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
++			*BSD*)    echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS}   ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
++			SunOS*)   echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC}-o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;;
  		esac
  
 -
diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
index fd82baf81c22..1a5230a0e9bf 100644
--- a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild,v 1.1 2014/07/17 16:52:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild,v 1.2 2014/08/14 16:56:21 phajdan.jr Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -13,7 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/t/${PN}/${MY_P}-4.debian.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="net-libs/libpcap"
 DEPEND="${RDEPEND}"
diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
index f6ba0cddb30e..d72b9532d995 100644
--- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
+++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild,v 1.3 2014/08/01 10:42:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild,v 1.4 2014/08/14 16:58:12 phajdan.jr Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=" ~amd64 ~ppc ~x86"
+KEYWORDS=" ~amd64 ~ppc x86"
 IUSE="X"
 
 DEPEND="X? ( x11-libs/libX11 )"
diff --git a/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r2.ebuild b/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r2.ebuild
index a58e7ff9f789..be7adbbf8b8b 100644
--- a/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r2.ebuild
+++ b/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r2.ebuild,v 1.4 2014/07/06 12:54:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/tahoe-lafs/tahoe-lafs-1.10.0-r2.ebuild,v 1.5 2014/08/14 16:37:40 phajdan.jr Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="http://tahoe-lafs.org/source/tahoe-lafs/releases/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/net-ftp/lftp/lftp-4.5.3.ebuild b/net-ftp/lftp/lftp-4.5.3.ebuild
index 0ad5de534054..04226129ceb9 100644
--- a/net-ftp/lftp/lftp-4.5.3.ebuild
+++ b/net-ftp/lftp/lftp-4.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.3.ebuild,v 1.3 2014/08/01 08:34:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.5.3.ebuild,v 1.4 2014/08/14 17:15:50 phajdan.jr Exp $
 
 EAPI=5
 inherit autotools eutils libtool
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.yar.ru/ftp/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="convert-mozilla-cookies +gnutls nls openssl socks5 +ssl verify-file"
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
diff --git a/net-irc/rbot/rbot-0.9.15_p20131020.ebuild b/net-irc/rbot/rbot-0.9.15_p20131020.ebuild
index 04bcc1ea6e52..c32b61a701bd 100644
--- a/net-irc/rbot/rbot-0.9.15_p20131020.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20131020.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15_p20131020.ebuild,v 1.2 2014/01/18 14:47:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/rbot/rbot-0.9.15_p20131020.ebuild,v 1.3 2014/08/14 14:39:38 mrueg Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19"
 
 inherit ruby-ng eutils user
 
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 2b3469e06f83..ecc3b71a9fff 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,4 +1,4 @@
-DIST libgadu-1.11.0.tar.gz 544803 SHA256 68d4c7c7b0a2ea56b57a99804cb613e4a2834677fed3ddaaca639634da02aa10
+DIST libgadu-1.11.0.tar.gz 544803 SHA256 68d4c7c7b0a2ea56b57a99804cb613e4a2834677fed3ddaaca639634da02aa10 SHA512 be9430e5d292514332127be8999010963c05a6966e067aadaf3efb10aa32d4c9666a3e9c7b44e543179e8754af40aa8d7d121313d808ba8e9306168d1bb963b4 WHIRLPOOL 1b3436ba712af7f4a5460f17370df7fa2038ee0988112dfc3de51b6e8766c8d147690e93e491c0e8489a4e59a4c39aa1fa28eabdac43c855e74d93635f1ea331
 DIST libgadu-1.11.1.tar.gz 548604 SHA256 4293832ef0dd486e37fb3b0c8a19981df7a29d100afc363641b83b59940f594f SHA512 3b2e6f6438068ab734b77ef9c1a57823830fa3e891aa7e324061d08e6f108e2ef3901b5a9444fb56670d65dcfd4c9a2f1324f140b2e560b06bef2cfc3f3fa623 WHIRLPOOL 4e93fa56c25280f972b9079c6185a8942b7425a6d65564f4c3e5dcf9765e22e52561b1f4355ec340d0bc82e12eddc6f19529404c8ecd828385d04f4c287b5f2e
 DIST libgadu-1.11.4.tar.gz 210937 SHA256 95d445a6fefa7b9c7af2f552f090cf6760e3fc7b5c563ec563f11a9fe1f408d5 SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639 WHIRLPOOL 4f13869f871e1a57f9aeccb9530c222960bee515065090a72a141d4a3212493df9007af7494598a26ee86a7e0cde18c8fd1b253024944b71538ca93bc94640f0
 DIST libgadu-1.12.0.tar.gz 290361 SHA256 536862af3beeeb9a3d17bc73c880204200a8aa1e1cbbf97e01486e024b955037 SHA512 62d1db0e0a59ce7e9a27a2002eea26e69b476a5bddeec129ec6e37d6141dc74e51b177a2cacd232031253d19d223f20ae68df1981f1f673485447950a0bc6670 WHIRLPOOL 1d4cf9634dc652368ce79f276f61a48faae7759d874f906c10e0fce24b0ff76542bfa0df632eb715536c5e775352c180422cca94dfcfae9ebb5b85cbc87409c5
diff --git a/net-libs/libgadu/libgadu-1.12.0.ebuild b/net-libs/libgadu/libgadu-1.12.0.ebuild
index 5c32e81e93fa..6a39f732e218 100644
--- a/net-libs/libgadu/libgadu-1.12.0.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.12.0.ebuild,v 1.1 2014/08/13 02:30:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.12.0.ebuild,v 1.3 2014/08/13 23:58:36 jer Exp $
 
 EAPI=5
 
@@ -11,16 +11,16 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm -hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
-IUSE="doc +gg11 gnutls ssl static-libs test threads"
+IUSE="doc gnutls ssl static-libs test threads"
 
 REQUIRED_USE="
 	gnutls? ( ssl )
 "
 COMMON_DEPEND="
+	>=dev-libs/protobuf-c-0.15
 	sys-libs/zlib
-	gg11? ( >=dev-libs/protobuf-c-0.15 )
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( >=dev-libs/openssl-0.9.6m )
@@ -50,7 +50,7 @@ DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
 	local myeconfargs=(
-		$(use_with gg11 protobuf)
+		--with-protobuf
 		$(use_enable test tests)
 		$(use_with threads pthread)
 	)
diff --git a/net-libs/libgadu/metadata.xml b/net-libs/libgadu/metadata.xml
index 1cacbbfed2b5..162be091205d 100644
--- a/net-libs/libgadu/metadata.xml
+++ b/net-libs/libgadu/metadata.xml
@@ -6,7 +6,4 @@
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
 	</maintainer>
-	<use>
-		<flag name="gg11">Enable GaduGadu 11 protocol support</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index a4d68280b541..295441a67971 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.6 2014/07/31 08:18:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.7 2014/08/14 16:59:48 phajdan.jr Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
index 1344097102af..dcbc342b3cd7 100644
--- a/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
+++ b/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild,v 1.6 2014/06/18 14:58:10 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_acct/libnetfilter_acct-1.0.2.ebuild,v 1.7 2014/08/13 16:52:29 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="examples"
 
 RDEPEND="net-libs/libmnl"
diff --git a/net-libs/libnids/libnids-1.24-r5.ebuild b/net-libs/libnids/libnids-1.24-r5.ebuild
index 55ddd7385151..f98c82956e31 100644
--- a/net-libs/libnids/libnids-1.24-r5.ebuild
+++ b/net-libs/libnids/libnids-1.24-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r5.ebuild,v 1.1 2014/04/08 14:02:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.24-r5.ebuild,v 1.2 2014/08/14 17:11:28 phajdan.jr Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+glib +libnet static-libs"
 
 DEPEND="
diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
index ea0cf7b219ab..6b1df75560d4 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.8.ebuild,v 1.4 2014/07/18 15:19:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcapnav/libpcapnav-0.8.ebuild,v 1.5 2014/08/14 17:12:14 phajdan.jr Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-libs/serf/serf-1.3.6.ebuild b/net-libs/serf/serf-1.3.6.ebuild
index c29b7b3f5b51..60a48f88c996 100644
--- a/net-libs/serf/serf-1.3.6.ebuild
+++ b/net-libs/serf/serf-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-1.3.6.ebuild,v 1.3 2014/08/08 14:22:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-1.3.6.ebuild,v 1.4 2014/08/14 17:27:19 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="kerberos"
 
 RDEPEND="dev-libs/apr:1=
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index f58303cd765c..2c0247a57e86 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,4 @@
 DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
 DIST dovecot-2.2-pigeonhole-0.4.3.tar.gz 1184029 SHA256 d692f4ab077bdf2c43c98829ed24b2e6f148db488ef8ba429b430394d8b4d757 SHA512 f2bb83578bb05c7ca2213ecc110f5e7059935746f720ee43897508394f3ab8a7072d193c78caf1fa77df81a20fbbeab1ac14069989250b3032ef459e798c54ff WHIRLPOOL 854d58cdb6b0d51d6e6337a2716858020a1ec22b7da24db903965fc01a00a75af5efcde7c4ddf572c0ee2a36a51bf467da011276f8a4e092463dc76e2622bfbb
-DIST dovecot-2.2.10.tar.gz 4558660 SHA256 75592483d40dc4f76cc3b41af40caa4be80478946a699d46846d5d03e4d2e09b SHA512 862a20d4e8bcfa21fb635a3f27bc689ca5b41dec0ec4984fe0f329a719b87c23341d99c259b6fc912ab3277028a05450c2d197dd7d9748a2e6f39ac5aedfc8bb WHIRLPOOL 4b4257d906fbf3fe0b2d04b5c8f51399dff93e6ee441ac85e36cbd672a9cab23546c442a6c8b05cdb94f1e75cf96269576e15a4a2f4c6bcbdab46b6cec5164aa
-DIST dovecot-2.2.12.tar.gz 4587634 SHA256 f3de1cae5665ff202713c1489bc96b4d029760808bf3311d76c173d7f3e38c56 SHA512 f3d99ae58b05b739c7e8f07cfb5ddd60b7490a1226b319fd693f222ec63d0800c33bd19d12d998e2914b077c1c66f1a4e9150748d850c8fd56b58f0392760271 WHIRLPOOL 8a638f2137a4070573f261f40643c924cca61380cc036b50ca9f4f24d597bf9af563b5f7aee71cc0f3ab974e68dfbc23fa2cea82cd99a20706852f2f0c099ca8
 DIST dovecot-2.2.13.tar.gz 4613824 SHA256 133cf3d2aa81733f6688ec986c91dbe07602fad81e856ba3d8046ffca85d9dce SHA512 1f3c0e600048ac2c1b2e497286620976c0fc821a6cac8e4e1492180af8eb9620cd143c89ee6d12872cecacbcadca573435cce1050c46325de3072c98ab5a9331 WHIRLPOOL 7bb81575faf69820b07d654c469fdd3fcf12c47517bb1dd6ea5566771bb60ce8f9c3a1a7b5c6df6d5f4b903d10472ffa1cca1a01c7fd158b6055794a44aacf39
 DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
diff --git a/net-mail/dovecot/dovecot-2.2.10.ebuild b/net-mail/dovecot/dovecot-2.2.10.ebuild
deleted file mode 100644
index 5a98daca3dc5..000000000000
--- a/net-mail/dovecot/dovecot-2.2.10.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.10.ebuild,v 1.1 2013/12/24 12:49:55 eras Exp $
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.2"
-SRC_URI="http://dovecot.org/releases/${major_minor}/${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_OTHER="bzip2 caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd zlib"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.12.ebuild b/net-mail/dovecot/dovecot-2.2.12.ebuild
deleted file mode 100644
index 5c924ce8bad1..000000000000
--- a/net-mail/dovecot/dovecot-2.2.12.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.12.ebuild,v 1.2 2014/05/10 19:23:06 eras Exp $
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.2"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
diff --git a/net-mail/dovecot/dovecot-2.2.13-r1.ebuild b/net-mail/dovecot/dovecot-2.2.13-r1.ebuild
index 1a3e449e2807..c99ed7c4e839 100644
--- a/net-mail/dovecot/dovecot-2.2.13-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.13-r1.ebuild,v 1.5 2014/08/03 18:19:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.13-r1.ebuild,v 1.6 2014/08/13 21:31:19 blueness Exp $
 
 EAPI=5
 inherit eutils multilib ssl-cert systemd user versionator
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-mail/dovecot/dovecot-2.2.13.ebuild b/net-mail/dovecot/dovecot-2.2.13.ebuild
index 77683b8a6980..926198a85082 100644
--- a/net-mail/dovecot/dovecot-2.2.13.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.13.ebuild,v 1.3 2014/06/08 10:41:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.13.ebuild,v 1.4 2014/08/13 21:31:19 blueness Exp $
 
 EAPI=5
 inherit eutils multilib ssl-cert systemd user versionator
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm ~hppa ia64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-misc/badvpn/badvpn-1.999.129.ebuild b/net-misc/badvpn/badvpn-1.999.129.ebuild
index 5f07146c5012..3dd392c802e4 100644
--- a/net-misc/badvpn/badvpn-1.999.129.ebuild
+++ b/net-misc/badvpn/badvpn-1.999.129.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/badvpn-1.999.129.ebuild,v 1.1 2014/03/20 19:31:11 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/badvpn/badvpn-1.999.129.ebuild,v 1.2 2014/08/14 16:40:34 phajdan.jr Exp $
 
 EAPI=5
 inherit eutils cmake-utils user toolchain-funcs systemd
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/"
 SRC_URI="https://github.com/ambrop72/badvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 SLOT="0"
 TARGETS="+client +ncd +server +tun2socks +udpgw"
 IUSE="${TARGETS} debug"
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild
index 8e69d710ffd8..8389b954e178 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild,v 1.1 2014/05/03 19:51:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r8.ebuild,v 1.2 2014/08/14 16:55:33 phajdan.jr Exp $
 
 EAPI=5
 inherit autotools eutils linux-info user
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mediatomb/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
 
 IUSE="curl debug +exif +ffmpeg flac id3tag +inotify +javascript lastfm
 		libextractor +magic +mp4 mysql +sqlite +taglib thumbnail +zlib"
diff --git a/net-misc/rdesktop/rdesktop-1.8.2.ebuild b/net-misc/rdesktop/rdesktop-1.8.2.ebuild
index 6c718264a204..49986a911ca3 100644
--- a/net-misc/rdesktop/rdesktop-1.8.2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.2.ebuild,v 1.2 2014/08/09 16:37:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.8.2.ebuild,v 1.3 2014/08/14 16:19:54 phajdan.jr 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/wol/wol-0.7.1-r1.ebuild b/net-misc/wol/wol-0.7.1-r1.ebuild
index 4b665bc978f7..452ecee87f9d 100644
--- a/net-misc/wol/wol-0.7.1-r1.ebuild
+++ b/net-misc/wol/wol-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wol/wol-0.7.1-r1.ebuild,v 1.2 2014/07/24 19:28:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wol/wol-0.7.1-r1.ebuild,v 1.3 2014/08/14 16:19:02 phajdan.jr Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="nls"
 
 src_configure() {
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 0d9dbcb8db01..597752a586a6 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.205 2014/08/13 02:28:44 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.206 2014/08/13 19:22:55 ottxor Exp $
 
 # Maciej Mrozowski <reavertm@gentoo.org> (13 Aug 2014)
 # Missing keywords on dev-libs/protobuf-c (bug 519772)
@@ -18,10 +18,6 @@ dev-ruby/tilt test
 # Pulls in ceph which is broken.  Masked per dev-zero.
 sys-block/fio rbd
 
-# Christoph Junghans <ottxor@gentoo.org> (21 Jul 2014)
-# Missing keywords on sci-libs/libcerf (bug 517726)
-sci-visualization/gnuplot libcerf
-
 # Maxim Koltsov <maksbotan@gentoo.org> (9 Jul 2014)
 # Missing keywords on dev-python/rst2pdf, bug #515222
 media-video/mpv doc-pdf
diff --git a/profiles/package.mask b/profiles/package.mask
index cb888f87988f..d415a60e2190 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15965 2014/08/13 02:41:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15967 2014/08/14 09:13:44 eras 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,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Eray Aslan <eras@gentoo.org> (14 Aug 2014)
+# Security mask - bug #509954 until keywording is sorted out
+=net-mail/dovecot-2.2.9
+
+# Sergey Popov <pinkbyte@gentoo.org> (14 Aug 2014)
+# Mask new version of Boost - it's known to cause breakages,
+# according to it's ChangeLog
+~dev-util/boost-build-1.56.0
+~dev-libs/boost-1.56.0
+
 # Tiziano Müller <dev-zero@gentoo.org> (10 Aug 2014)
 # Bundles an old (2.0.0) and vulnerable, but modified version of expat.
 # Testsuite is completely broken and upstream seems to be working on the
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f8b4f71391e1..75bfdd597c0d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1008,6 +1008,7 @@ app-office/scribus:linguas_sk_SK - Language support for sk_SK
 app-office/scribus:linguas_th_TH - Language support for th_TH
 app-office/scribus:minimal - Don't install headers (only required for e.g. plug-in developers)
 app-office/scribus:osg - 3D redering via dev-games/openscenegraph
+app-office/scribus:poppler - Native pdf import
 app-office/scribus:scripts - Install the scripts
 app-office/scribus:templates - Document tamplates
 app-office/scribus:tk - Install tk based scripts e.g. FontSample.py
@@ -2412,7 +2413,6 @@ dev-util/monkeystudio:plugins - Build and install additional plugins
 dev-util/nemiver:memoryview - Enable the optional hexadecimal memory inspection with app-editors/ghex.
 dev-util/nsis:config-log - Enable the logging facility (useful in debugging installers)
 dev-util/nvidia-cuda-sdk:cuda - Build CUDA binaries.
-dev-util/nvidia-cuda-sdk:emulation - Build binaries for device emulation mode. These binaries will not require a CUDA-capable GPU to run.
 dev-util/nvidia-cuda-sdk:opencl - Build OpenCL binaries.
 dev-util/nvidia-cuda-toolkit:debugger - Installs the CUDA debugger.
 dev-util/nvidia-cuda-toolkit:eclipse - Install the dev-util/eclipse-sdk plugins
@@ -5166,7 +5166,6 @@ net-libs/libcrafter:pcap - Use net-libs/libpcap for packet capturing
 net-libs/libeXosip:srv - enable support for SRV records DNS queries
 net-libs/libesmtp:ntlm - Enable support for NTLM authentication
 net-libs/libetpan:liblockfile - Enable support for liblockfile library
-net-libs/libgadu:gg11 - Enable GaduGadu 11 protocol support
 net-libs/libgsasl:gcrypt - Use dev-libs/libgcrypt for low-level crypto
 net-libs/libgsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-libs/libntlm
 net-libs/libinfinity:server - Build and install the server binary including init.d/conf.d-scripts. Needed if you want to host an infinote server for gobby.
diff --git a/sci-calculators/keurocalc/Manifest b/sci-calculators/keurocalc/Manifest
index 96e8feb727fb..e2c736ab579e 100644
--- a/sci-calculators/keurocalc/Manifest
+++ b/sci-calculators/keurocalc/Manifest
@@ -1,3 +1 @@
-DIST keurocalc-1.2.0.tgz 1676515 SHA256 9a7853a51881e82ec2281232b7b4c8c10dbb758b504b98137ad5ff77722636d6 SHA512 2385b4e53748ec56db5bb94cbb115c0b80a18a4b068cfa123f944779d01b83cdca4d4d791a04e3873ca6fbeac53248d7c2c5b2b3c3bf3f57a8cb9112e799e9ab WHIRLPOOL dcb54a884b99b9ba4cf15fbf3a4037f414b0c3b25f41a2a642d6e18cb35fd0e281a6480fa896bf7c3ad17d4c5e39813c028253512427bbc206472e3f3b22762e
-DIST keurocalc-1.2.1.tgz 1813893 SHA256 0b541332c7dc9a416974743c92a3ea2d928c725a8f31ba4180fc1208303cce2c SHA512 df45cc2e60bea540b7429181279ef728890c7bd01fba275035a8cfb79189281740d2027f5aab5264fbcafeaa5979ffac67b433bd0ccedf5ef6ccb67fdeb183e2 WHIRLPOOL bb4327466ee9d165a97d4e1e521d1a782586b6d1f56b1a52ea8b2f583c3a6b5fd06d4ee98a5f2512504e5659187c8f35850633cb675eda7b2790baa85ecbc66e
 DIST keurocalc-1.2.2.tgz 1812899 SHA256 c4cb7cdc11fe8625e220f17a9bee6baef5d330a4f1b38ec013de87402dea6974 SHA512 ec0d78c1bd605ada0c011123502cdcc0685e377fe5e9d8615561d87cb2c25798f93fb18d61cc84b4f4345f8249cffb9c4f1e7914d9b8e47bfe1863be47fc1532 WHIRLPOOL 5ee42509586004bb99d181262a990b86918699429d8a71e3332a68b07c6fad336d183284f3a36dbad0565f63958351fb66744f75a60a8010155a95aebcde2c90
diff --git a/sci-calculators/keurocalc/files/keurocalc-1.2.1-desktopfile.patch b/sci-calculators/keurocalc/files/keurocalc-1.2.1-desktopfile.patch
deleted file mode 100644
index 1a68c8763a6e..000000000000
--- a/sci-calculators/keurocalc/files/keurocalc-1.2.1-desktopfile.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-According to modern desktop entry specifications, keywords
-must be separated by and be terminated with a semicolon.
-
-Additionally, the change is required for modern freedesktop
-consumers to make use of the keywords.
---- keurocalc/keurocalc.desktop
-+++ keurocalc/keurocalc.desktop
-@@ -103,50 +103,50 @@
- Comment[x-test]=xxA currency converter and calculatorxx
- Comment[zh_CN]=一个汇率转换器和计算器
- Comment[zh_TW]=貨幣轉換與計算器
--Keywords=converter,euro,money,cash,calculator
--Keywords[bg]=конвертиране, пари, Евро, калкулатор, обменен, курс, converter, euro, money, cash, calculator
--Keywords[bs]=konvertor,euro,kovac,gotovina,kalkulator
--Keywords[ca]=convertidor,euro,diner,efectiu,calculadora
--Keywords[ca@valencia]=convertidor,euro,diner,efectiu,calculadora
--Keywords[cs]=převod měn,euro,peníze,hotovost,kalkulačka
--Keywords[da]=konvertering,euro,penge,kontanter,lommeregner
--Keywords[de]=converter,euro,geld,bar,rechner,währung,cash
--Keywords[el]=μετατροπέας,euro,χρήματα,λεφτά,υπολογιστής
--Keywords[en_GB]=converter,euro,money,cash,calculator
--Keywords[es]=conversor,euro,dinero,moneda,calculadora
--Keywords[et]=teisendaja,euro,raha,valuuta,kalkulaator
--Keywords[fi]=muunnin,euro,raha,käteinen,laskin
--Keywords[fr]=convertisseur, euro, argent, billet, calculatrice
--Keywords[ga]=tiontaire,euro,eoró,airgead,airgead tirim,áireamhán
--Keywords[gl]=convertedor,euro,divisa,cartos,calculadora
--Keywords[hi]=परिवर्तक, यूरो, पैसा, रुपया, नक़दी, केलकुलेटर, गणक
--Keywords[hne]=बदलइया, यूरो, पैसा, रुपया, नकदी, केलकुलेटर, गनक
--Keywords[hu]=konverter,euro,pénz,cash,kalkulátor
--Keywords[it]=convertitore,euro,soldi,contanti,calcolatore
--Keywords[ja]=換算,ユーロ,通貨,お金,現金,キャッシュ,計算機
--Keywords[km]=កម្មវិធី​បម្លែង អឺរ៉ូ រូបិយបណ្ណ លុយ កម្មវិធី​គណនា
--Keywords[ko]=변환기,유로,돈,계산기,euro
--Keywords[lt]=keitiklis,eurai,pinigai,grynieji,skaičiuotuvas
--Keywords[ml]=മാറ്റപ്പട്ടിക, യൂറോ, പണം, കാശ്, ഗണനി
--Keywords[mr]=परिवर्तक, यूरो, पैसा, रुपया, नकद, गणकयंत्र
--Keywords[nb]=konverterer,euro,valuta,kontanter,kalkulator
--Keywords[nds]=Ümreekner,Euro,Geld,Taschenreekner
--Keywords[nl]=converteren,euro,geld,contanten,rekenmachine
--Keywords[nn]=konvertering,euro,pengar,kontantar,kalkulator
--Keywords[pl]=przekształcanie,euro,pieniądze,waluta,kalkulator,konwerter
--Keywords[pt]=conversor,euro,dinheiro,calculadora
--Keywords[pt_BR]=conversor,euro,dinheiro,calculadora
--Keywords[ro]=convertor,euro,bani,calculator,valută
--Keywords[ru]=converter,euro,money,cash,calculator,деньги,калькулятор,евро
--Keywords[sk]=konvertor,euto,peniaze,hotovosť,kalkulačka
--Keywords[sl]=pretvornik,evro,euro,denar,računalo
--Keywords[sr]=converter,euro,money,cash,calculator,мењач,евро,новац,кеш,калкулатор
--Keywords[sr@ijekavian]=converter,euro,money,cash,calculator,мењач,евро,новац,кеш,калкулатор
--Keywords[sr@ijekavianlatin]=converter,euro,money,cash,calculator,menjač,evro,novac,keš,kalkulator
--Keywords[sr@latin]=converter,euro,money,cash,calculator,menjač,evro,novac,keš,kalkulator
--Keywords[sv]=konvertering,euro,valuta,kontanter,räknare
--Keywords[tr]=dönüştürücü,avro,para,nakit,hesaplayıcı
--Keywords[uk]=перетворювач,євро,гроші,готівка,калькулятор
--Keywords[x-test]=xxconverter,euro,money,cash,calculatorxx
--Keywords[zh_CN]=converter,euro,money,cash,calculator,转换器,欧元,钱,现金,计算器
--Keywords[zh_TW]=converter,euro,money,cash,calculator
-+Keywords=converter;euro;money;cash;calculator;
-+Keywords[bg]=конвертиране; пари; Евро; калкулатор; обменен; курс; converter; euro; money; cash; calculator;
-+Keywords[bs]=konvertor;euro;kovac;gotovina;kalkulator;
-+Keywords[ca]=convertidor;euro;diner;efectiu;calculadora;
-+Keywords[ca@valencia]=convertidor;euro;diner;efectiu;calculadora;
-+Keywords[cs]=převod měn;euro;peníze;hotovost;kalkulačka;
-+Keywords[da]=konvertering;euro;penge;kontanter;lommeregner;
-+Keywords[de]=converter;euro;geld;bar;rechner;währung;cash;
-+Keywords[el]=μετατροπέας;euro;χρήματα;λεφτά;υπολογιστής;
-+Keywords[en_GB]=converter;euro;money;cash;calculator;
-+Keywords[es]=conversor;euro;dinero;moneda;calculadora;
-+Keywords[et]=teisendaja;euro;raha;valuuta;kalkulaator;
-+Keywords[fi]=muunnin;euro;raha;käteinen;laskin;
-+Keywords[fr]=convertisseur; euro; argent; billet; calculatrice;
-+Keywords[ga]=tiontaire;euro;eoró;airgead;airgead tirim;áireamhán;
-+Keywords[gl]=convertedor;euro;divisa;cartos;calculadora;
-+Keywords[hi]=परिवर्तक; यूरो; पैसा; रुपया; नक़दी; केलकुलेटर; गणक;
-+Keywords[hne]=बदलइया; यूरो; पैसा; रुपया; नकदी; केलकुलेटर; गनक;
-+Keywords[hu]=konverter;euro;pénz;cash;kalkulátor;
-+Keywords[it]=convertitore;euro;soldi;contanti;calcolatore;
-+Keywords[ja]=換算;ユーロ;通貨;お金;現金;キャッシュ;計算機;
-+Keywords[km]=កម្មវិធី​បម្លែង អឺរ៉ូ រូបិយបណ្ណ លុយ កម្មវិធី​គណនា;
-+Keywords[ko]=변환기;유로;돈;계산기;euro;
-+Keywords[lt]=keitiklis;eurai;pinigai;grynieji;skaičiuotuvas;
-+Keywords[ml]=മാറ്റപ്പട്ടിക; യൂറോ; പണം; കാശ്; ഗണനി;
-+Keywords[mr]=परिवर्तक; यूरो; पैसा; रुपया; नकद; गणकयंत्र;
-+Keywords[nb]=konverterer;euro;valuta;kontanter;kalkulator;
-+Keywords[nds]=Ümreekner;Euro;Geld;Taschenreekner;
-+Keywords[nl]=converteren;euro;geld;contanten;rekenmachine;
-+Keywords[nn]=konvertering;euro;pengar;kontantar;kalkulator;
-+Keywords[pl]=przekształcanie;euro;pieniądze;waluta;kalkulator;konwerter;
-+Keywords[pt]=conversor;euro;dinheiro;calculadora;
-+Keywords[pt_BR]=conversor;euro;dinheiro;calculadora;
-+Keywords[ro]=convertor;euro;bani;calculator;valută;
-+Keywords[ru]=converter;euro;money;cash;calculator;деньги;калькулятор;евро;
-+Keywords[sk]=konvertor;euto;peniaze;hotovosť;kalkulačka;
-+Keywords[sl]=pretvornik;evro;euro;denar;računalo;
-+Keywords[sr]=converter;euro;money;cash;calculator;мењач;евро;новац;кеш;калкулатор;
-+Keywords[sr@ijekavian]=converter;euro;money;cash;calculator;мењач;евро;новац;кеш;калкулатор;
-+Keywords[sr@ijekavianlatin]=converter;euro;money;cash;calculator;menjač;evro;novac;keš;kalkulator;
-+Keywords[sr@latin]=converter;euro;money;cash;calculator;menjač;evro;novac;keš;kalkulator;
-+Keywords[sv]=konvertering;euro;valuta;kontanter;räknare;
-+Keywords[tr]=dönüştürücü;avro;para;nakit;hesaplayıcı;
-+Keywords[uk]=перетворювач;євро;гроші;готівка;калькулятор;
-+Keywords[x-test]=xxconverter;euro;money;cash;calculatorxx;
-+Keywords[zh_CN]=converter;euro;money;cash;calculator;转换器;欧元;钱;现金;计算器;
-+Keywords[zh_TW]=converter;euro;money;cash;calculator;
diff --git a/sci-calculators/keurocalc/files/keurocalc-1.2.1-handbookdir.patch b/sci-calculators/keurocalc/files/keurocalc-1.2.1-handbookdir.patch
deleted file mode 100644
index a81055dbc9b0..000000000000
--- a/sci-calculators/keurocalc/files/keurocalc-1.2.1-handbookdir.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Install handbook to a package-specific subdirectory.
---- doc/en/CMakeLists.txt
-+++ doc/en/CMakeLists.txt
-@@ -1,3 +1,3 @@
- ########### install files ###############
- #
--kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
-+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR keurocalc)
diff --git a/sci-calculators/keurocalc/keurocalc-1.2.0.ebuild b/sci-calculators/keurocalc/keurocalc-1.2.0.ebuild
deleted file mode 100644
index 884ed6ee0228..000000000000
--- a/sci-calculators/keurocalc/keurocalc-1.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/keurocalc/keurocalc-1.2.0.ebuild,v 1.3 2013/06/11 15:53:19 ago Exp $
-
-EAPI=4
-KDE_LINGUAS="ar bg bs ca ca@valencia cs da de el en_GB es et fr ga gl hu it ja
-ka ko nb nds nl pl pt pt_BR ru sk sr sr@Latn sv ta tr uk zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A universal currency converter and calculator"
-HOMEPAGE="http://opensource.bureau-cornavin.com/keurocalc/index.html"
-SRC_URI="http://opensource.bureau-cornavin.com/keurocalc/sources/${P}.tgz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DOCS=( AUTHORS ChangeLog README TODO )
diff --git a/sci-calculators/keurocalc/keurocalc-1.2.1.ebuild b/sci-calculators/keurocalc/keurocalc-1.2.1.ebuild
deleted file mode 100644
index a0faed7b9ee8..000000000000
--- a/sci-calculators/keurocalc/keurocalc-1.2.1.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/sci-calculators/keurocalc/keurocalc-1.2.1.ebuild,v 1.2 2014/02/07 16:00:16 kensington Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB es et fi fr ga gl hu it
-ja ko nb nds nl pl pt pt_BR ru sk sl sr sr@Latn sv tr ug uk zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A universal currency converter and calculator"
-HOMEPAGE="http://opensource.bureau-cornavin.com/keurocalc/index.html"
-SRC_URI="http://opensource.bureau-cornavin.com/keurocalc/sources/${P}.tgz"
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-PATCHES=(
-	"${FILESDIR}/${P}-desktopfile.patch"
-	"${FILESDIR}/${P}-handbookdir.patch"
-)
-DOCS=( AUTHORS TODO )
-
-src_prepare() {
-	# bug 500560
-	sed -e "s/PO_FILES //" -i po/*/CMakeLists.txt
-
-	kde4-base_src_prepare
-}
diff --git a/sci-calculators/keurocalc/keurocalc-1.2.2.ebuild b/sci-calculators/keurocalc/keurocalc-1.2.2.ebuild
index 509baae72c09..8b0183d10a66 100644
--- a/sci-calculators/keurocalc/keurocalc-1.2.2.ebuild
+++ b/sci-calculators/keurocalc/keurocalc-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/keurocalc/keurocalc-1.2.2.ebuild,v 1.3 2014/08/08 19:39:02 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/keurocalc/keurocalc-1.2.2.ebuild,v 1.4 2014/08/13 15:37:21 nativemad Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://opensource.bureau-cornavin.com/keurocalc/sources/${P}.tgz"
 
 LICENSE="GPL-2+ FDL-1.2"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DOCS=( AUTHORS TODO )
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
index 9098926397c5..09c698279358 100644
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
+++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild,v 1.1 2014/07/22 09:51:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild,v 1.2 2014/08/13 14:32:58 nativemad Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
 SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="pymol"
 IUSE=""
 
diff --git a/sci-chemistry/pymol/pymol-1.7.0.1.ebuild b/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
index a6a1294cfea1..e3fc856c6b8b 100644
--- a/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.7.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.7.0.1.ebuild,v 1.3 2014/07/10 09:29:47 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.7.0.1.ebuild,v 1.4 2014/08/13 14:34:38 nativemad Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="PSF-2.2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="apbs web"
 
 DEPEND="
diff --git a/sci-electronics/xnec2c/xnec2c-2.8.ebuild b/sci-electronics/xnec2c/xnec2c-2.8.ebuild
index 94b6dfc40c99..51ec4bba4bbd 100644
--- a/sci-electronics/xnec2c/xnec2c-2.8.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xnec2c/xnec2c-2.8.ebuild,v 1.2 2014/08/10 20:29:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xnec2c/xnec2c-2.8.ebuild,v 1.3 2014/08/14 17:19:51 phajdan.jr Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sci-libs/levmar/metadata.xml b/sci-libs/levmar/metadata.xml
index de46a53040da..b0078f29f202 100644
--- a/sci-libs/levmar/metadata.xml
+++ b/sci-libs/levmar/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>3dprint</herd>
 <maintainer>
 	<email>amynka@gentoo.org</email>
 </maintainer>
diff --git a/sci-libs/libcerf/libcerf-1.3.ebuild b/sci-libs/libcerf/libcerf-1.3.ebuild
index 04961bc3dd7f..c852ee334962 100644
--- a/sci-libs/libcerf/libcerf-1.3.ebuild
+++ b/sci-libs/libcerf/libcerf-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcerf/libcerf-1.3.ebuild,v 1.5 2014/07/27 09:32:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcerf/libcerf-1.3.ebuild,v 1.6 2014/08/13 17:59:17 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 DEPEND=""
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
index 03470f94b822..d4da733012b1 100644
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.4-r1.ebuild,v 1.2 2014/08/01 15:06:15 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/flint/flint-2.4.4-r1.ebuild,v 1.3 2014/08/14 16:22:26 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.flintlib.org/${P}.tar.gz"
 RESTRICT="mirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gc ntl static-libs test"
 
 RDEPEND="dev-libs/gmp
diff --git a/sci-mathematics/normaliz/normaliz-2.10.1.ebuild b/sci-mathematics/normaliz/normaliz-2.10.1.ebuild
index 9b394950820d..d73198382dcf 100644
--- a/sci-mathematics/normaliz/normaliz-2.10.1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.10.1.ebuild,v 1.3 2014/06/09 09:56:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.10.1.ebuild,v 1.4 2014/08/14 17:23:47 phajdan.jr Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.mathematik.uni-osnabrueck.de/${PN}/${MYP}/${MYP}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="extras openmp"
 
 RDEPEND="dev-libs/gmp[cxx]"
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
index 5c247a3447b1..dc124383ba32 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild,v 1.4 2014/07/17 12:08:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild,v 1.5 2014/08/14 16:47:44 phajdan.jr Exp $
 
 EAPI=4
 inherit gnome2-utils
@@ -12,7 +12,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2
 
 LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 COMMON_DEPEND="dev-cpp/gtkmm:2.4
diff --git a/sys-apps/hdparm/hdparm-9.43.ebuild b/sys-apps/hdparm/hdparm-9.43.ebuild
index 225a1f6aa984..f175ec4390a5 100644
--- a/sys-apps/hdparm/hdparm-9.43.ebuild
+++ b/sys-apps/hdparm/hdparm-9.43.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.43.ebuild,v 1.2 2013/02/17 23:10:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.43.ebuild,v 1.3 2014/08/14 12:55:25 vapier Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Utility to change hard drive performance parameters"
 HOMEPAGE="http://sourceforge.net/projects/hdparm/"
@@ -13,9 +13,10 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
+IUSE="static"
 
 src_prepare() {
+	use static && append-ldflags -static
 	sed -i \
 		-e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
 		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest
index bb1ad10b7dba..c474c0cc68aa 100644
--- a/sys-apps/input-utils/Manifest
+++ b/sys-apps/input-utils/Manifest
@@ -1,5 +1,6 @@
-DIST input-20050727-141704.tar.gz 27926 SHA256 3038921acc038d0090d550fa13486f5a6a74e13ded48596904d2f14767777148
-DIST input-20051128-143821.tar.gz 28010 SHA256 9bdfe6bf6eb54255aa3ba2d4b9de3e4ff54ad0f8775cdae97c35577634a6b239
+DIST input-1.1.tar.gz 21652 SHA256 544636fb0d468cae7de502f7b973a54a3195073328b235b906bd21298694b65b SHA512 dfb89bfdb956fbd80134606e3deda8fbd7d5679513e882ac169adb4f547980dcdec56db4c992f7dda4036c0dbbb4bec0468262893d3c5253de9d3a8b909d81cc WHIRLPOOL a571f9516f9554c7e1c039ef7fc1727fe2cd9dea2a2539fc514ffc80c09d6c34d060783581112b5401229ac5a1518985b6ca4a0bcccaef3fc97ec13b05e1e457
+DIST input-20050727-141704.tar.gz 27926 SHA256 3038921acc038d0090d550fa13486f5a6a74e13ded48596904d2f14767777148 SHA512 16b8367e865dc7927feed7e063b2b5e17b3d4ddb4f6764a4ebde3a88d0a43ce1e25ab0914152b36cbff0df7d64bb0f5ca8521329a1f7f49b59abc84663e56f08 WHIRLPOOL 63288990e68e7308b7193881be1024937b752f53fa374f8e2b665af8788d3810c86bf5e7cb2d5b7d65ca70b363bf3b1ef97df96bbd28bc6a13b521ed8f9a31ca
+DIST input-20051128-143821.tar.gz 28010 SHA256 9bdfe6bf6eb54255aa3ba2d4b9de3e4ff54ad0f8775cdae97c35577634a6b239 SHA512 76ea44c79aa5a14f7ae9f5496c5d840f595d0094f6b0083ccc3a016a391e6f86d8252041a21aabdeefff1640db25a7763fc2aeaaf7a3d74460523be1a9155071 WHIRLPOOL 76b152e460365044ac8af64da0dafc287e589e24f06deda06c780c3176943059a3700518774fae7d9534ad77acc84a92188f1b2d176aafdbcc574619ca3ee2b4
 DIST input-20081014-101501.tar.gz 33797 SHA256 185f31f5776bd81be28ae7984d6d2812420858bed8f6ebfbfeaaa7d6ca62b0e5 SHA512 24ad3b5077b0e32b0ed6d28e84c27089091468d1379645f862c66a1987f079765c5aed850542b3bcec25f6254b681991119332a5b024ff04dd3dbd72e3ae3450 WHIRLPOOL e4daac596d81d5a71c829935d6185bc857a4d1d7971d97a6fc9d3b633f9ceeaf8e269b3fe783f948e0e426c5c2a4fd669b861689dd0d2cfeee32b38aaf3012c8
-DIST input-utils_0.0.20051128-1.diff.gz 2911 SHA256 25802ba7e3df533a0bc35101362700a953a4f69a696356e54f5982a599f3020d
-DIST input-utils_0.0.20051128-4.diff.gz 3850 SHA256 82068b6dc6f75c2551785174d81f138f6757448fd7c40d86faf3f1f317ccc16e
+DIST input-utils_0.0.20051128-1.diff.gz 2911 SHA256 25802ba7e3df533a0bc35101362700a953a4f69a696356e54f5982a599f3020d SHA512 c85a49d2ffc83dcf02ce742f6ae44b1e05191f21cab0197ca0b7b912a44621dc4a42eea5c5145fc1bac5a3ff9992ae41abcc3b7afff84c5bf8cc15ccd5d89f9a WHIRLPOOL be71b159e1313964d776bbbaff25cb3e3f05bba26c04b059830c6d5f5b8c03c5f3c68cd70b89f3410e9b8828ae8bb192fbc4726fff16bfeed400afc006265003
+DIST input-utils_0.0.20051128-4.diff.gz 3850 SHA256 82068b6dc6f75c2551785174d81f138f6757448fd7c40d86faf3f1f317ccc16e SHA512 4e79074fae92eceaea36539a3c8446e964cae895a2fbc89bee09a2b0b37b47114ec27157f60223555a3d9b663c13bfd0b410f546056cbc59b9424f144689e9cc WHIRLPOOL 77fa83ae131b5d27f96ed13910e0d004fa5468d13fc428cd65368b293693937c6debf8bf26999f3d765004446cec48321f154f1b0b79b598af26b51caf2f7536
diff --git a/sys-apps/input-utils/input-utils-1.1.ebuild b/sys-apps/input-utils/input-utils-1.1.ebuild
new file mode 100644
index 000000000000..1ca5c66515c0
--- /dev/null
+++ b/sys-apps/input-utils/input-utils-1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/input-utils/input-utils-1.1.ebuild,v 1.1 2014/08/13 17:31:09 robbat2 Exp $
+
+EAPI=4
+inherit eutils
+
+MY_PN="input"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Small collection of linux input layer utils"
+HOMEPAGE="https://www.kraxel.org/blog/linux/input/"
+SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Ported from Debian
+	#epatch "${FILESDIR}"/input-utils-0.0.1_pre20081014.patch
+	# version check stuff
+	#epatch "${FILESDIR}"/input-utils-0.0.1-protocol-mismatch-fix.patch
+	:
+}
+
+src_install() {
+	make install bindir="${D}"/usr/bin mandir="${D}"/usr/share/man STRIP="" || die "make install failed"
+	dodoc lircd.conf
+	dodoc README
+}
diff --git a/sys-apps/microcode-data/microcode-data-20140430.ebuild b/sys-apps/microcode-data/microcode-data-20140430.ebuild
index 4b43cd6cbcff..0310e6fe6ed3 100644
--- a/sys-apps/microcode-data/microcode-data-20140430.ebuild
+++ b/sys-apps/microcode-data/microcode-data-20140430.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-data/microcode-data-20140430.ebuild,v 1.2 2014/08/11 11:46:42 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/microcode-data/microcode-data-20140430.ebuild,v 1.3 2014/08/14 16:15:00 phajdan.jr Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
 
 LICENSE="intel-ucode"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
diff --git a/sys-apps/razercfg/razercfg-0.23.ebuild b/sys-apps/razercfg/razercfg-0.23.ebuild
index 1c46f62bc679..bea7da232e6c 100644
--- a/sys-apps/razercfg/razercfg-0.23.ebuild
+++ b/sys-apps/razercfg/razercfg-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/razercfg/razercfg-0.23.ebuild,v 1.1 2014/02/23 22:04:05 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/razercfg/razercfg-0.23.ebuild,v 1.2 2014/08/14 16:53:37 phajdan.jr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://bues.ch/cms/hacking/razercfg.html"
 SRC_URI="http://bues.ch/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+pm-utils qt4"
 
 RDEPEND="${DEPEND}
diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
index 5bf4e3a2f3f4..4ad83f885de2 100644
--- a/sys-auth/consolekit/consolekit-0.4.6.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.16 2014/08/13 12:24:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.6.ebuild,v 1.17 2014/08/14 08:47:40 jer Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam systemd
@@ -15,7 +15,7 @@ SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="acl debug doc kernel_linux pam policykit selinux systemd-units test"
 
 # TODO: Cleanup the || () hack later, like end of the year:
diff --git a/sys-auth/polkit/polkit-0.112-r1.ebuild b/sys-auth/polkit/polkit-0.112-r1.ebuild
index eb0c8fb2b5e5..5fa08c76ed8e 100644
--- a/sys-auth/polkit/polkit-0.112-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.112-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r1.ebuild,v 1.12 2014/05/17 15:31:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r1.ebuild,v 1.14 2014/08/14 14:14:06 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -11,12 +11,14 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="examples gtk +introspection kde nls pam selinux systemd"
 
-RDEPEND="ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
+RDEPEND="
+	ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
+	hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
 	mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	!ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) )
+	!hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) ) )
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2:=
 	introspection? ( >=dev-libs/gobject-introspection-1 )
@@ -68,7 +70,7 @@ src_configure() {
 		$(use_enable introspection) \
 		--disable-examples \
 		$(use_enable nls) \
-		$(if use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
+		$(if use hppa || use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
@@ -81,7 +83,8 @@ src_compile() {
 	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
 	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
 	local m='m'
-	# ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	# hppa, ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	use hppa && m='mr'
 	use ia64 && m='mr'
 	use mips && m='mr'
 	pax-mark ${m} ${f}
diff --git a/sys-auth/polkit/polkit-0.112-r2.ebuild b/sys-auth/polkit/polkit-0.112-r2.ebuild
index e3c6bda390d2..38163c95538e 100644
--- a/sys-auth/polkit/polkit-0.112-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.112-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.3 2014/08/13 12:24:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.4 2014/08/14 14:14:06 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -70,7 +70,7 @@ src_configure() {
 		$(use_enable introspection) \
 		--disable-examples \
 		$(use_enable nls) \
-		$(if use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
+		$(if use hppa || use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
 		"$(systemd_with_unitdir)" \
 		--with-authfw=$(usex pam pam shadow) \
 		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
@@ -85,7 +85,8 @@ src_compile() {
 	local m=''
 	# Only used when USE="jit" is enabled for 'dev-lang/spidermonkey:17' wrt #485910
 	has_version 'dev-lang/spidermonkey:17[jit]' && m='m'
-	# ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	# hppa, ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
+	use hppa && m='mr'
 	use ia64 && m='mr'
 	use mips && m='mr'
 	pax-mark ${m} ${f}
diff --git a/sys-boot/unetbootin/unetbootin-608.ebuild b/sys-boot/unetbootin/unetbootin-608.ebuild
index 8b6e22df2ffd..fabf88874776 100644
--- a/sys-boot/unetbootin/unetbootin-608.ebuild
+++ b/sys-boot/unetbootin/unetbootin-608.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-608.ebuild,v 1.1 2014/06/05 21:24:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-608.ebuild,v 1.2 2014/08/14 16:50:06 phajdan.jr Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 UNBI_LINGUAS="
diff --git a/sys-cluster/vzctl/vzctl-4.7.2.ebuild b/sys-cluster/vzctl/vzctl-4.7.2.ebuild
index fb3987014016..c1ed68a158f0 100644
--- a/sys-cluster/vzctl/vzctl-4.7.2.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.7.2.ebuild,v 1.3 2014/07/30 19:27:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.7.2.ebuild,v 1.4 2014/08/14 17:07:31 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc64 -amd64-fbsd -x86-fbsd -sparc-fbsd"
+KEYWORDS="~amd64 ~ppc64 x86 -amd64-fbsd -sparc-fbsd -x86-fbsd"
 IUSE="+ploop +vz-kernel +vzmigrate"
 
 RDEPEND="net-firewall/iptables
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 0c9bc3c154de..4453283c1293 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,5 +1,7 @@
 DIST LVM2.2.02.88.tgz 1029151 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b WHIRLPOOL b30a1f2403e71ff6fb381ec82291018632e1d10258dd615efae4e39077a304a66271013247793390f57c26886599d8bad8f4b896d230f3e4f846e74c12282f71
 DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420
+DIST config.amd64 115573 SHA256 13c96b71e4738e82045f9f84be0476e2b91de5c6a4955337830792091cc26dcd SHA512 a071517894e8f6b1a0e55b8293ccdc524377de1e7b96fb12dd7f822e881beebd8a131648980197c28278aa638ea05fa2ebb47f6675fabd42d1d03eb7c8bc90b5 WHIRLPOOL 30fd90ff32b7606215cae6c26db509a8ea25a7033fa0f7b7dc9f292dc4a4bbf30f022d65c24806269ee1e53116736477b6908d31d400550715a62876095f348e
+DIST config.x86 116495 SHA256 2fb23e7f82c1339980ba1a1e78407b55b25705bbf9602e794fc4094a054f8c19 SHA512 cac6d1b72da85d251ef8dd915b0c5d8123c56de62aad893d9a7dbf6190b6a8d721467934a1fd819ba6bfad83b83245b419050f04d9b07198c6a5510d18e30cb5 WHIRLPOOL d8e69687c8e53f9e2082c9b6fe7e6559395a69a58374f40443ee2c579d9011f6734d978457f31bd4a60c112c6e12ed37fd71563e534d4ed1b4961af60045d5aa
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 SHA256 93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e WHIRLPOOL 87915ea0013766da8a9722b437bfe146b4b2c7560a7814ac6caab92054ddc3b4b59ceb4d413609d5eaab92b5cee67886ade7924455f1dba19f1b8dabc25d3498
 DIST fuse-2.8.6.tar.gz 505334 SHA256 1ec1913e38f09b2a9ec1579e1800805b5e2c747d1dce515e316dbb665ca139d6 SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd WHIRLPOOL 668c01f5ae9742f3e70248d6d2b57cbeaa0decf93d5f7987550fe54d4ebdb6e445ff841e8d36a60a4824c114651b8a93b118e15b8a00ac30ddc813e583fa2b51
 DIST genkernel-3.4.45.1.tar.bz2 265391 SHA256 8285aff3b27a56a2bbb9c8d91d8c8332f8fc15df7eb892f618859a5a74f92981 SHA512 4333cb4d2eceb8d25bd7e86c0a9cc11576926eceabed9e00a52ab6e3b341a8beb0c83e61bf1ffb5e865956d54be145f971a89a992496837f539def449efde3a4 WHIRLPOOL 3e9d94e7e6a3836ee327cb53eef746904eb2a146375508ca3f5cf25dfcb2ee98e7b23dd21aae3d3bd370630354a4ea86e2c0e50d3394b61ca82b4e63b3c99676
diff --git a/sys-kernel/genkernel/genkernel-3.4.51.1-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.51.1-r1.ebuild
new file mode 100644
index 000000000000..b8e1cc2bd0eb
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.51.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.51.1-r1.ebuild,v 1.1 2014/08/14 04:06:41 patrick Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="5"
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://packages.gentooexperimental.org/genkernel/config.amd64
+		http://packages.gentooexperimental.org/genkernel/config.x86
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="crypt cryptsetup ibm selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+		cryptsetup? ( sys-fs/cryptsetup )
+		app-arch/cpio
+		>=app-misc/pax-utils-0.2.1
+		!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	epatch_user
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
+
+	doman genkernel.8 || die "doman"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+	dobin genkernel || die "dobin genkernel"
+
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/* || die "doins"
+	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+		cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
+
+	# Copy files to /var/cache/genkernel/src
+	GKDISTDIR=/usr/share/genkernel/distfiles/
+	elog "Copying files to ${GKDISTDIR}..."
+	insinto $GKDISTDIR
+	doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
+	doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
+	doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
+	doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
+	doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
+	doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+	doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
+	doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	# inject new kernel configs
+	cp "${DISTDIR}/config.x86" "${D}/usr/share/genkernel/arch/x86/kernel-config" || die
+	cp "${DISTDIR}/config.amd64" "${D}/usr/share/genkernel/arch/x86_64/kernel-config" || die
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
+	ewarn "even reiser3."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+	if use crypt && ! use cryptsetup ; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index b54bc99f1993..b867150ec1da 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -30,6 +30,9 @@ DIST genpatches-3.10-59.extras.tar.xz 17820 SHA256 2e0c88954e85318d2a8f36e42406f
 DIST genpatches-3.10-60.base.tar.xz 888480 SHA256 c9daed7d4b64b125a12ecc103976043c225dfa23bcb8c9c8c9b57de8783f9a2b SHA512 0f05dedbae699a0d94efa13c2de5483ecfdad75fbc8211351fa0767ecca37e1bc08f261f7426ef207927c0dc4ac48694e431c62075479cf222896026301b5e15 WHIRLPOOL dffec3c238d9dbc94b2c1d2bf211536b8f91cd0f65ad8832b1fa512caf7456e2f11130bc994ac0a42524db52024416fa9114dc0767797dea0fa8e701c52ca784
 DIST genpatches-3.10-60.experimental.tar.xz 48608 SHA256 8141a2633b331fe4bfecbee08807c5439243599d186b79ebd5be63110a58dd4f SHA512 70c4efffac1288e374e4cb7fa6498ce991dd4aeb7268c43cd40e3a830491d4a1a021465593b98dfc115063222751ecc3097445cbcaf4c61e5c7ad20fca79767d WHIRLPOOL 933f6fc7c46d7fe616c9c04816de4e5d00626c734bb0189aaa250f610a7befa0e9973c78a5e8267ef7692c96918218f663dd352ce742720fb3687eb3044a7f68
 DIST genpatches-3.10-60.extras.tar.xz 17824 SHA256 9f4e56e0654737c9293c3e48df35aba3ec92dc47441dc4f9d5d2430531669e94 SHA512 22341fbc752e68034676c55172148cc6d9ae9d22aafa2c0da23fc6231e5c91ab9af5fe1763b845d66ff9fde861adcc20219998254b039e5a6b6b9a145eb2cccb WHIRLPOOL 38496c9e915dea6995897b124f5e39182597c29be20f15551f09c7d9d6039269e0aa074cb48b07a5a53e2f9cf3e9d89facd8b7f2c5510194a320638890f80d6f
+DIST genpatches-3.10-61.base.tar.xz 896280 SHA256 1f03a01644fc2d6bda67b1c9f1b607e32e335b196a2ba7b4532d2f712d9677f1 SHA512 87d37693721adc748322726915c353b1fcf7b8e4d401c0b1d7292d72931be7c6473f5e688f78c5c3108aa396b26d7b8b8795b3f54bab7c3bc2e906d32ca63c01 WHIRLPOOL be732c223df496e56884dc3c50d4bcec8ad8c63e2e4fa6c990b1827c5c43bb15b051e31afc559b07a9b709af73dcc302571c26346b1c06f0ff8c1c46663c80fe
+DIST genpatches-3.10-61.experimental.tar.xz 48584 SHA256 73b369ef8ea090e769adb0591994294e54bb22fa8bfda3aaa8d332205b56884b SHA512 4967c09ab077d292ce7966f014bbdeb579925afbedfeec71c08595fbba4690145e8bc25d73fda1f9a87893b180d43c203964d387657362689dc2f37d4f6446b0 WHIRLPOOL 39e78240a230c4dab9efb8ce3203cea2e50cb9ff2551f0e23deb29cb5bca1d8832d793f1645847ed031ff5baa7fb297dc8a0369715ddbb7c884d0637588f6744
+DIST genpatches-3.10-61.extras.tar.xz 17820 SHA256 0d2723a5b9db64aef9dc9b397bbb2830e1b0d56bc631272e914f01eabafa99a3 SHA512 5a96a28409fcb4b0eae1dca936b9534cd36c762304189def162ee4dabba86117015a3dbf8cd0bf3d9b9c88a38368b2c370fbc93abdce12a9bc22e0423c89fcf6 WHIRLPOOL dacdcd8d628d7f3889314e0f16e164c9aa18dc102dec5a60b3debdf5d8cacc127d3667fd487c987c7496f499fac399e53b29cf86b7a2a026f0594ff286729bf3
 DIST genpatches-3.12-14.base.tar.xz 359152 SHA256 d9d619f8be1169824e0e9ac58db0116cdc682e541da9906a4a75c92d44103804 SHA512 b5aa64709a7b831ba8bb9e164aaee9be570b847731c1e8adeca6171a7eddbc4de54ba49742e70459b6de5393b6c0ec69bc221b9e458438fd7e10810beeb3e2ba WHIRLPOOL 4aed026b4528d990165b9eed60b73d312dd503a16e65bc6dcd5f29bfb65e2bd9306382e52d5f6a24bddf9028667e78324bc79c74d0a94dc130d4e0fcd6a16125
 DIST genpatches-3.12-14.experimental.tar.xz 46540 SHA256 a8b8667730e47b61d55d1bbe11cdec4a2e539e749028353172ab1269bbefe96d SHA512 31d5c2e7aca9574cd6e04e5e61a907ffbe6940424a877eef5d7e12b74552062b9c0afb177f2bb44d70d67264d52158b024159a170409be23c6bc4cf2a773a28a WHIRLPOOL 273c23fcb13289421956a61c1ee0a5844d776b679943b2a9ae35fd46e7319b233db0e255ad032e44eabc76a51a2380f7129619a50f859ed4907acee08678ca18
 DIST genpatches-3.12-14.extras.tar.xz 18148 SHA256 dbe4784918b0f0a2947d842f2045b3b1e18eaa55b82b8be0fb22493afba76738 SHA512 ed7c453c0e6412e3b24b1a440c6baa7391532dc16cdd5a4f7d59c4e3b166d4fca428f6f14ded091885abd920b2ef0fae6881f3d06cf6896c4136dc36ed2f7185 WHIRLPOOL 84f83e680b85f207287ed0710ca29e6d0bda4efd5812b497adc8b4cbc815f02add85061fdf192d5ac970e22cdfbb5cb85d33ec1ee20fbe57a48d5610b218eaf2
@@ -54,12 +57,18 @@ DIST genpatches-3.14-19.extras.tar.xz 18244 SHA256 da0ce465ece8d417a4ef1c6b960eb
 DIST genpatches-3.14-20.base.tar.xz 394304 SHA256 57604d7dd33a32060ee5f2250685de62cf88740ff26f2bbc91713f23ecd4543c SHA512 9b5588f75771acec85cd6d5c5a4548d6c409d2a8f18f350ae19d2218ec4eafe44b16466a83ffb162ad178b4dd7b6a6ec3845025ed7e0f728359b215d277e487f WHIRLPOOL 1597022623b3d4117cc939bef0d2adf76586d6710ab9f6487005a88ba5b093dda8134081da71ebb408c8bab18d1771f246809011a4f25941301619c42411aa9c
 DIST genpatches-3.14-20.experimental.tar.xz 51224 SHA256 cab7f2f37e33bbd249b88421034b1d69a67ba315fe0062884f61d4e178f73a7c SHA512 dcf5e340e8576633f2a1aa5706fca30130c4b6d613dacf92995d74a93526b9f8d0a53167173ca716762a6d4ffeb6394dc6bbdeb82ef955709fa9ea538d560567 WHIRLPOOL f5e823d553b83eff229c00e48bfaf3902e6031423c5b9c70a3ec8a28ecdffa8e49162569bc70e7e05f0e93ae0404afea98ff278ea22418381b4c56154980cc1e
 DIST genpatches-3.14-20.extras.tar.xz 18228 SHA256 ac109fe0d1fe0bb652cf87f06eae9b92c593d0849edaf9c11f6725e5a0c6cc81 SHA512 3e284c74895eaa2e3ca6c88e48c631144db5718d44bdd6cc5e8e8c302ac8e3bbcd8ebb0dc07acd6270cc612ca9a4983ffe013e6de6bf9db8df319cff36c2991a WHIRLPOOL c63cc865a2024b36ad1a33f440551454ea618a3e2914a1b4869c0582d8e8357b2e585a5153d379fbbe02c3d5ecf22ec18f1c6c564873910d0806bddc076972d4
+DIST genpatches-3.14-21.base.tar.xz 408212 SHA256 1d53fab58d454bdf5c4f880c4d412ccebde0e2992c69efd2d5e5a520354bc4fe SHA512 993c43c989042fa4acfe22c31879a7272d6a4d4d5f2baadeaf6c300db7a7cd5be77dba0bef4e7ce87f0854605284e1eb029e153c4b43d5979f8218e7c3518d8c WHIRLPOOL 3142686b9d3445cb88bd4cab846e5acbad12e5deb9c9fb5e0875f870308077f182d0cb7fb49d9c4cce83c7d91202cd03fcc4d7500c24a6ffdf78cfc02f46c1eb
+DIST genpatches-3.14-21.experimental.tar.xz 51216 SHA256 4483398bc1f01f01e10dfca0966facdd384ee5e0bbf0bda2706f814ee685d967 SHA512 f9202bccca882bcfd3547eef1f4300a32e1e5d5be8a26976430a55eec43adbf802b4175f1c332bfd3affd8dc658c5e6c88efed76fcdac8db1784582d08eb485d WHIRLPOOL 30955770bae2092debede9928cd5f1117210231ea7f11a1c0dde5dc4d6abd0d0231c98392d8c17417775ba150429561a7385b3ca3d1e60a097c52ae9080edd79
+DIST genpatches-3.14-21.extras.tar.xz 18244 SHA256 3a0428577e217e92dfb8a2aa014feb9bfe1086f0cef20524663334376d671535 SHA512 207e1bb59ee882394e2c7cf1d4ed67be6af9ebaa77e360d1679f3f1209fbdd03c07eb0b8c1dfc81ce980d9a7091c5ebeaa58ff92a324ca77e43b1416340d00c2 WHIRLPOOL b9cb6af6b2144ef156440add4e3f1565e08495ba92545e2c30b78fdcd07efcc704a31f6fe583ae85c380c894375c1ef954cce7ba19cd434af42b71b8ef9458c8
 DIST genpatches-3.15-10.base.tar.xz 189084 SHA256 634c7e8c2bf946979041b2b1547dee4b0ea25e4013a2335482b2194d718cdba5 SHA512 6c8ed9aede214b35704cae851882f52ce6e0769ddf88f946eb9ee506a9bcb94c267c57d0521bef75ae794b2957ca4d262d716840297bb2ec37b4dc0a35781c71 WHIRLPOOL 9648843018ba183bd7b752921720d3ec2bb8c11194f96b10d69624e120495a8cad94c33ce6dfc680ef95176ac79fb7294f42d890ed749b38744ab643fecb56f3
 DIST genpatches-3.15-10.experimental.tar.xz 55792 SHA256 ab8526c4704620fdeecd637caeaf3fb2d953feec7e820f505cb20156f5968cba SHA512 1f52a9ab93a3e0599ad8e3049956b127e862651f3567e83ba933ce42750c90a41dd505059b7fe166e8aa02a8a766c70443417ac3e394f7578f08fb9b846754a0 WHIRLPOOL 8549270eb01f2856196e8bd24687139f84b595cf76395e4f8c221b3386ae765bc44b3c1e3a6787ddb71bd130528e727852b0e3d08771438318678c5840c47871
 DIST genpatches-3.15-10.extras.tar.xz 17660 SHA256 0e2a55e6c44af02959ed08d7618dbd2c1a80f77f01788c21437d384f4d9db806 SHA512 749455b968f3f7a7ce5ae924eef9ae0d6099e9a5f11f0f1c0a740989d9299b12bfab05881f501286c58ecbd3bf6398f22109ae808d574c22a81a493f99aacfcf WHIRLPOOL 0baebf3920875c2b0905aff3a00010a379d825b13d14c09abe8a26ff0c03556a29c28baf80fa566a1d1303ebfd501d858684868534a5104282a17417c8cf38d5
 DIST genpatches-3.15-11.base.tar.xz 204552 SHA256 b258eb058d17664cc119f0e3f510e133e7377de5032099547113e45b25386b2b SHA512 69bbc49607701c618043ed20295caf237426d947c8ab6a080de543894841f705189054367f3f97c2839a93e0ccb110446a83f01435afd43daa1e6272db746b44 WHIRLPOOL 416c37ce7f5097a9c7ca2518b7e3f2e00f084f3a5fe4732d5c08f18ff34c1125e7828e71b3558e96080b197d81885ffcb71c244e86893862f3ecb8a43dded2f1
 DIST genpatches-3.15-11.experimental.tar.xz 55824 SHA256 3823ec2d1b86c5ddd1843adb1bc5e25c2693bda3909dedd20a30f5dee99f610f SHA512 cd9dad822729f66d3268638ccaa2d3617f3a93fb93baa1622dfaf9acaffd3072dc900fd98aded53e61d6e2fc192e51913c726538c2735ecc5a058b4aee0e4df1 WHIRLPOOL 690ca2e30764d06d833ab0fb3a517c9a7dbebe9c2cf8702751b0f72d5a78ec3c35d5ebf06ef570a0fdc8c2ff442993867395492d3d04d393df11cf4c7b7841bc
 DIST genpatches-3.15-11.extras.tar.xz 17664 SHA256 73486dc03f689795af6387938f691e63afbbaba922ae7a39771bc8bbbabf38f3 SHA512 cca40d93a944dd31c591a91817a40ac2991609c8200dae2c3e0298caaccf9e07b4fd0044b4d51c5337ff0fcfcab22d469e0a265f84eabca70c68a4d4eedaff04 WHIRLPOOL 601941ce9018f726e4fc6392a7dabcd03da5d457652aec7d871039c1428f1861f354b83673d056906dd94e63c5f9c68eb0036ae41443995fee2acfa5e3b6ee4a
+DIST genpatches-3.15-12.base.tar.xz 214792 SHA256 28f0f807f768d5e8819df4be70c74e8ec01ff8c1a4917a0908cf75b8e51825fd SHA512 0f3e9fab4531bc36820c4ee681e9da7ad1bf79859c822ee40f0285120515d4b18a3558f2ae9d8fd22e003492d9f8f6a38fcd8a5ea00984350340f5054b8e7ebe WHIRLPOOL dd5ec234e088d2a9e0fe6c74cc84275e2f532bb4783bd5100c79d15364c9d082029db73e3241aac5f82a106bd5fa88c637ff8eb2bedf33c44243c7bf590af1c0
+DIST genpatches-3.15-12.experimental.tar.xz 55820 SHA256 4c8c5780020bd93f7b5e40101999fb4cb1610a7bc92e1d1c2bb44acff9b4e614 SHA512 51bcc576b0c968924846ce4b21ad4460516d7f1de8e9f0f17b1c606c93f594b189d5cad911016dd7d85b9127121e916ce0f3d1bbd3f245f042ea1387f3b80911 WHIRLPOOL 49be20460f1e9bfc4ffa6992dd27eb3142559897e161910577ae470816dc0bf340cf4cf2294f21f05ccdf30ad6eb74d16829d5dc885e84b2532039906f4b9d76
+DIST genpatches-3.15-12.extras.tar.xz 17664 SHA256 97897a464ff638dda372c8bed7ee10723fde7f370cab2c770fd28b450bf3221f SHA512 251639762bdd1477314a2f2b89249955826848e15874677242c10c56e9f724c54b1afdaeae8479b5326bd4861efc73e8d29658170379a6e1724450335c0c1faa WHIRLPOOL dd38dd64c263dea74f20658e8904bf2f88858cd3f613b16f0361195f9bcb73859310897f35ba501a3f46fe1ccba573e051a61fe42b2d3383bf3750081ff6269a
 DIST genpatches-3.15-8.base.tar.xz 152608 SHA256 22a03917ed9bf8ae9eaa59e2f3bd8d0d892ff0a4dfebaf53d6be2c923889e946 SHA512 9495805021c2f269466f88c0c78d55878302eb8b2c477eb8d811b1ecb46f9f268b55edbd74d7bac15224eb7aec08d1fb7021e927bbf1e0b8ed06ce729e5ce3dc WHIRLPOOL e6e37b77879017424fa424125815144cd0407d04df756923bba5a3e75a79e482b917e17e73c1675d547f30fb6d5492599216216e5eff0e329fb8368e932e484d
 DIST genpatches-3.15-8.experimental.tar.xz 55816 SHA256 9b3fa8f4c1435a4f1c417e9bbfb2ec4382e2840f22354217084a6dd80a665533 SHA512 a969dd0883d9f387a85862158494651971f25858f80a70d67829bc67ee5f671e6bf69555a92bd33772573484cef4efcab17ec024725ac69f184b20f4bac0cef3 WHIRLPOOL 1b40aad9d4e57e36268f8e1e30ae74f18b5419176c37eb015a703161b8ee93fbec74f25ec61e7dcd1097f9667e37323e19d4c4ba17340f9357bf27f0d44c301c
 DIST genpatches-3.15-8.extras.tar.xz 17664 SHA256 b863dc86435c2d51a09451fdf433fbb9e3c2923b260cfe6abbfb399e48103bdc SHA512 4ce0312a21febc39eab52d1e755f99a5667eb0c16f276b14971d74a8a9c017d71960ff348b0be5c4e0e3d6074876db61b5bf756f413b1b369d7d1589160f3546 WHIRLPOOL fce77388c22e465f7a80c3ad0d788321c10c62117369a220fed0cb2de4a33985050a7f9d556f3355dfdf4910f54ab90e7ab70cafb462dbde564271590b36438b
@@ -69,6 +78,9 @@ DIST genpatches-3.15-9.extras.tar.xz 17668 SHA256 a77fdc75b074d504884594e2ac0e47
 DIST genpatches-3.16-1.base.tar.xz 6504 SHA256 ebc5f370ff0cc3d7c0213ed72b09c6c2f68be9758845d64fdde55f3771dd1fcf SHA512 3fc5e998e218be96a9011e469431a75c83a6a1e50caa02d443b7b876b22c32b3c6104c74e95a942c37f2156ef66586a67bd5d115d07da62b5e87efacc63de782 WHIRLPOOL 5a417d38f0e994d0a92b8c670176ae98f0ace4ea6bfa527131afec2943d57ba013499df39c40312849a7b9eb8433eb315a85e7597a1d0aa03d65860e876d896c
 DIST genpatches-3.16-1.experimental.tar.xz 3556 SHA256 5418088b5224ad956e785e941e8b3b409407b9e1b635d65506e56ceab4c76880 SHA512 bd33587e694a353f0b2054d34de58c4098642519e8990c678567dd24d95d7c94d91864b70ea006e023053ce99e0a89bd174a887d03b23d3253a26f0397f70518 WHIRLPOOL 154045c23734423aeee4bd8730e5a6d69eb8aab4637faad6d9d61479c9308857974dc00e74bf679c882e79b8e0c665ef1c840f7de8794bfe8d9c95b4582d5342
 DIST genpatches-3.16-1.extras.tar.xz 17660 SHA256 0e2a55e6c44af02959ed08d7618dbd2c1a80f77f01788c21437d384f4d9db806 SHA512 749455b968f3f7a7ce5ae924eef9ae0d6099e9a5f11f0f1c0a740989d9299b12bfab05881f501286c58ecbd3bf6398f22109ae808d574c22a81a493f99aacfcf WHIRLPOOL 0baebf3920875c2b0905aff3a00010a379d825b13d14c09abe8a26ff0c03556a29c28baf80fa566a1d1303ebfd501d858684868534a5104282a17417c8cf38d5
+DIST genpatches-3.16-2.base.tar.xz 11984 SHA256 4e134e601992be75502e1d1378e653e664859150563f4e19f3cb1d3d0d22de88 SHA512 0d13aa991dac64061070303b23639afc27c52bab098187dda23efb5d7b1a9aba48f2a75adc80cf5b713f76852f3ab9f343ecfa465f1e21e0cc7b604a3b15acad WHIRLPOOL 2b68aa6dd6bbd43c1c299fffacd693d390f286727daadf64b799a3fbc77654bdf57b82503e5e3c9f9f91714e02b6a36f288753cbf05511886176df960e130f2d
+DIST genpatches-3.16-2.experimental.tar.xz 56660 SHA256 1b825958448432ac4ec44ec17f5a1d45d9b79d5841d6a5ccc0ce1acee29ec4c9 SHA512 6a4d5edc45b187e1ddb0f652e4bdf21b4e4850a1320fffda00c45e3e6395a735de5d0ec5d1613df1252adf1e3789e799a590256d14476103c897a4429e60c059 WHIRLPOOL e880f3b48f7b05154c407c7091e516ab6c0dd3d5c7ecc9711bf931a53b4eaac9ce75761f45063fa06020cb1e6ad4bb303a0ff369bed7ce2460eb1c1050772d7a
+DIST genpatches-3.16-2.extras.tar.xz 17664 SHA256 97897a464ff638dda372c8bed7ee10723fde7f370cab2c770fd28b450bf3221f SHA512 251639762bdd1477314a2f2b89249955826848e15874677242c10c56e9f724c54b1afdaeae8479b5326bd4861efc73e8d29658170379a6e1724450335c0c1faa WHIRLPOOL dd38dd64c263dea74f20658e8904bf2f88858cd3f613b16f0361195f9bcb73859310897f35ba501a3f46fe1ccba573e051a61fe42b2d3383bf3750081ff6269a
 DIST genpatches-3.2-39.base.tar.xz 1293388 SHA256 4d130a1c48481fb1b79610bf3f54392e4ab85d8d26bf88e4220a928303ad7a96 SHA512 0e5842a001d9f63a3a20a4e9e577aa8fdacf97d437d7c66e68f2a2302e1792de9736b6e653eb1bd9a911c6224a99cd46f4330f9723fc0e255864528d9493375e WHIRLPOOL ea8d299796cb78aa27821d6c7e389ced08a446a0087093307a746255966dac859cdb12dcc8659dab21ea2760f99b042ead12afcda9e20653e8409a4f7eace7c8
 DIST genpatches-3.2-39.extras.tar.xz 17976 SHA256 f23c07ef5cd6fedd2b3fc481f46adabf96edb93207ec96d4ff0bad1de90b4de3 SHA512 79ea6a1e1c9607fea3c3a0e590ea986febc27004cf3918611d62b8ba8c0ab0b0d76be2688687d476b8ad4dfced5527ab520712858da9d8556b38f7b149716938 WHIRLPOOL 92e9f5726b69f61970f2d0166e42919bb3008228e043a481f2dfcb7ffa766d8b3dc5c32bc2729e0a5ad0d92f313d7162adeab16e3eff6a33e7a90a04ec8835a6
 DIST genpatches-3.4-78.base.tar.xz 1146300 SHA256 f722fb6b6869cffc599e8042ffd68f287306f1fa32317dd7249dda32722e9deb SHA512 608ddf4dd32b552d4da95d4fa55c1d84e652149c1a8c727ceb4bf12d530720534a282e86215b0b5b9cc71a6cfa9f2f96986403c4ea9ee5608dd1467b0316b2f8 WHIRLPOOL 5064d5a54c10e71e2dbe7f2ddf89f9d8408a5a28c6a24913372cb6f1bf0285bd80fca1f052dce5d2f15c6e2601c7048714fb32da7895e07f3d00195e0eda6561
@@ -81,6 +93,8 @@ DIST genpatches-3.4-84.base.tar.xz 1182792 SHA256 6ff5f2c96b9d035b039bc114717237
 DIST genpatches-3.4-84.extras.tar.xz 18212 SHA256 dbf65a46d0efc7d761a2c017886f8133b153bdf93da942ae48c1cf5513668a85 SHA512 4715431597a81971af78f2231862733b38fb4aa91bd29c4479d3d84b6165a6e15fb8c835deb7d2a9994333d264073af40b02c99fb788119d85b44e885ef935cc WHIRLPOOL 7c8c2aac2627de3a48de027556448aa6a3c1ade255a6888615e9be2dc441055b5813b8fe7565e7ff1cfcf1c819bf448d2fdb3381ed5a546cec1e16cd7e4d3d61
 DIST genpatches-3.4-85.base.tar.xz 1191084 SHA256 9f91b8ae9b8197926ab13d102f8a1e3ed8cfe78a29e652c6d85f1e83a0befd50 SHA512 391ee24cd3863589b632902f3f3a1c3750a1a1dec439d897c5104ed7608766d3377433ff8869923029f3c025c965c7aef38ddf0cf6f0c06dc4a9f6572e8a4334 WHIRLPOOL 33773ca5276befc836d9ac0f94092694e68a5c6604ddc116bdd6b69ab52723aa5a5324406229f3bc532337dda921a7a08108d22074fda70534c458ccaafa8e1a
 DIST genpatches-3.4-85.extras.tar.xz 18204 SHA256 1bfc8a2f284d389d34bb82bf8ee69d3b8970cc9b959a0c02bed99df6e1f62a42 SHA512 b123ef48de9668fbd374f115535b7b2591eeddf1e855621f92de6b66032cc6f515618631ebf64f52909f0cc519e4ddccc761df52e4d2fcb05835b83b3b2ce7e7 WHIRLPOOL d7c0783973c99991123fb742ff9df0c8f6b0e307a5aed041fe5aebdd3c6aa7a389568ec58372fb07d0aaeccee3a5dfffef4f48c4497385b1e5bfa1d3fc44bb91
+DIST genpatches-3.4-86.base.tar.xz 1198340 SHA256 1b2cc48627c344f05f563be82a268c935686361b22fc281b4b4f39deb338b1c3 SHA512 7c077e7acec756e54e03df9846f726e7863d56035072422a6cd74365e85528373725823efd4867746796d5b44950c459202a716aac57cb0a1970f02eec60a02b WHIRLPOOL 455f5bafbe252699e0d22135caa678608362a4cc0834e3016f62a52e337246a67fbadd66850a8b47a6da394b38e9c9984606550e629500ec25730354409f0f1f
+DIST genpatches-3.4-86.extras.tar.xz 18216 SHA256 7d6a97f178f24a292db316f263c22ee262925540be98e55eee162faf82c7c0fa SHA512 fbd7557f78c0636bb43a959070c2dea9c709825e646299fbf5955a11ce36e726ab8bb1c5ef1e1ad4b481c95559e34cd8fcfa9c7562c05e2a4f3d1861f959779f WHIRLPOOL 16237f86dc9ce9c9a7b20c180e27362d63b70ae8df58c4ba360f8928edd162dd0c948cf84aefcc523cc2f98d9dc76fc75db28655f96d21db20be1c25e68cb730
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.53.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.53.ebuild
new file mode 100644
index 000000000000..5e4cf7e5b220
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.53.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.10.53.ebuild,v 1.1 2014/08/14 12:35:56 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="61"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.17.ebuild
new file mode 100644
index 000000000000..fc167553a1f8
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.14.17.ebuild,v 1.1 2014/08/14 12:52:06 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="21"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.15.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.15.10.ebuild
new file mode 100644
index 000000000000..56fb97f09561
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.15.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.15.10.ebuild,v 1.1 2014/08/14 12:31:44 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="12"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.16.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.16.1.ebuild
new file mode 100644
index 000000000000..1de881a78053
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.16.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.16.1.ebuild,v 1.1 2014/08/14 12:17:42 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="2"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.4.103.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.4.103.ebuild
new file mode 100644
index 000000000000..5fe6539284dd
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.4.103.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.4.103.ebuild,v 1.1 2014/08/14 12:15:29 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="86"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-process/acct/files/acct-6.6.1-math.patch b/sys-process/acct/files/acct-6.6.1-math.patch
index 5f69a51aa672..a1d6fe72e758 100644
--- a/sys-process/acct/files/acct-6.6.1-math.patch
+++ b/sys-process/acct/files/acct-6.6.1-math.patch
@@ -17,7 +17,7 @@ these files use frexp/ldexp which is in -lm
  
  lastcomm_SOURCES = lastcomm.c common.c dev_hash.c file_rd.c \
    hashtab.c pacct_rd.c uid_hash.c
-+sa_LDADD = $(LDADD) -lm
++lastcomm_LDADD = $(LDADD) -lm
  
  sa_SOURCES = sa.c common.c file_rd.c hashtab.c \
    pacct_rd.c uid_hash.c
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
index df19a2f77c31..bd97372a0eb4 100644
--- a/virtual/mysql/mysql-5.5.ebuild
+++ b/virtual/mysql/mysql-5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.15 2014/08/10 17:27:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.16 2014/08/13 15:25:36 maekke Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded minimal static static-libs"
 
 DEPEND=""
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6-r1.ebuild
similarity index 81%
rename from virtual/mysql/mysql-5.6.ebuild
rename to virtual/mysql/mysql-5.6-r1.ebuild
index a9f63abcdbfc..5b2d2a9ae665 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6.ebuild,v 1.2 2014/07/30 06:30:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6-r1.ebuild,v 1.1 2014/08/14 14:26:59 grknight Exp $
 
 EAPI="5"
 
@@ -9,14 +9,13 @@ HOMEPAGE=""
 SRC_URI=""
 
 LICENSE=""
-SLOT="0"
+SLOT="0/18"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="embedded minimal static static-libs"
 
 DEPEND=""
 RDEPEND="|| (
 	=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
 	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
 	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
 	=dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=]
diff --git a/virtual/python-pathlib/python-pathlib-1.0.ebuild b/virtual/python-pathlib/python-pathlib-1.0.ebuild
index 8d4c8cf2c5db..ecd07eca0f9f 100644
--- a/virtual/python-pathlib/python-pathlib-1.0.ebuild
+++ b/virtual/python-pathlib/python-pathlib-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-pathlib/python-pathlib-1.0.ebuild,v 1.2 2014/04/19 18:02:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-pathlib/python-pathlib-1.0.ebuild,v 1.3 2014/08/14 16:23:24 phajdan.jr Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/virtual/ruby-ffi/ruby-ffi-2.ebuild b/virtual/ruby-ffi/ruby-ffi-2.ebuild
index 0ed3a0621961..e8c951c56c78 100644
--- a/virtual/ruby-ffi/ruby-ffi-2.ebuild
+++ b/virtual/ruby-ffi/ruby-ffi-2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ffi/ruby-ffi-2.ebuild,v 1.5 2014/06/16 15:40:19 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ffi/ruby-ffi-2.ebuild,v 1.6 2014/08/13 18:47:37 armin76 Exp $
 
 EAPI=2
 USE_RUBY="ruby19 ruby20 jruby"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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"
 IUSE=""
 
 RDEPEND="ruby_targets_ruby19? ( dev-ruby/ffi[ruby_targets_ruby19] )
diff --git a/virtual/ruby-ffi/ruby-ffi-3.ebuild b/virtual/ruby-ffi/ruby-ffi-3.ebuild
index 6302984cacf2..11b03b5fa6a9 100644
--- a/virtual/ruby-ffi/ruby-ffi-3.ebuild
+++ b/virtual/ruby-ffi/ruby-ffi-3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ffi/ruby-ffi-3.ebuild,v 1.2 2014/07/22 15:57:48 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ffi/ruby-ffi-3.ebuild,v 1.3 2014/08/13 18:47:37 armin76 Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 jruby"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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"
 IUSE=""
 
 RDEPEND="
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index c6d8c4db51bd..a7ff3e4b542f 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,2 +1,2 @@
-DIST drupal-6.32.tar.gz 1102839 SHA256 3e1038142f92d125efd494417e8ed9a3c66a46bc063c1d36cca8b4ba91fc1e71 SHA512 3fc2fee0f1f202bdb2b1b686491d2f643ddec903124efcf98cde693bb05ba7dd0c0ca2135f57d4bdd210ac43ea01ec4a10de01815d94c33a37a372de301e53a8 WHIRLPOOL fca4d28907d334f2aa582e6c11dd93e4c4fa6dc2fc5505292f41a1abe8c848bf9d6c3c5c6498fdea02feeba6999946b6ef6550d1a26ccd4589f898f69b5c3834
-DIST drupal-7.29.tar.gz 3213499 SHA256 2a4d4e8384ea90197fa7c71abe4599a84aa03bbd4e8d92aa432197a03cb0eeff SHA512 c0afa88f619655ff349506994a985a8931fc1b79e99275a4ffe028e7b0d70e6988edd97b9c131ad9ab63650ba185459243e0afb5de67bd9854d65228444743e8 WHIRLPOOL 99ceba490358c385c0b1a09151d17217109968e9fe1d24af8dc5a1fe06d7aebb5f90c16ed5b77f73ed035c857f6214c9ceeab1cd2d6a7aa7d6efc020b7afbbda
+DIST drupal-6.33.tar.gz 1103496 SHA256 952f9bd6b22058fe8f9c90c0ac96bd695a673306331269a79c7e19e38fd047eb SHA512 71c272800712493e33f05e58e58da1217c793a6158a84613f7443ee97b2df09cc977621cee353286836513c5f6355187d4eb11f28e8913b58434291f52eae8ee WHIRLPOOL 86fe2eb608c1d43ad83d4b253762d5f82ae9b6f4dd8282bdad34e7fe584bab0d9bdfddbb78dd373c733a85934f00282ec36b3d05d2992dc168f6fce828715d95
+DIST drupal-7.31.tar.gz 3216766 SHA256 6af4849fd2e1fd0a186a5264de10613e57b84c69dbe7dec0754472d27f37af40 SHA512 51cd83974d376714f278e1263b8835163d4528c3ba96f5a134b1e1db5d2145e8bc043561de667b7348152f123ef9ce9ef9b109dfc561b5256ad1a56f0b99ee0d WHIRLPOOL da110bfbfcc723d62e53604c46f688be7e5257a70f45abde249126da1b6593a0e42a2f303b0d8f097272a278d7183059feff1148c71963e75a50efa08269a08f
diff --git a/www-apps/drupal/drupal-6.32.ebuild b/www-apps/drupal/drupal-6.33.ebuild
similarity index 92%
rename from www-apps/drupal/drupal-6.32.ebuild
rename to www-apps/drupal/drupal-6.33.ebuild
index 7e083d846cc4..dd8529f5826e 100644
--- a/www-apps/drupal/drupal-6.32.ebuild
+++ b/www-apps/drupal/drupal-6.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.32.ebuild,v 1.1 2014/07/21 09:45:40 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.33.ebuild,v 1.1 2014/08/14 12:59:01 jmbsvicetto Exp $
 
 EAPI=5
 
diff --git a/www-apps/drupal/drupal-7.29.ebuild b/www-apps/drupal/drupal-7.31.ebuild
similarity index 94%
rename from www-apps/drupal/drupal-7.29.ebuild
rename to www-apps/drupal/drupal-7.31.ebuild
index 6cef0634c6c3..6bf09c759fde 100644
--- a/www-apps/drupal/drupal-7.29.ebuild
+++ b/www-apps/drupal/drupal-7.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.29.ebuild,v 1.1 2014/07/21 09:45:40 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.31.ebuild,v 1.1 2014/08/14 12:59:01 jmbsvicetto Exp $
 
 EAPI=5
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a6815b586c73..8458e1a2f59d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,5 +4,5 @@ DIST chromium-36.0.1985.143-testdata.tar.xz 111519392 SHA256 7af27696a1d30a2acd2
 DIST chromium-36.0.1985.143.tar.xz 205456928 SHA256 0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316 SHA512 2d61994c6487d36d4debdccfebd1deb37047c7363743ecf511987d5f9fa3123206b76466a47e00d5cd55fc697f981655d40127cb43564d90ba009f9cd1faa8b3 WHIRLPOOL 4fdc1244d3b23a6569b54b6229dec645617d314bd4f7c9c615c42c33345834636c4679fc39527b48b112d3567e2d336557eecc528047de474df23fcd58ea458d
 DIST chromium-37.0.2062.58-lite.tar.xz 214313476 SHA256 af893a66b83dc9b236e400f178817e49feeacfd99ff48397c890a687dfe32410 SHA512 de5fbf53f3a441b3db9322cf27d60f87b6f232151fb72715a727e26c126f85bfd4e654b777e19992e467cee4b336384b63fcaf9db866031cc68447a14a455295 WHIRLPOOL ba9c2b030f835442414fd70fd10f6957fdfcc7123d6bffe3713d815c4cc23798a9f310abc21d5909b6be7ccbe8c9ebec9e24f8efc5271211006ef265bc5c91c2
 DIST chromium-37.0.2062.68-lite.tar.xz 214344600 SHA256 608aa9b15943594f80d751fa5df8a7a28578fd5d9b8542a658928ccade1b0814 SHA512 c2f9ed65947a460523530a7d98f2bd481987dd1827842aed0404f5dbfda9240c1446b3bfb2053b344dbacaa10f572b63bce57a1b4034ac68291d70024582383e WHIRLPOOL b2267bbeb652385f0dda7bc4ad2fca69785e14ebd07c655a6d013739bf8c1aff97fd06ea9df73bb470541d07bedebdc0a65f21afab0eeda3cf08799d70a3a833
-DIST chromium-38.0.2107.2-lite.tar.xz 228350836 SHA256 7f31275be73c6933f785803b89b6f627ac6ec184d28f395aac724d736debd43e SHA512 2c17853f510d8c489993d2e07ad6e007398d429183938fda5c40293785d13bcf4db376c6077542735889aef9aba5051944e146ec94970358ec9496ad690d9bee WHIRLPOOL b9f98b030a175addfa1028444ae0f682443a89836146242671c1670069f711edbf615a095caf119696195fce6525546633fc48b651d3c40f8a97a00a225bec77
 DIST chromium-38.0.2114.2-lite.tar.xz 228583844 SHA256 288067699a5043f2f0ff5a279b7926b22d5556cd33964e8d36c93048e734aa14 SHA512 2beb586e70bcc14cdbad042dc5ee1b16c685a75d331da2f068c7e2347040dc140c956913209f04ed6c384c2e080dd72c81e5968abc2f7fcd5d718e7524c23e0a WHIRLPOOL b03b7222585a3d64feed112cd9a859d95d99c5283c099f4d0ce5f254ed4fe75c1dca68313b3d646a3db30c0ddf859e2680416440541d530ca1a963a71c89721d
+DIST chromium-38.0.2121.3-lite.tar.xz 229671460 SHA256 cc949dfc901c187be7005d8e6f9a8c1d46b307891e0deb1a61b7fdca8baa154f SHA512 b15d35abdceb8468d9794dc3c0d1d44168bf54afa8cfcb45f81044a38819349cbcfcd2217da38b58c5a591bd28b836d9818aea6aa0d317e11d9c6f6efb652394 WHIRLPOOL a204e2e47a83624c1ac68dd6adcd5b8f4dc48b573679c434dcf273246beb7cacd2f6c2454122d9910abf2d4be05b67c14074e5e171ec23778beac23c81380b6d
diff --git a/www-client/chromium/chromium-36.0.1985.143.ebuild b/www-client/chromium/chromium-36.0.1985.143.ebuild
index 7ab576fd33b3..b98145329886 100644
--- a/www-client/chromium/chromium-36.0.1985.143.ebuild
+++ b/www-client/chromium/chromium-36.0.1985.143.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-36.0.1985.143.ebuild,v 1.1 2014/08/13 04:00:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-36.0.1985.143.ebuild,v 1.2 2014/08/13 17:30:54 rich0 Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
diff --git a/www-client/chromium/chromium-38.0.2107.2.ebuild b/www-client/chromium/chromium-38.0.2121.3.ebuild
similarity index 99%
rename from www-client/chromium/chromium-38.0.2107.2.ebuild
rename to www-client/chromium/chromium-38.0.2121.3.ebuild
index 6750214eb6fa..a1d73409fd5b 100644
--- a/www-client/chromium/chromium-38.0.2107.2.ebuild
+++ b/www-client/chromium/chromium-38.0.2121.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2107.2.ebuild,v 1.1 2014/07/30 17:46:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2121.3.ebuild,v 1.1 2014/08/13 17:01:30 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -170,8 +170,6 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-ffmpeg-r3.patch"
-
 	epatch_user
 
 	# Remove most bundled libraries. Some are still needed.
@@ -203,7 +201,6 @@ src_prepare() {
 		'third_party/flot' \
 		'third_party/hunspell' \
 		'third_party/iccjpeg' \
-		'third_party/icu/icu.isolate' \
 		'third_party/jinja2' \
 		'third_party/jstemplate' \
 		'third_party/khronos' \
@@ -251,6 +248,7 @@ src_prepare() {
 		'url/third_party/mozilla' \
 		'v8/src/third_party/kernel' \
 		'v8/src/third_party/valgrind' \
+		'v8/third_party/fdlibm' \
 		--do-remove || die
 }
 
@@ -347,6 +345,7 @@ src_configure() {
 	# 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"
diff --git a/www-client/pybugz/pybugz-0.10.1-r2.ebuild b/www-client/pybugz/pybugz-0.10.1-r2.ebuild
index 4453ab225ce7..3eeb24b09564 100644
--- a/www-client/pybugz/pybugz-0.10.1-r2.ebuild
+++ b/www-client/pybugz/pybugz-0.10.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/pybugz/pybugz-0.10.1-r2.ebuild,v 1.5 2014/08/06 20:30:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/pybugz/pybugz-0.10.1-r2.ebuild,v 1.6 2014/08/13 17:34:47 armin76 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
@@ -12,7 +12,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 	inherit vcs-snapshot
 fi
 
diff --git a/www-client/rekonq/rekonq-2.4.2-r1.ebuild b/www-client/rekonq/rekonq-2.4.2-r1.ebuild
index 5d7168efeddf..7f4793c42c3f 100644
--- a/www-client/rekonq/rekonq-2.4.2-r1.ebuild
+++ b/www-client/rekonq/rekonq-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-2.4.2-r1.ebuild,v 1.2 2014/07/17 13:19:34 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-2.4.2-r1.ebuild,v 1.3 2014/08/13 18:45:25 johu Exp $
 
 EAPI=5
 
@@ -34,6 +34,7 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
+	$(add_kdebase_dep kdebase-kioslaves)
 	$(add_kdebase_dep keditbookmarks)
 "
 
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 7a5908cdfbb5..cb2bdb7c4ff6 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,6 +1,3 @@
-DIST adobe-flash-11.2.202.394-debug.i386.tar.gz 7405280 SHA256 7752f485c3fcbeffe5054aa7f741f114c4f334e11f050eaee9aafcfca5ba36b6 SHA512 51713a4e1586f31d24fcc4a22b5e43c14443293b0db9af62e1d80bc6626cae914df58224b6e23d912c0cd441b6b642ed9936b12bccd993ef1de056e663a1c296 WHIRLPOOL e2cbde86f059f7d5fe0ad3c6e75de99f7265aec3732008f978f370e8c5cc31f93876f5b609cb569c9a414341af103c350438a89f7fc6dac87358648d6cf6a536
-DIST adobe-flash-11.2.202.394.i386.tar.gz 6925990 SHA256 273d987a41f7b271b13d90d095269d941f71ce43607518f324424c6331b91c31 SHA512 26c9aa6a2e2db9ab2ff1631b4cc87a2e074518865aaaef1829ba24c44ab22513dd9f16024a6bed0ecd07e5c2d85c97e801ec19b1477a75434bb0531902bd99fb WHIRLPOOL 8b4c0450c77480901175ac5acf34cf62f1042ba3a10050c465aab6944a34a4e4801fd8223959dea9891daaa3b9968b081620876e0dbaae7c6ef192b3485d79b6
-DIST adobe-flash-11.2.202.394.x86_64.tar.gz 7235530 SHA256 ddce56a38e2440e178721ba60efcd76e59ae7f5e6ce57971d6ad87a45a9d02f1 SHA512 14faf00fefc31b5ff0c1d58ac5906641a185436d106cb94e2f808078d5cf38f0890295240f47846cfe2992d75179501e47d2aa5f0bf04fd6a12aa4dcbd909d74 WHIRLPOOL 9885e7efe5532ef15015cd77c0f0a4a7bc9fa5016b409a83472cada95a06a6a3c65e7d45e6af1bd3247cef4daf14274e5366d191b6ceab5bd7c883767048be33
 DIST adobe-flash-11.2.202.400-debug.i386.tar.gz 7404959 SHA256 f818a18f92a807744939fcf19092b55cdc53b99e871e8e77f949ceda4e29b932 SHA512 b6857f49a5aac39c48db80d6482cdd5a502717f0845327df8e18b344506d211e33c42516c03aaec15c2df63db1b5251b1759bb1d60c29b8241f7b08ad41fb565 WHIRLPOOL 2c54d4340a6bb6208d1f042cb55f60b4299083f1ce885827cba6caa8e39a2f61644d2ffe673443222e7e32e46dbacd7efa4f2d65568fd0d3af946765afb5e260
 DIST adobe-flash-11.2.202.400.i386.tar.gz 6927109 SHA256 d0ac17fa50069520e1aee59e3aa893ebec3cfdcecb4f81aba040662352fd6ef7 SHA512 04b8dbe2a36712180886234b8587e199605b0805dc92fc234dd8f2efbe37168342ffb96be663bf6d9352e1bad2837b6439fa77247fcb6177fc6ceae4e4f9200c WHIRLPOOL f0f901ddab307723f728b4c780a75a2ccaebf85f3f01f95091b91b9f60d3eb10b9cbe9992cc605e43de5eb3f691a2b702a0c2506bb5066f2ae5cdcf3c10c933b
 DIST adobe-flash-11.2.202.400.x86_64.tar.gz 7238196 SHA256 d43b05d76b2f2a6eafbc7e8901c37966a652cf99b6a835919972ca8e99fc6b10 SHA512 39219a0990ca7d945c17836d03e9657da523d8011d51a1a425726bf7721655d0951f29c669d5a7c1b8a0d77e1fccf4276973962cd92017a5f57195b67cb49596 WHIRLPOOL f7f18687c5f3e3c0019a0e37d9eaf46a07df394dc429c7b650e9202764922d09857b4ffa8d7a34fbbbdda2d9db2359ec8cae8620287b8fca84b624950ea9e755
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild
deleted file mode 100644
index cfb7e92c018c..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild,v 1.3 2014/08/08 14:12:05 jer Exp $
-
-EAPI=5
-inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="
-	http://www.adobe.com/products/flashplayer.html
-	http://get.adobe.com/flashplayer/
-"
-
-AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
-AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
-PV_M=$(get_major_version)
-AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
-AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
-AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
-
-SRC_URI="
-	abi_x86_32? (
-		!debug? ( ${AF_32_URI} )
-		debug? ( ${AF_32_DB_URI} )
-	)
-	abi_x86_64? ( ${AF_64_URI} )
-"
-IUSE="debug kde selinux sse2"
-REQUIRED_USE="
-	sse2 debug? ( abi_x86_32 )
-	|| ( abi_x86_64 abi_x86_32 )
-"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	kde? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		kde-base/kdelibs
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXpm
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	>=sys-libs/glibc-2.4
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-
-DEPEND="
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
-	selinux? ( sec-policy/selinux-flash )
-"
-RDEPEND="
-	${DEPEND}
-	abi_x86_64? ( ${NATIVE_DEPS} )
-	abi_x86_32? (
-		amd64? (
-			|| (
-				(
-					>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-					>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
-					>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-					>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-					>=x11-libs/pango-1.36.3[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-gtklibs
-			)
-			|| (
-				(
-					>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-					>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
-					>=dev-libs/nss-3.15.4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-baselibs
-			)
-			|| (
-				(
-					>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-					>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-					>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-					>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-		x86? ( ${NATIVE_DEPS} )
-	)
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
-"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="usr/*"
-
-any_cpu_missing_flag() {
-	local value=${1}
-	grep '^flags' /proc/cpuinfo | grep -qv "${value}"
-}
-
-pkg_setup() {
-	unset need_lahf_wrapper
-	if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
-		export need_lahf_wrapper=1
-	fi
-}
-
-src_unpack() {
-	local files=( ${A} )
-
-	multilib_src_unpack() {
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		# we need to filter out the other archive(s)
-		local other_abi
-		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
-		unpack ${files[@]//*${other_abi}*/}
-	}
-
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
-			-oflashplugin-lahf-fix.so  "${FILESDIR}/flashplugin-lahf-fix.c"
-		echo "${@}" >&2
-		"${@}" || die "Compile of flashplugin-lahf-fix.so failed"
-	fi
-}
-
-multilib_src_install() {
-	# PLUGINS_DIR comes from nsplugins.eclass
-	exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-	doexe libflashplayer.so
-
-	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		doexe flashplugin-lahf-fix.so
-	fi
-
-	if multilib_is_native_abi; then
-		if use kde; then
-			local pkglibdir=lib
-			[[ -d usr/lib64 ]] && pkglibdir=lib64
-
-			exeinto /usr/$(get_libdir)/kde4
-			doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
-			insinto /usr/share/kde4/services
-			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
-		else
-			# No KDE applet, so allow the GTK utility to show up in KDE:
-			sed -i usr/share/applications/flash-player-properties.desktop \
-				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
-		fi
-
-		# The userland 'flash-player-properties' standalone app:
-		dobin usr/bin/flash-player-properties
-
-		# Icon and .desktop for 'flash-player-properties'
-		insinto /usr/share
-		doins -r usr/share/{icons,applications}
-		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
-			/usr/share/pixmaps/flash-player-properties.png
-	fi
-
-	# The magic config file!
-	insinto "/etc/adobe"
-	doins "${FILESDIR}/mms.cfg"
-}
-
-unregister_pluginwrapper() {
-	# TODO: Perhaps parse the output of 'nspluginwrapper -l'
-	# TODO: However, the 64b flash plugin makes
-	# TODO: 'nspluginwrapper -l' segfault.
-	local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
-	if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
-		einfo "Removing 32-bit plugin wrapper"
-		nspluginwrapper -r "${FLASH_WRAPPER}"
-	fi
-}
-
-pkg_postinst() {
-	if use amd64 ; then
-		if [[ ${need_lahf_wrapper} ]]; then
-			ewarn "Your processor does not support the 'lahf' instruction which is used"
-			ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
-			ewarn "should allow this plugin to run. If you encounter problems, please"
-			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
-			ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
-			elog
-		fi
-		# needed to clean up upgrades from older installs
-		if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
-			unregister_pluginwrapper
-		fi
-		if has_version 'www-plugins/nspluginwrapper'; then
-			if use abi_x86_32 && ! use abi_x86_64; then
-				einfo "nspluginwrapper detected: Installing plugin wrapper"
-				local oldabi="${ABI}"
-				ABI="x86"
-				local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
-				nspluginwrapper -i "${FLASH_SOURCE}"
-				ABI="${oldabi}"
-			fi
-		elif use abi_x86_32; then
-			elog "To use the 32-bit flash player in a native 64-bit browser,"
-			elog "you must install www-plugins/nspluginwrapper"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
-		unregister_pluginwrapper
-}
diff --git a/www-servers/monkeyd/monkeyd-1.5.2.ebuild b/www-servers/monkeyd/monkeyd-1.5.2.ebuild
index 21d0e5af8850..415b2a2a8334 100644
--- a/www-servers/monkeyd/monkeyd-1.5.2.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.2.ebuild,v 1.4 2014/07/28 15:41:20 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.2.ebuild,v 1.5 2014/08/14 17:22:59 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
 
 # ssl is broken, so we turn it off until fixed
 IUSE="-debug jemalloc php minimal musl uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
diff --git a/www-servers/tornado/tornado-2.2.1.ebuild b/www-servers/tornado/tornado-2.2.1.ebuild
index 171287d6505c..e51e67e479b0 100644
--- a/www-servers/tornado/tornado-2.2.1.ebuild
+++ b/www-servers/tornado/tornado-2.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.2.1.ebuild,v 1.3 2012/05/21 12:24:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.2.1.ebuild,v 1.4 2014/08/13 18:24:16 blueness Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
diff --git a/www-servers/tornado/tornado-2.4-r1.ebuild b/www-servers/tornado/tornado-2.4-r1.ebuild
index 8a0fa6022f59..8c26b84cc10f 100644
--- a/www-servers/tornado/tornado-2.4-r1.ebuild
+++ b/www-servers/tornado/tornado-2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.7 2014/03/31 21:24:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4-r1.ebuild,v 1.8 2014/08/13 18:24:16 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/downloads/facebook/tornado/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
 RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
diff --git a/www-servers/tornado/tornado-2.4.1.ebuild b/www-servers/tornado/tornado-2.4.1.ebuild
index d0b14dfaea21..c6eda579f97d 100644
--- a/www-servers/tornado/tornado-2.4.1.ebuild
+++ b/www-servers/tornado/tornado-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.5 2014/03/31 21:24:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.1.ebuild,v 1.6 2014/08/13 18:24:16 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://github.com/downloads/facebook/tornado/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
 RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
diff --git a/www-servers/tornado/tornado-2.4.ebuild b/www-servers/tornado/tornado-2.4.ebuild
index 9ba3149759bb..53127bf12bef 100644
--- a/www-servers/tornado/tornado-2.4.ebuild
+++ b/www-servers/tornado/tornado-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.ebuild,v 1.3 2012/12/31 22:45:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-2.4.ebuild,v 1.4 2014/08/13 18:24:16 blueness Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2 3:3.2"
@@ -15,7 +15,7 @@ SRC_URI="http://github.com/downloads/facebook/tornado/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
 RDEPEND="curl? ( dev-python/pycurl )
diff --git a/www-servers/tornado/tornado-3.1.1-r1.ebuild b/www-servers/tornado/tornado-3.1.1-r1.ebuild
index 4faf3f5347fa..b8ab12c28de9 100644
--- a/www-servers/tornado/tornado-3.1.1-r1.ebuild
+++ b/www-servers/tornado/tornado-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.1.1-r1.ebuild,v 1.3 2014/07/06 13:02:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.1.1-r1.ebuild,v 1.4 2014/08/13 18:24:16 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl test"
 
 RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
diff --git a/www-servers/tornado/tornado-3.1.1.ebuild b/www-servers/tornado/tornado-3.1.1.ebuild
index d9f7b6120eff..0fb4bad12229 100644
--- a/www-servers/tornado/tornado-3.1.1.ebuild
+++ b/www-servers/tornado/tornado-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.1.1.ebuild,v 1.5 2014/03/31 21:24:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.1.1.ebuild,v 1.6 2014/08/13 18:24:16 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="curl"
 
 RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
diff --git a/www-servers/tornado/tornado-3.2.1.ebuild b/www-servers/tornado/tornado-3.2.1.ebuild
index 37af4aa0479c..ac2c22dd8866 100644
--- a/www-servers/tornado/tornado-3.2.1.ebuild
+++ b/www-servers/tornado/tornado-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.2.1.ebuild,v 1.2 2014/07/06 13:02:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.2.1.ebuild,v 1.3 2014/08/13 18:24:16 blueness 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="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl test"
 REQUIRED_USE="curl? ( || ( $(python_gen_useflags 'python2*') ) )"
 
diff --git a/www-servers/tornado/tornado-3.2.ebuild b/www-servers/tornado/tornado-3.2.ebuild
index 55aa1d0620d8..c47190cfc476 100644
--- a/www-servers/tornado/tornado-3.2.ebuild
+++ b/www-servers/tornado/tornado-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.2.ebuild,v 1.4 2014/07/06 13:02:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-3.2.ebuild,v 1.5 2014/08/13 18:24:16 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl test"
 
 RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep 'python2*')] )"
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 9300c37ab232..a6511177e048 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -4,6 +4,7 @@ DIST NVIDIA-FreeBSD-x86-331.89.tar.gz 56039270 SHA256 c6c8dc05b7d47dc612494ecec1
 DIST NVIDIA-FreeBSD-x86-334.21.tar.gz 56975582 SHA256 ddce7f8e23dd4070c53c7239ce1436c07e28a8bc9679fafba6748038767e8648 SHA512 9e421cac504f075bb80501e7815ada27182c66e6bc22324595da1824b49c00fc8b005028bd9f5d0428f0d9ee04af82e1c90bf1f6b77cf0d60b90dbac963c544b WHIRLPOOL 1ba6573f67be85efdc656063aab8d5cc9a51eb455946dcfdea1b368879d6279de214c7554359bfa2252925f338d597ac5178593f50cc073bb66bf952beffce5f
 DIST NVIDIA-FreeBSD-x86-337.25.tar.gz 58137349 SHA256 9857b24b5d910fb8688a2b9e11039d88b70ec250e900149183454675a363e8db SHA512 0c85814061732bd09948b5fd203d5d3a1fd5df0e1c23f4af11e1cfae6f7d8c7d7f569f35398c2c5551abf7eb5ce357229fa9b16ce2c21799e96396cff3313777 WHIRLPOOL a7ca516e184334117e1cdd45b3f4c1b0a8c50281ffd1c3859865d877c2bfb20136c308b1ff09e4d64d0e7fef8eeddacab488d0bc30c98d82a9280572be5f0de0
 DIST NVIDIA-FreeBSD-x86-340.24.tar.gz 59001888 SHA256 43717bc70d138ac841c85befcc0475c9403354134d8a91529198a9b93951497a SHA512 a69f488d4c751e0f3307532579b386fc01538dc20a561c84fd01a22326a2a7af8a72f54c7e883b25f32a66b4f459ff65b870f0e9e74eae956a15076074665e60 WHIRLPOOL 0c2436d99bb5fa1b5d728781417c897f2f65bb78b517642c103fa67739b33a9f65d582063bdb000fd068a522bea48253b55aa843c88dbe914cd3f8dc19551a3b
+DIST NVIDIA-FreeBSD-x86-340.32.tar.gz 59021194 SHA256 ee4f34a279ae84b97373adbc8c91ab7d34eb52dd4a7b095d51d8592b3e264df8 SHA512 9b5eafa48ccb105fe978242096c99355a291314cacf7a232cb81292355dffac5496cdb8667fa4ad3f0f2286792bf0473f523535e3258bb3b0237c76dbf5ba837 WHIRLPOOL b9438f675f65ec0b55aa2c1ca8c3beb35d20f3c56837bbeb02d511b66d4bce825ba95852ecbca70f6f83ff53f23c98e1c0d2bd313d195426fea63baed27c1cce
 DIST NVIDIA-FreeBSD-x86-343.13.tar.gz 60092809 SHA256 b697db64c4ec654bed7b4059be934c9f88e2c057314a5bf511db6e3db60e38fb SHA512 dcca58a0ca469fdfba3e9d3c9bb371825b59154adfa5b66efb805da067effddc9c4ad423db9c26496b15ed16bff8d11b5c101ea1c2d1d123ab125e2f87fd8a2c WHIRLPOOL 24cb3be4ee63ca182241cb504eaa5eca57e8d5a627844bb3f2bab77b2ce6070a96f447c5d26b9f6846b5e19f392026df0e27882c64147a6c0b72c8fe91ca7a67
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.123.tar.gz 35144064 SHA256 32ea8ce22b4fe50f59782c390b8ec1d90bb44e02787255476f0304c60f11e877 SHA512 e12f55e2a303e8df628b3d7e5f2c80517cae4f6a146f20a3c10ab2d1147b4bc9386b678bbab9e519e28ea921832e1c855b4b8f4643c839717c5c97a833679b2a WHIRLPOOL 5d751bf72e1e089edcaab34d2ba8d413793a92c5a0d3601ff71285b458ad6aef4632481ece9f520f2006440d35b2eab3941e30f54d79351bc8da3ba12eaf3388
@@ -11,6 +12,7 @@ DIST NVIDIA-FreeBSD-x86_64-331.89.tar.gz 47156745 SHA256 78d78d02cbafb7538a98126
 DIST NVIDIA-FreeBSD-x86_64-334.21.tar.gz 57725419 SHA256 5f6c34f6cce4190631b9ffa64006b611c92c8e6af8f016f8c541561d50c0f5d0 SHA512 0a2dc4150b0fd2798438cf68205497c12c5019daca1dc1b3d0f29483220c5db4a5837547ce909f2248770fed8061ef32ace710c9cc5866a0d300bee2c9c2681d WHIRLPOOL 54b0f15bc53dee73a3d6d11eee6f780aa1880c3bacfb45ea75187388411669349a2928ef28d2113b74f87fc9ad825b2e5f5413c2a0a110eaa3e6c9e9a6e67ae0
 DIST NVIDIA-FreeBSD-x86_64-337.25.tar.gz 58941876 SHA256 189dc0f70528d0099d0396a52bf759af74d6a99203484be2d2d6514faf0d4161 SHA512 458c9200579a6caed02aabbc196ec998a0d19149cca665c5ef9bc709c018b991b27713c92d00bdd1ea6ddd86e04c641f387e1ec8a1235cc9581af9e7a3b19ebf WHIRLPOOL d819cf486edc443b1da39ea67582a12698b1dea1501f3b6738014a80f8a96260aa0ba30a9e2f1fac075f0f7d604dc94978f7f82092b40531dd4989a2954cc420
 DIST NVIDIA-FreeBSD-x86_64-340.24.tar.gz 59816713 SHA256 b05f406a887d6b96bc58b46338db43fffa8f702cf460a45adfbe1b90d96909d4 SHA512 6c789964f4b873c5404aeaf7ad742460217dc39719b3a3776639ddf53646495e72c155f8c2976f629297a3ec5bb22ae62e3a64eae423f482bd9338394e6f67a9 WHIRLPOOL b081ca26c0a8ebc07e2bef362b844ca165944741178ee6263c93704ef7c45748f3d9902eca6947688f0b5807a94aad04a8ec1ed0e6ae6053d741bc534fe7553f
+DIST NVIDIA-FreeBSD-x86_64-340.32.tar.gz 59836909 SHA256 4a55cbd4f87528d4d5b5a8809a8c6e2dac9ad22b0f8b357590893dfb39e52512 SHA512 ef333d94a147e04292d6e197ee72a7abfb10a84665931876455b689409af42ac713d1a16f965214a46d9dd28fd324769fa4dd14dde5caf20a8b23a9683b6c55e WHIRLPOOL 76fd78eb97b69d7a5d7dc46e06a8d7b4dc3fadc1f2c6995d86161ca90ce99ec4a0b42eedf09939a4436481bad33ef201f49c73c8add833cf912af86774d47b34
 DIST NVIDIA-FreeBSD-x86_64-343.13.tar.gz 60899859 SHA256 6b13c3b8c3e42b7b4fec96d29969f6ec2a24b70af0f6400b56079f05522fce52 SHA512 f2a2a99353c246ccb3bb49129d046d77e34afc74a0e86e55d69f5700e0a74a87fd31ba0dd9a0ea14d34d51c4e805aaaeca10291422ace2a1aa75926b05414596 WHIRLPOOL cb9dc90bbc0dde6d5f095f042de3a00fb2783e4a553d01da4edda02b4ca638914cfccb60d6a377eb1ba32d1d0853e63bb389b16b99912f305a2d019d65b4a029
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.123.run 40250272 SHA256 d5034900173cb7195f52bd6add5bf574dfcd8868bd75c0e1793592c03b97f425 SHA512 7397a28c67a3cfc5ad58f079ced4c45639922c39008d606ca703c22dde34374c4942c894eec49d42187cf00cb0179e3dcf80edd28a81c4c89456a62e42f12b43 WHIRLPOOL 8b55196678cddba5e640f90525d69835c273befe01e4e1a87c00a21839e9a86bc68829a3c59c64609c47475466a158f43d8579897728cabe6b6bc0eadef62e2b
@@ -18,6 +20,7 @@ DIST NVIDIA-Linux-x86-331.89.run 37023195 SHA256 608c5555933fd8738f9263e569ae31a
 DIST NVIDIA-Linux-x86-334.21.run 37740148 SHA256 ece6ac1d66b0de53b6db0ae92f72112f734c9ec4b7f1ffb1ec508d32f700df39 SHA512 b52a9f08fb91ef915c3c7ce2aa34ecdd93a5fd8731d7f4b9cb887289f931a4dc5e82afa259bc985be55964a8c788550683ef61306bed9a32a5614dcb2d64373d WHIRLPOOL 547862c1ef1b1f3c0684af38ddef9ecd37776e820a7d5c2a7e2ae2e71a5c7956fb1b5c87b78f60e0ce52b7bb7f37efdc27ee4f62a1d42699f48a69521ee42056
 DIST NVIDIA-Linux-x86-337.25.run 37649836 SHA256 f76ece6bd98bfe2ae641a1847094e98c6f7ad7a01af682b4f38108d6b6227f9b SHA512 f68105a43f9129f4112c8a091ed7c9641708b62d20c199544e5e7079d5c5bdc0b6c83427be868e62c7134400ca62cab6a65eaff96ddb940768750250cbd50112 WHIRLPOOL 1ff92ffe33dad59bf393a7b6fe7523362433704dc8329701e74814c2eef833d15e44334264601080b90f723f5390ce6502fa3ed530fe9fadaf3efff139e65047
 DIST NVIDIA-Linux-x86-340.24.run 38451146 SHA256 55ed96acf22b6f67ce352576e73963730eb6a404df7ee8563d7dc1984d8fb130 SHA512 fc2bdd4346cb09607f20fa30c026fac302d0660a90f79192f41cf0c7f92877d8a1686fb3125996f2fc96884d6c1b886de9bf95cf2a5fe31068ba2a43d677c61e WHIRLPOOL 4a165fec8835fbd3aa36e3075140bbcd1b4e3ae76b4763bd9f17e4522c95bbbcc7686de6d1219a293d93804471b56c4b3f8a31f10f62227a8eec59457b747e10
+DIST NVIDIA-Linux-x86-340.32.run 38587515 SHA256 1d0489c35c5b332c9b949d9de3c3cbab4ac3a94385aa41e7a7b62ef23f4395f5 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646 WHIRLPOOL 66bf6db27edddae845606e82cf9397dbf483bbde23e97899575c8ac3f6ce86c84d88f8e60c60b1aad1360fe9bea4f43de030a849f88f43d482508de23cd24d8e
 DIST NVIDIA-Linux-x86-343.13.run 41273139 SHA256 47ab5edf5be5e73d607b663e92d557a215aed739f7e431e312afd14dfe82f05e SHA512 4acf4f48f6062c3a048d51d63b9470486ca6dc0ec00ba93281e4771b21dafce22725b72822f11d43f3a3de9109ef993b34cc0d03c1cd9b61c3b10e643a726981 WHIRLPOOL 66c5535c2a59011b491d396fdc76e4fcb6b7ce9ddcc2aa07f452a2b05612d6cfd00188d2cad66225b0293df1c6e841aada9f1d908d47c70e4e5e3afa47760c8c
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
@@ -26,5 +29,6 @@ DIST NVIDIA-Linux-x86_64-331.89.run 60300634 SHA256 e7f51a6c7abfe3ba8f03dbb284e2
 DIST NVIDIA-Linux-x86_64-334.21.run 67906887 SHA256 dd35011967b815e096c267f80b36664e34d779bc33017f396dabbd1a1b86d057 SHA512 254500cbb83420df26c860df13a448aece837096db8374c41cc0a979c0102b848b5a6ad463e2daf4dc34ae5fcedf7921767e7bd7d86a97ceff4c683b7ee1c886 WHIRLPOOL c525946dc40b03ee5b395535ee278e09ecc400b833bd501a14ee0672ddfb61e1f3dfda305e9c1bdf70344dc34b6aeadfa68a636afba0a80e33a1da808c8f17b4
 DIST NVIDIA-Linux-x86_64-337.25.run 68053486 SHA256 83280f7738f65bb2e790e7530a38978cf0bd0aa741eda51629c9e9b068128af0 SHA512 27cb5030da00d6fa2a2dd6701cc149ce885e7ff7e7ca4f1629c27737357fdadedec41e830f5cacabef14646515d6d2729f753d78424260316e28111f2c3e53b9 WHIRLPOOL 72eba5239ae7272d3501403ef292f0e131896b3dd852a7e2423e79206d99aa5a4a3b98eb4193ad5cd1e0247ffd48189d3a3ba02ca307a759a4f15b9c9a386dbd
 DIST NVIDIA-Linux-x86_64-340.24.run 69647833 SHA256 db0f4f45ece587b95a8ceb0d1acf6f7f758a370ee0c4adfa2403ba4828d58ce6 SHA512 c6f0b69786cc4be96e2d6e44d35b52758df990b51e826bea86ff626e31d853b3b5c774db8ccc881bed24d638e9c1afb903ed98d7f35a73d549ce812bdae459f7 WHIRLPOOL 25d3621d98ec012afdc3d5a0614292992d0569f3d5df38f127fe79a00fbdf25b2b548ddbdc01d59806d301a454fe79ee90e63ac1574e911aa51985e6c7bfd4d7
+DIST NVIDIA-Linux-x86_64-340.32.run 69753673 SHA256 ef96003110564953cad4ffaec073696dcf9652338dfe5eb0c58ae3ce45db42ac SHA512 24c2dec161022bd229862ad66711232cf6424a0bd1eb056d7eb22a34e265d4b1f6208779cf507b480189f95f795d580a30ec5f8ab1bff549d2a41a57adcc14b4 WHIRLPOOL 6422498998253003fc1e1d6396449d2fe35b5836a083a254d9d7439434e5a3e1cf55afbcc3860a234ee9b3d0a1b18b9c58e4946107465559f0dcb121ef796e5a
 DIST NVIDIA-Linux-x86_64-343.13.run 74289137 SHA256 424a7d0fbf668c94454a140c880c298c71496ad7dee699a0bfc594c70e499e54 SHA512 5a22d5967c2a72c135cdee26bb2d5512db38ce82085a2485f6b1280c7b65fae390d4653a630b6634dcc46868db394a046d71b73131f5a37c3a5b302ea3984c3f WHIRLPOOL dd79c4fa0324a39e2c7a5c46eb7a1af2c13b21d720c7815431f1b727bc6fa18503110048bb2a1bff7c6c4d7723734007babe434e9b64b629d213327eb99ad343
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild
new file mode 100644
index 000000000000..090d6e6ad75d
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild,v 1.1 2014/08/13 15:47:38 jer Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="
+	app-admin/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-admin/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.4:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.16.99
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			|| (
+				 (
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
+				 )
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 3 17 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-3.17"
+		ewarn "<sys-kernel/vanilla-sources-3.17"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		use uvm && MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	exeinto /usr/bin/
+	doexe ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-misc/colord/colord-1.2.1-r1.ebuild b/x11-misc/colord/colord-1.2.1-r1.ebuild
index 9ffbed4f6532..feb8e775b79d 100644
--- a/x11-misc/colord/colord-1.2.1-r1.ebuild
+++ b/x11-misc/colord/colord-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.1-r1.ebuild,v 1.3 2014/08/13 13:13:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.1-r1.ebuild,v 1.4 2014/08/14 12:40:38 jer Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 # We prefer policykit enabled by default, bug #448058
 IUSE="examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
index 764907aba916..cb4a54f14603 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild,v 1.4 2014/01/22 20:03:07 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild,v 1.5 2014/08/14 16:25:51 phajdan.jr Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
 
 RDEPEND="
diff --git a/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild b/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild
index d739cd202def..ca0de1d35128 100644
--- a/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild
+++ b/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild,v 1.1 2013/08/03 21:24:43 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-latex/pidgin-latex-1.5.0.ebuild,v 1.2 2014/08/14 16:27:24 phajdan.jr Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pidgin-latex/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild
index 556768f4ccfb..72cec47b1f5c 100644
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild,v 1.1 2014/01/29 02:54:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.4.ebuild,v 1.2 2014/08/14 16:48:32 phajdan.jr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://pidgin-opensteamworks.googlecode.com/files/steam-mobile-${PV}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2